[Security] Add types to private properties

Signed-off-by: Alexander M. Turek <[email protected]>

Author: derrabus

AccessMap.php

@@ -22,7 +22,7 @@
  */
 class AccessMap implements AccessMapInterface
 {
-    private $map = [];
+    private array $map = [];
 
     /**
      * @param array       $attributes An array of attributes to pass to the access decision manager (like roles)

Authentication/AuthenticationUtils.php

@@ -23,7 +23,7 @@
  */
 class AuthenticationUtils
 {
-    private $requestStack;
+    private RequestStack $requestStack;
 
     public function __construct(RequestStack $requestStack)
     {

Authentication/AuthenticatorManager.php

@@ -45,17 +45,17 @@
  */
 class AuthenticatorManager implements AuthenticatorManagerInterface, UserAuthenticatorInterface
 {
-    private $authenticators;
-    private $tokenStorage;
-    private $eventDispatcher;
-    private $eraseCredentials;
-    private $logger;
-    private $firewallName;
-    private $hideUserNotFoundExceptions;
-    private $requiredBadges;
+    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 AuthenticatorInterface[] $authenticators
+     * @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 = [])
     {

Authentication/CustomAuthenticationFailureHandler.php

@@ -20,7 +20,7 @@
  */
 class CustomAuthenticationFailureHandler implements AuthenticationFailureHandlerInterface
 {
-    private $handler;
+    private AuthenticationFailureHandlerInterface $handler;
 
     /**
      * @param array $options Options for processing a successful authentication attempt

Authentication/CustomAuthenticationSuccessHandler.php

@@ -20,7 +20,7 @@
  */
 class CustomAuthenticationSuccessHandler implements AuthenticationSuccessHandlerInterface
 {
-    private $handler;
+    private AuthenticationSuccessHandlerInterface $handler;
 
     /**
      * @param array $options Options for processing a successful authentication attempt

Authenticator/AbstractPreAuthenticatedAuthenticator.php

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

Authenticator/Debug/TraceableAuthenticator.php

@@ -29,10 +29,10 @@
  */
 final class TraceableAuthenticator implements AuthenticatorInterface, InteractiveAuthenticatorInterface, AuthenticationEntryPointInterface
 {
-    private $authenticator;
-    private $passport;
-    private $duration;
-    private $stub;
+    private AuthenticatorInterface $authenticator;
+    private ?Passport $passport = null;
+    private ?float $duration = null;
+    private ClassStub|string $stub;
 
     public function __construct(AuthenticatorInterface $authenticator)
     {

Authenticator/Debug/TraceableAuthenticatorManagerListener.php

@@ -24,9 +24,9 @@
  */
 final class TraceableAuthenticatorManagerListener extends AbstractListener
 {
-    private $authenticationManagerListener;
-    private $authenticatorsInfo = [];
-    private $hasVardumper;
+    private AuthenticatorManagerListener $authenticationManagerListener;
+    private array $authenticatorsInfo = [];
+    private bool $hasVardumper;
 
     public function __construct(AuthenticatorManagerListener $authenticationManagerListener)
     {

Authenticator/FormLoginAuthenticator.php

@@ -41,12 +41,12 @@
  */
 class FormLoginAuthenticator extends AbstractLoginFormAuthenticator
 {
-    private $httpUtils;
-    private $userProvider;
-    private $successHandler;
-    private $failureHandler;
-    private $options;
-    private $httpKernel;
+    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)
     {

Authenticator/HttpBasicAuthenticator.php

@@ -33,9 +33,9 @@
  */
 class HttpBasicAuthenticator implements AuthenticatorInterface, AuthenticationEntryPointInterface
 {
-    private $realmName;
-    private $userProvider;
-    private $logger;
+    private string $realmName;
+    private UserProviderInterface $userProvider;
+    private ?LoggerInterface $logger;
 
     public function __construct(string $realmName, UserProviderInterface $userProvider, LoggerInterface $logger = null)
     {

Authenticator/JsonLoginAuthenticator.php

@@ -45,17 +45,13 @@
  */
 class JsonLoginAuthenticator implements InteractiveAuthenticatorInterface
 {
-    private $options;
-    private $httpUtils;
-    private $userProvider;
-    private $propertyAccessor;
-    private $successHandler;
-    private $failureHandler;
-
-    /**
-     * @var TranslatorInterface|null
-     */
-    private $translator;
+    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)
     {

Authenticator/LoginLinkAuthenticator.php

@@ -31,11 +31,11 @@
  */
 final class LoginLinkAuthenticator extends AbstractAuthenticator implements InteractiveAuthenticatorInterface
 {
-    private $loginLinkHandler;
-    private $httpUtils;
-    private $successHandler;
-    private $failureHandler;
-    private $options;
+    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)
     {

Authenticator/Passport/Badge/CsrfTokenBadge.php

@@ -24,9 +24,9 @@
  */
 class CsrfTokenBadge implements BadgeInterface
 {
-    private $resolved = false;
-    private $csrfTokenId;
-    private $csrfToken;
+    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.

Authenticator/Passport/Badge/PasswordUpgradeBadge.php

@@ -25,8 +25,8 @@
  */
 class PasswordUpgradeBadge implements BadgeInterface
 {
-    private $plaintextPassword;
-    private $passwordUpgrader;
+    private ?string $plaintextPassword = null;
+    private ?PasswordUpgraderInterface $passwordUpgrader;
 
     /**
      * @param string                         $plaintextPassword The presented password, used in the rehash

Authenticator/Passport/Badge/RememberMeBadge.php

@@ -26,7 +26,7 @@
  */
 class RememberMeBadge implements BadgeInterface
 {
-    private $enabled = false;
+    private bool $enabled = false;
 
     /**
      * Enables remember-me cookie creation.

Authenticator/Passport/Badge/UserBadge.php

@@ -26,9 +26,10 @@
  */
 class UserBadge implements BadgeInterface
 {
-    private $userIdentifier;
+    private string $userIdentifier;
+    /** @var callable|null */
     private $userLoader;
-    private $user;
+    private UserInterface $user;
 
     /**
      * Initializes the user badge.
@@ -59,15 +60,17 @@ public function getUserIdentifier(): string
      */
     public function getUser(): UserInterface
     {
-        if (null === $this->user) {
+        if (!isset($this->user)) {
             if (null === $this->userLoader) {
                 throw new \LogicException(sprintf('No user loader is configured, did you forget to register the "%s" listener?', UserProviderListener::class));
             }
 
-            $this->user = ($this->userLoader)($this->userIdentifier);
-            if (!$this->user instanceof UserInterface) {
+            $user = ($this->userLoader)($this->userIdentifier);
+            if (!$user instanceof UserInterface) {
                 throw new AuthenticationServiceException(sprintf('The user provider must return a UserInterface object, "%s" given.', get_debug_type($this->user)));
             }
+
+            $this->user = $user;
         }
 
         return $this->user;

Authenticator/Passport/Credentials/CustomCredentials.php

@@ -23,9 +23,9 @@
  */
 class CustomCredentials implements CredentialsInterface
 {
-    private $customCredentialsChecker;
-    private $credentials;
-    private $resolved = false;
+    private \Closure $customCredentialsChecker;
+    private mixed $credentials;
+    private bool $resolved = false;
 
     /**
      * @param callable $customCredentialsChecker the check function. If this function does not return `true`, a
@@ -34,7 +34,7 @@ class CustomCredentials implements CredentialsInterface
      */
     public function __construct(callable $customCredentialsChecker, mixed $credentials)
     {
-        $this->customCredentialsChecker = $customCredentialsChecker;
+        $this->customCredentialsChecker = $customCredentialsChecker instanceof \Closure ? $customCredentialsChecker : \Closure::fromCallable($customCredentialsChecker);
         $this->credentials = $credentials;
     }
 

Authenticator/Passport/Credentials/PasswordCredentials.php

@@ -25,8 +25,8 @@
  */
 class PasswordCredentials implements CredentialsInterface
 {
-    private $password;
-    private $resolved = false;
+    private ?string $password = null;
+    private bool $resolved = false;
 
     public function __construct(string $password)
     {

Authenticator/Passport/Passport.php

@@ -25,8 +25,8 @@ class Passport
 {
     protected $user;
 
-    private $badges = [];
-    private $attributes = [];
+    private array $badges = [];
+    private array $attributes = [];
 
     /**
      * @param CredentialsInterface $credentials the credentials to check for this authentication, use

Authenticator/RememberMeAuthenticator.php

@@ -43,11 +43,11 @@
  */
 class RememberMeAuthenticator implements InteractiveAuthenticatorInterface
 {
-    private $rememberMeHandler;
-    private $secret;
-    private $tokenStorage;
-    private $cookieName;
-    private $logger;
+    private RememberMeHandlerInterface $rememberMeHandler;
+    private string $secret;
+    private TokenStorageInterface $tokenStorage;
+    private string $cookieName;
+    private ?LoggerInterface $logger;
 
     public function __construct(RememberMeHandlerInterface $rememberMeHandler, string $secret, TokenStorageInterface $tokenStorage, string $cookieName, LoggerInterface $logger = null)
     {

Authenticator/RemoteUserAuthenticator.php

@@ -30,7 +30,7 @@
  */
 class RemoteUserAuthenticator extends AbstractPreAuthenticatedAuthenticator
 {
-    private $userKey;
+    private string $userKey;
 
     public function __construct(UserProviderInterface $userProvider, TokenStorageInterface $tokenStorage, string $firewallName, string $userKey = 'REMOTE_USER', LoggerInterface $logger = null)
     {

Authenticator/Token/PostAuthenticationToken.php

@@ -16,7 +16,7 @@
 
 class PostAuthenticationToken extends AbstractToken
 {
-    private $firewallName;
+    private string $firewallName;
 
     /**
      * @param string[] $roles An array of roles

Authenticator/X509Authenticator.php

@@ -28,8 +28,8 @@
  */
 class X509Authenticator extends AbstractPreAuthenticatedAuthenticator
 {
-    private $userKey;
-    private $credentialsKey;
+    private string $userKey;
+    private string $credentialsKey;
 
     public function __construct(UserProviderInterface $userProvider, TokenStorageInterface $tokenStorage, string $firewallName, string $userKey = 'SSL_CLIENT_S_DN_Email', string $credentialsKey = 'SSL_CLIENT_S_DN', LoggerInterface $logger = null)
     {

Controller/UserValueResolver.php

@@ -26,7 +26,7 @@
  */
 final class UserValueResolver implements ArgumentValueResolverInterface
 {
-    private $tokenStorage;
+    private TokenStorageInterface $tokenStorage;
 
     public function __construct(TokenStorageInterface $tokenStorage)
     {

Event/AuthenticationTokenCreatedEvent.php

@@ -22,8 +22,8 @@
  */
 class AuthenticationTokenCreatedEvent extends Event
 {
-    private $authenticatedToken;
-    private $passport;
+    private TokenInterface $authenticatedToken;
+    private Passport $passport;
 
     public function __construct(TokenInterface $token, Passport $passport)
     {

Event/CheckPassportEvent.php

@@ -26,8 +26,8 @@
  */
 class CheckPassportEvent extends Event
 {
-    private $authenticator;
-    private $passport;
+    private AuthenticatorInterface $authenticator;
+    private Passport $passport;
 
     public function __construct(AuthenticatorInterface $authenticator, Passport $passport)
     {

Event/InteractiveLoginEvent.php

@@ -20,8 +20,8 @@
  */
 final class InteractiveLoginEvent extends Event
 {
-    private $request;
-    private $authenticationToken;
+    private Request $request;
+    private TokenInterface $authenticationToken;
 
     public function __construct(Request $request, TokenInterface $authenticationToken)
     {

Event/LazyResponseEvent.php

@@ -24,7 +24,7 @@
  */
 final class LazyResponseEvent extends RequestEvent
 {
-    private $event;
+    private parent $event;
 
     public function __construct(parent $event)
     {