use constructor property promotion

Author: xabbuh

Authentication/AuthenticationUtils.php

@@ -23,11 +23,9 @@
  */
 class AuthenticationUtils
 {
-    private RequestStack $requestStack;
-
-    public function __construct(RequestStack $requestStack)
-    {
-        $this->requestStack = $requestStack;
+    public function __construct(
+        private RequestStack $requestStack,
+    ) {
     }
 
     public function getLastAuthenticationError(bool $clearSession = true): ?AuthenticationException

Authentication/AuthenticatorManager.php

@@ -46,28 +46,19 @@
  */
 class AuthenticatorManager implements AuthenticatorManagerInterface, UserAuthenticatorInterface
 {
-    private iterable $authenticators;
-    private TokenStorageInterface $tokenStorage;
-    private EventDispatcherInterface $eventDispatcher;
-    private bool $eraseCredentials;
-    private ?LoggerInterface $logger;
-    private string $firewallName;
-    private bool $hideUserNotFoundExceptions;
-    private array $requiredBadges;
-
     /**
      * @param iterable<mixed, AuthenticatorInterface> $authenticators
      */
-    public function __construct(iterable $authenticators, TokenStorageInterface $tokenStorage, EventDispatcherInterface $eventDispatcher, string $firewallName, ?LoggerInterface $logger = null, bool $eraseCredentials = true, bool $hideUserNotFoundExceptions = true, array $requiredBadges = [])
-    {
-        $this->authenticators = $authenticators;
-        $this->tokenStorage = $tokenStorage;
-        $this->eventDispatcher = $eventDispatcher;
-        $this->firewallName = $firewallName;
-        $this->logger = $logger;
-        $this->eraseCredentials = $eraseCredentials;
-        $this->hideUserNotFoundExceptions = $hideUserNotFoundExceptions;
-        $this->requiredBadges = $requiredBadges;
+    public function __construct(
+        private iterable $authenticators,
+        private TokenStorageInterface $tokenStorage,
+        private EventDispatcherInterface $eventDispatcher,
+        private string $firewallName,
+        private ?LoggerInterface $logger = null,
+        private bool $eraseCredentials = true,
+        private bool $hideUserNotFoundExceptions = true,
+        private array $requiredBadges = [],
+    ) {
     }
 
     /**

Authentication/CustomAuthenticationFailureHandler.php

@@ -20,14 +20,13 @@
  */
 class CustomAuthenticationFailureHandler implements AuthenticationFailureHandlerInterface
 {
-    private AuthenticationFailureHandlerInterface $handler;
-
     /**
      * @param array $options Options for processing a successful authentication attempt
      */
-    public function __construct(AuthenticationFailureHandlerInterface $handler, array $options)
-    {
-        $this->handler = $handler;
+    public function __construct(
+        private AuthenticationFailureHandlerInterface $handler,
+        array $options,
+    ) {
         if (method_exists($handler, 'setOptions')) {
             $this->handler->setOptions($options);
         }

Authentication/CustomAuthenticationSuccessHandler.php

@@ -20,14 +20,14 @@
  */
 class CustomAuthenticationSuccessHandler implements AuthenticationSuccessHandlerInterface
 {
-    private AuthenticationSuccessHandlerInterface $handler;
-
     /**
      * @param array $options Options for processing a successful authentication attempt
      */
-    public function __construct(AuthenticationSuccessHandlerInterface $handler, array $options, string $firewallName)
-    {
-        $this->handler = $handler;
+    public function __construct(
+        private AuthenticationSuccessHandlerInterface $handler,
+        array $options,
+        string $firewallName,
+    ) {
         if (method_exists($handler, 'setOptions')) {
             $this->handler->setOptions($options);
         }

Authentication/DefaultAuthenticationFailureHandler.php

@@ -32,22 +32,20 @@
  */
 class DefaultAuthenticationFailureHandler implements AuthenticationFailureHandlerInterface
 {
-    protected HttpKernelInterface $httpKernel;
-    protected HttpUtils $httpUtils;
     protected array $options;
-    protected ?LoggerInterface $logger;
     protected array $defaultOptions = [
         'failure_path' => null,
         'failure_forward' => false,
         'login_path' => '/login',
         'failure_path_parameter' => '_failure_path',
     ];
 
-    public function __construct(HttpKernelInterface $httpKernel, HttpUtils $httpUtils, array $options = [], ?LoggerInterface $logger = null)
-    {
-        $this->httpKernel = $httpKernel;
-        $this->httpUtils = $httpUtils;
-        $this->logger = $logger;
+    public function __construct(
+        protected HttpKernelInterface $httpKernel,
+        protected HttpUtils $httpUtils,
+        array $options = [],
+        protected ?LoggerInterface $logger = null,
+    ) {
         $this->setOptions($options);
     }
 

Authentication/DefaultAuthenticationSuccessHandler.php

@@ -30,9 +30,7 @@ class DefaultAuthenticationSuccessHandler implements AuthenticationSuccessHandle
 {
     use TargetPathTrait;
 
-    protected HttpUtils $httpUtils;
     protected array $options;
-    protected ?LoggerInterface $logger;
     protected ?string $firewallName = null;
     protected array $defaultOptions = [
         'always_use_default_target_path' => false,
@@ -45,10 +43,11 @@ class DefaultAuthenticationSuccessHandler implements AuthenticationSuccessHandle
     /**
      * @param array $options Options for processing a successful authentication attempt
      */
-    public function __construct(HttpUtils $httpUtils, array $options = [], ?LoggerInterface $logger = null)
-    {
-        $this->httpUtils = $httpUtils;
-        $this->logger = $logger;
+    public function __construct(
+        protected HttpUtils $httpUtils,
+        array $options = [],
+        protected ?LoggerInterface $logger = null,
+    ) {
         $this->setOptions($options);
     }
 

Authenticator/AbstractPreAuthenticatedAuthenticator.php

@@ -36,17 +36,12 @@
  */
 abstract class AbstractPreAuthenticatedAuthenticator implements InteractiveAuthenticatorInterface
 {
-    private UserProviderInterface $userProvider;
-    private TokenStorageInterface $tokenStorage;
-    private string $firewallName;
-    private ?LoggerInterface $logger;
-
-    public function __construct(UserProviderInterface $userProvider, TokenStorageInterface $tokenStorage, string $firewallName, ?LoggerInterface $logger = null)
-    {
-        $this->userProvider = $userProvider;
-        $this->tokenStorage = $tokenStorage;
-        $this->firewallName = $firewallName;
-        $this->logger = $logger;
+    public function __construct(
+        private UserProviderInterface $userProvider,
+        private TokenStorageInterface $tokenStorage,
+        private string $firewallName,
+        private ?LoggerInterface $logger = null
+    ) {
     }
 
     /**

Authenticator/Debug/TraceableAuthenticatorManagerListener.php

@@ -25,13 +25,12 @@
  */
 final class TraceableAuthenticatorManagerListener extends AbstractListener implements ResetInterface
 {
-    private AuthenticatorManagerListener $authenticationManagerListener;
     private array $authenticatorsInfo = [];
     private bool $hasVardumper;
 
-    public function __construct(AuthenticatorManagerListener $authenticationManagerListener)
-    {
-        $this->authenticationManagerListener = $authenticationManagerListener;
+    public function __construct(
+        private AuthenticatorManagerListener $authenticationManagerListener,
+    ) {
         $this->hasVardumper = class_exists(ClassStub::class);
     }
 

Authenticator/FormLoginAuthenticator.php

@@ -40,19 +40,16 @@
  */
 class FormLoginAuthenticator extends AbstractLoginFormAuthenticator
 {
-    private HttpUtils $httpUtils;
-    private UserProviderInterface $userProvider;
-    private AuthenticationSuccessHandlerInterface $successHandler;
-    private AuthenticationFailureHandlerInterface $failureHandler;
     private array $options;
     private HttpKernelInterface $httpKernel;
 
-    public function __construct(HttpUtils $httpUtils, UserProviderInterface $userProvider, AuthenticationSuccessHandlerInterface $successHandler, AuthenticationFailureHandlerInterface $failureHandler, array $options)
-    {
-        $this->httpUtils = $httpUtils;
-        $this->userProvider = $userProvider;
-        $this->successHandler = $successHandler;
-        $this->failureHandler = $failureHandler;
+    public function __construct(
+        private HttpUtils $httpUtils,
+        private UserProviderInterface $userProvider,
+        private AuthenticationSuccessHandlerInterface $successHandler,
+        private AuthenticationFailureHandlerInterface $failureHandler,
+        array $options,
+    ) {
         $this->options = array_merge([
             'username_parameter' => '_username',
             'password_parameter' => '_password',

Authenticator/HttpBasicAuthenticator.php

@@ -33,15 +33,11 @@
  */
 class HttpBasicAuthenticator implements AuthenticatorInterface, AuthenticationEntryPointInterface
 {
-    private string $realmName;
-    private UserProviderInterface $userProvider;
-    private ?LoggerInterface $logger;
-
-    public function __construct(string $realmName, UserProviderInterface $userProvider, ?LoggerInterface $logger = null)
-    {
-        $this->realmName = $realmName;
-        $this->userProvider = $userProvider;
-        $this->logger = $logger;
+    public function __construct(
+        private string $realmName,
+        private UserProviderInterface $userProvider,
+        private ?LoggerInterface $logger = null,
+    ) {
     }
 
     public function start(Request $request, ?AuthenticationException $authException = null): Response

Authenticator/JsonLoginAuthenticator.php

@@ -45,20 +45,18 @@
 class JsonLoginAuthenticator implements InteractiveAuthenticatorInterface
 {
     private array $options;
-    private HttpUtils $httpUtils;
-    private UserProviderInterface $userProvider;
     private PropertyAccessorInterface $propertyAccessor;
-    private ?AuthenticationSuccessHandlerInterface $successHandler;
-    private ?AuthenticationFailureHandlerInterface $failureHandler;
     private ?TranslatorInterface $translator = null;
 
-    public function __construct(HttpUtils $httpUtils, UserProviderInterface $userProvider, ?AuthenticationSuccessHandlerInterface $successHandler = null, ?AuthenticationFailureHandlerInterface $failureHandler = null, array $options = [], ?PropertyAccessorInterface $propertyAccessor = null)
-    {
+    public function __construct(
+        private HttpUtils $httpUtils,
+        private UserProviderInterface $userProvider,
+        private ?AuthenticationSuccessHandlerInterface $successHandler = null,
+        private ?AuthenticationFailureHandlerInterface $failureHandler = null,
+        array $options = [],
+        ?PropertyAccessorInterface $propertyAccessor = null,
+    ) {
         $this->options = array_merge(['username_path' => 'username', 'password_path' => 'password'], $options);
-        $this->httpUtils = $httpUtils;
-        $this->successHandler = $successHandler;
-        $this->failureHandler = $failureHandler;
-        $this->userProvider = $userProvider;
         $this->propertyAccessor = $propertyAccessor ?: PropertyAccess::createPropertyAccessor();
     }
 

Authenticator/LoginLinkAuthenticator.php

@@ -31,18 +31,15 @@
  */
 final class LoginLinkAuthenticator extends AbstractAuthenticator implements InteractiveAuthenticatorInterface
 {
-    private LoginLinkHandlerInterface $loginLinkHandler;
-    private HttpUtils $httpUtils;
-    private AuthenticationSuccessHandlerInterface $successHandler;
-    private AuthenticationFailureHandlerInterface $failureHandler;
     private array $options;
 
-    public function __construct(LoginLinkHandlerInterface $loginLinkHandler, HttpUtils $httpUtils, AuthenticationSuccessHandlerInterface $successHandler, AuthenticationFailureHandlerInterface $failureHandler, array $options)
-    {
-        $this->loginLinkHandler = $loginLinkHandler;
-        $this->httpUtils = $httpUtils;
-        $this->successHandler = $successHandler;
-        $this->failureHandler = $failureHandler;
+    public function __construct(
+        private LoginLinkHandlerInterface $loginLinkHandler,
+        private HttpUtils $httpUtils,
+        private AuthenticationSuccessHandlerInterface $successHandler,
+        private AuthenticationFailureHandlerInterface $failureHandler,
+        array $options,
+    ) {
         $this->options = $options + ['check_post_only' => false];
     }
 

Authenticator/Passport/Badge/CsrfTokenBadge.php

@@ -25,18 +25,16 @@
 class CsrfTokenBadge implements BadgeInterface
 {
     private bool $resolved = false;
-    private string $csrfTokenId;
-    private ?string $csrfToken;
 
     /**
      * @param string      $csrfTokenId An arbitrary string used to generate the value of the CSRF token.
      *                                 Using a different string for each authenticator improves its security.
      * @param string|null $csrfToken   The CSRF token presented in the request, if any
      */
-    public function __construct(string $csrfTokenId, #[\SensitiveParameter] ?string $csrfToken)
-    {
-        $this->csrfTokenId = $csrfTokenId;
-        $this->csrfToken = $csrfToken;
+    public function __construct(
+        private string $csrfTokenId,
+        #[\SensitiveParameter] private ?string $csrfToken,
+    ) {
     }
 
     public function getCsrfTokenId(): string

Authenticator/Passport/Badge/PasswordUpgradeBadge.php

@@ -26,16 +26,16 @@
 class PasswordUpgradeBadge implements BadgeInterface
 {
     private ?string $plaintextPassword = null;
-    private ?PasswordUpgraderInterface $passwordUpgrader;
 
     /**
      * @param string                         $plaintextPassword The presented password, used in the rehash
      * @param PasswordUpgraderInterface|null $passwordUpgrader  The password upgrader, defaults to the UserProvider if null
      */
-    public function __construct(#[\SensitiveParameter] string $plaintextPassword, ?PasswordUpgraderInterface $passwordUpgrader = null)
-    {
+    public function __construct(
+        #[\SensitiveParameter] string $plaintextPassword,
+        private ?PasswordUpgraderInterface $passwordUpgrader = null,
+    ) {
         $this->plaintextPassword = $plaintextPassword;
-        $this->passwordUpgrader = $passwordUpgrader;
     }
 
     public function getAndErasePlaintextPassword(): string

Authenticator/Passport/Badge/UserBadge.php

@@ -30,11 +30,9 @@ class UserBadge implements BadgeInterface
 {
     public const MAX_USERNAME_LENGTH = 4096;
 
-    private string $userIdentifier;
     /** @var callable|null */
     private $userLoader;
     private UserInterface $user;
-    private ?array $attributes;
 
     /**
      * Initializes the user badge.
@@ -49,15 +47,16 @@ class UserBadge implements BadgeInterface
      * is thrown). If this is not set, the default user provider will be used with
      * $userIdentifier as username.
      */
-    public function __construct(string $userIdentifier, ?callable $userLoader = null, ?array $attributes = null)
-    {
+    public function __construct(
+        private string $userIdentifier,
+        ?callable $userLoader = null,
+        private ?array $attributes = null,
+    ) {
         if (\strlen($userIdentifier) > self::MAX_USERNAME_LENGTH) {
             throw new BadCredentialsException('Username too long.');
         }
 
-        $this->userIdentifier = $userIdentifier;
         $this->userLoader = $userLoader;
-        $this->attributes = $attributes;
     }
 
     public function getUserIdentifier(): string

Authenticator/Passport/Credentials/CustomCredentials.php

@@ -24,18 +24,18 @@
 class CustomCredentials implements CredentialsInterface
 {
     private \Closure $customCredentialsChecker;
-    private mixed $credentials;
     private bool $resolved = false;
 
     /**
      * @param callable $customCredentialsChecker the check function. If this function does not return `true`, a
      *                                           BadCredentialsException is thrown. You may also throw a more
      *                                           specific exception in the function.
      */
-    public function __construct(callable $customCredentialsChecker, mixed $credentials)
-    {
+    public function __construct(
+        callable $customCredentialsChecker,
+        private mixed $credentials,
+    ) {
         $this->customCredentialsChecker = $customCredentialsChecker(...);
-        $this->credentials = $credentials;
     }
 
     public function executeCustomChecker(UserInterface $user): void