Merge branch '5.2' into 5.3

nicolas-grekas · nicolas-grekas · commit 03a9257b7288 · 2021-06-30T15:49:12.000+02:00
* 5.2:
  CS fix
  CS fix
  CS fixes
  Bump Symfony version to 5.2.12
  Update VERSION for 5.2.11
  Update CHANGELOG for 5.2.11
  Bump Symfony version to 4.4.27
  Update VERSION for 4.4.26
  Update CONTRIBUTORS for 4.4.26
  Update CHANGELOG for 4.4.26
diff --git a/Authentication/AuthenticatorManager.php b/Authentication/AuthenticatorManager.php
@@ -57,7 +57,7 @@ class AuthenticatorManager implements AuthenticatorManagerInterface, UserAuthent
     /**
      * @param AuthenticatorInterface[] $authenticators
      */
-    public function __construct(iterable $authenticators, TokenStorageInterface $tokenStorage, EventDispatcherInterface $eventDispatcher, string $firewallName, ?LoggerInterface $logger = null, bool $eraseCredentials = true, bool $hideUserNotFoundExceptions = true, array $requiredBadges = [])
+    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;
diff --git a/Authenticator/AbstractPreAuthenticatedAuthenticator.php b/Authenticator/AbstractPreAuthenticatedAuthenticator.php
@@ -41,7 +41,7 @@ abstract class AbstractPreAuthenticatedAuthenticator implements InteractiveAuthe
     private $firewallName;
     private $logger;
 
-    public function __construct(UserProviderInterface $userProvider, TokenStorageInterface $tokenStorage, string $firewallName, ?LoggerInterface $logger = null)
+    public function __construct(UserProviderInterface $userProvider, TokenStorageInterface $tokenStorage, string $firewallName, LoggerInterface $logger = null)
     {
         $this->userProvider = $userProvider;
         $this->tokenStorage = $tokenStorage;
diff --git a/Authenticator/HttpBasicAuthenticator.php b/Authenticator/HttpBasicAuthenticator.php
@@ -38,7 +38,7 @@ class HttpBasicAuthenticator implements AuthenticatorInterface, AuthenticationEn
     private $userProvider;
     private $logger;
 
-    public function __construct(string $realmName, UserProviderInterface $userProvider, ?LoggerInterface $logger = null)
+    public function __construct(string $realmName, UserProviderInterface $userProvider, LoggerInterface $logger = null)
     {
         $this->realmName = $realmName;
         $this->userProvider = $userProvider;
diff --git a/Authenticator/JsonLoginAuthenticator.php b/Authenticator/JsonLoginAuthenticator.php
@@ -58,7 +58,7 @@ class JsonLoginAuthenticator implements InteractiveAuthenticatorInterface
      */
     private $translator;
 
-    public function __construct(HttpUtils $httpUtils, UserProviderInterface $userProvider, ?AuthenticationSuccessHandlerInterface $successHandler = null, ?AuthenticationFailureHandlerInterface $failureHandler = null, array $options = [], ?PropertyAccessorInterface $propertyAccessor = null)
+    public function __construct(HttpUtils $httpUtils, UserProviderInterface $userProvider, AuthenticationSuccessHandlerInterface $successHandler = null, AuthenticationFailureHandlerInterface $failureHandler = null, array $options = [], PropertyAccessorInterface $propertyAccessor = null)
     {
         $this->options = array_merge(['username_path' => 'username', 'password_path' => 'password'], $options);
         $this->httpUtils = $httpUtils;
diff --git a/Authenticator/Passport/Badge/PasswordUpgradeBadge.php b/Authenticator/Passport/Badge/PasswordUpgradeBadge.php
@@ -32,7 +32,7 @@ class PasswordUpgradeBadge implements BadgeInterface
      * @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(string $plaintextPassword, ?PasswordUpgraderInterface $passwordUpgrader = null)
+    public function __construct(string $plaintextPassword, PasswordUpgraderInterface $passwordUpgrader = null)
     {
         $this->plaintextPassword = $plaintextPassword;
         $this->passwordUpgrader = $passwordUpgrader;
diff --git a/Authenticator/Passport/Badge/UserBadge.php b/Authenticator/Passport/Badge/UserBadge.php
@@ -42,7 +42,7 @@ 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)
+    public function __construct(string $userIdentifier, callable $userLoader = null)
     {
         $this->userIdentifier = $userIdentifier;
         $this->userLoader = $userLoader;
diff --git a/Authenticator/RemoteUserAuthenticator.php b/Authenticator/RemoteUserAuthenticator.php
@@ -32,7 +32,7 @@ class RemoteUserAuthenticator extends AbstractPreAuthenticatedAuthenticator
 {
     private $userKey;
 
-    public function __construct(UserProviderInterface $userProvider, TokenStorageInterface $tokenStorage, string $firewallName, string $userKey = 'REMOTE_USER', ?LoggerInterface $logger = null)
+    public function __construct(UserProviderInterface $userProvider, TokenStorageInterface $tokenStorage, string $firewallName, string $userKey = 'REMOTE_USER', LoggerInterface $logger = null)
     {
         parent::__construct($userProvider, $tokenStorage, $firewallName, $logger);
 
diff --git a/Authenticator/X509Authenticator.php b/Authenticator/X509Authenticator.php
@@ -31,7 +31,7 @@ class X509Authenticator extends AbstractPreAuthenticatedAuthenticator
     private $userKey;
     private $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)
+    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)
     {
         parent::__construct($userProvider, $tokenStorage, $firewallName, $logger);
 
diff --git a/Event/LazyResponseEvent.php b/Event/LazyResponseEvent.php
@@ -73,6 +73,7 @@ public function isMainRequest(): bool
     {
         return $this->event->isMainRequest();
     }
+
     /**
      * {@inheritdoc}
      */
diff --git a/Event/LoginFailureEvent.php b/Event/LoginFailureEvent.php
@@ -35,7 +35,7 @@ class LoginFailureEvent extends Event
     private $firewallName;
     private $passport;
 
-    public function __construct(AuthenticationException $exception, AuthenticatorInterface $authenticator, Request $request, ?Response $response, string $firewallName, ?PassportInterface $passport = null)
+    public function __construct(AuthenticationException $exception, AuthenticatorInterface $authenticator, Request $request, ?Response $response, string $firewallName, PassportInterface $passport = null)
     {
         $this->exception = $exception;
         $this->authenticator = $authenticator;
diff --git a/EventListener/CheckRememberMeConditionsListener.php b/EventListener/CheckRememberMeConditionsListener.php
@@ -14,12 +14,8 @@
 use Psr\Log\LoggerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Security\Http\Authenticator\Passport\Badge\RememberMeBadge;
-use Symfony\Component\Security\Http\Event\LoginFailureEvent;
 use Symfony\Component\Security\Http\Event\LoginSuccessEvent;
-use Symfony\Component\Security\Http\Event\LogoutEvent;
-use Symfony\Component\Security\Http\Event\TokenDeauthenticatedEvent;
 use Symfony\Component\Security\Http\ParameterBagUtils;
-use Symfony\Component\Security\Http\RememberMe\RememberMeHandlerInterface;
 
 /**
  * Checks if all conditions are met for remember me.
@@ -42,7 +38,7 @@ class CheckRememberMeConditionsListener implements EventSubscriberInterface
     private $options;
     private $logger;
 
-    public function __construct(array $options = [], ?LoggerInterface $logger = null)
+    public function __construct(array $options = [], LoggerInterface $logger = null)
     {
         $this->options = $options + ['always_remember_me' => false, 'remember_me_parameter' => '_remember_me'];
         $this->logger = $logger;
diff --git a/EventListener/RememberMeListener.php b/EventListener/RememberMeListener.php
@@ -18,7 +18,6 @@
 use Symfony\Component\Security\Http\Event\LoginSuccessEvent;
 use Symfony\Component\Security\Http\Event\LogoutEvent;
 use Symfony\Component\Security\Http\Event\TokenDeauthenticatedEvent;
-use Symfony\Component\Security\Http\ParameterBagUtils;
 use Symfony\Component\Security\Http\RememberMe\RememberMeHandlerInterface;
 
 /**
@@ -38,7 +37,7 @@ class RememberMeListener implements EventSubscriberInterface
     private $rememberMeHandler;
     private $logger;
 
-    public function __construct(RememberMeHandlerInterface $rememberMeHandler, ?LoggerInterface $logger = null)
+    public function __construct(RememberMeHandlerInterface $rememberMeHandler, LoggerInterface $logger = null)
     {
         $this->rememberMeHandler = $rememberMeHandler;
         $this->logger = $logger;
diff --git a/Firewall/LogoutListener.php b/Firewall/LogoutListener.php
@@ -46,7 +46,7 @@ class LogoutListener extends AbstractListener
      * @param EventDispatcherInterface $eventDispatcher
      * @param array                    $options         An array of options to process a logout attempt
      */
-    public function __construct(TokenStorageInterface $tokenStorage, HttpUtils $httpUtils, /* EventDispatcherInterface */$eventDispatcher, array $options = [], CsrfTokenManagerInterface $csrfTokenManager = null)
+    public function __construct(TokenStorageInterface $tokenStorage, HttpUtils $httpUtils, $eventDispatcher, array $options = [], CsrfTokenManagerInterface $csrfTokenManager = null)
     {
         if (!$eventDispatcher instanceof EventDispatcherInterface) {
             trigger_deprecation('symfony/security-http', '5.1', 'Passing a logout success handler to "%s" is deprecated, pass an instance of "%s" instead.', __METHOD__, EventDispatcherInterface::class);
diff --git a/RememberMe/AbstractRememberMeHandler.php b/RememberMe/AbstractRememberMeHandler.php
@@ -28,7 +28,7 @@ abstract class AbstractRememberMeHandler implements RememberMeHandlerInterface
     protected $options;
     protected $logger;
 
-    public function __construct(UserProviderInterface $userProvider, RequestStack $requestStack, array $options = [], ?LoggerInterface $logger = null)
+    public function __construct(UserProviderInterface $userProvider, RequestStack $requestStack, array $options = [], LoggerInterface $logger = null)
     {
         $this->userProvider = $userProvider;
         $this->requestStack = $requestStack;
diff --git a/RememberMe/PersistentRememberMeHandler.php b/RememberMe/PersistentRememberMeHandler.php
@@ -36,7 +36,7 @@ final class PersistentRememberMeHandler extends AbstractRememberMeHandler
     private $tokenVerifier;
     private $secret;
 
-    public function __construct(TokenProviderInterface $tokenProvider, string $secret, UserProviderInterface $userProvider, RequestStack $requestStack, array $options, ?LoggerInterface $logger = null, ?TokenVerifierInterface $tokenVerifier = null)
+    public function __construct(TokenProviderInterface $tokenProvider, string $secret, UserProviderInterface $userProvider, RequestStack $requestStack, array $options, LoggerInterface $logger = null, TokenVerifierInterface $tokenVerifier = null)
     {
         parent::__construct($userProvider, $requestStack, $options, $logger);
 
diff --git a/RememberMe/SignatureRememberMeHandler.php b/RememberMe/SignatureRememberMeHandler.php
@@ -34,7 +34,7 @@ final class SignatureRememberMeHandler extends AbstractRememberMeHandler
 {
     private $signatureHasher;
 
-    public function __construct(SignatureHasher $signatureHasher, UserProviderInterface $userProvider, RequestStack $requestStack, array $options, ?LoggerInterface $logger = null)
+    public function __construct(SignatureHasher $signatureHasher, UserProviderInterface $userProvider, RequestStack $requestStack, array $options, LoggerInterface $logger = null)
     {
         parent::__construct($userProvider, $requestStack, $options, $logger);
 
diff --git a/Tests/Authenticator/HttpBasicAuthenticatorTest.php b/Tests/Authenticator/HttpBasicAuthenticatorTest.php
@@ -4,14 +4,14 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\PasswordHasher\Hasher\PasswordHasherFactoryInterface;
+use Symfony\Component\PasswordHasher\PasswordHasherInterface;
 use Symfony\Component\Security\Core\User\InMemoryUser;
 use Symfony\Component\Security\Core\User\InMemoryUserProvider;
 use Symfony\Component\Security\Http\Authenticator\HttpBasicAuthenticator;
 use Symfony\Component\Security\Http\Authenticator\Passport\Badge\PasswordUpgradeBadge;
 use Symfony\Component\Security\Http\Authenticator\Passport\Credentials\PasswordCredentials;
 use Symfony\Component\Security\Http\Tests\Authenticator\Fixtures\PasswordUpgraderProvider;
-use Symfony\Component\PasswordHasher\Hasher\PasswordHasherFactoryInterface;
-use Symfony\Component\PasswordHasher\PasswordHasherInterface;
 
 class HttpBasicAuthenticatorTest extends TestCase
 {
diff --git a/Tests/EventListener/CheckCredentialsListenerTest.php b/Tests/EventListener/CheckCredentialsListenerTest.php
@@ -12,6 +12,8 @@
 namespace Symfony\Component\Security\Http\Tests\EventListener;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\PasswordHasher\Hasher\PasswordHasherFactoryInterface;
+use Symfony\Component\PasswordHasher\PasswordHasherInterface;
 use Symfony\Component\Security\Core\Exception\BadCredentialsException;
 use Symfony\Component\Security\Core\User\InMemoryUser;
 use Symfony\Component\Security\Http\Authenticator\AuthenticatorInterface;
@@ -23,8 +25,6 @@
 use Symfony\Component\Security\Http\Authenticator\Passport\SelfValidatingPassport;
 use Symfony\Component\Security\Http\Event\CheckPassportEvent;
 use Symfony\Component\Security\Http\EventListener\CheckCredentialsListener;
-use Symfony\Component\PasswordHasher\Hasher\PasswordHasherFactoryInterface;
-use Symfony\Component\PasswordHasher\PasswordHasherInterface;
 
 class CheckCredentialsListenerTest extends TestCase
 {
diff --git a/Tests/EventListener/PasswordMigratingListenerTest.php b/Tests/EventListener/PasswordMigratingListenerTest.php
@@ -134,6 +134,7 @@ private function createEvent(PassportInterface $passport)
 abstract class TestMigratingUserProvider implements UserProviderInterface, PasswordUpgraderInterface
 {
     abstract public function upgradePassword(PasswordAuthenticatedUserInterface $user, string $newHashedPassword): void;
+
     abstract public function loadUserByIdentifier(string $identifier): UserInterface;
 }
 
diff --git a/Tests/EventListener/RememberMeListenerTest.php b/Tests/EventListener/RememberMeListenerTest.php
@@ -15,7 +15,6 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
-use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\Security\Core\User\InMemoryUser;
 use Symfony\Component\Security\Http\Authenticator\AuthenticatorInterface;
 use Symfony\Component\Security\Http\Authenticator\Passport\Badge\RememberMeBadge;
diff --git a/Tests/Firewall/SwitchUserListenerTest.php b/Tests/Firewall/SwitchUserListenerTest.php
@@ -314,7 +314,7 @@ public function testSwitchUserWithReplacedToken()
             ->expects($this->once())
             ->method('dispatch')
             ->with(
-                $this->callback(function (SwitchUserEvent $event) use ($replacedToken, $user) {
+                $this->callback(function (SwitchUserEvent $event) use ($replacedToken) {
                     if ('kuba' !== $event->getTargetUser()->getUserIdentifier()) {
                         return false;
                     }
diff --git a/Tests/Logout/CsrfTokenClearingLogoutHandlerTest.php b/Tests/Logout/CsrfTokenClearingLogoutHandlerTest.php
@@ -33,7 +33,7 @@ protected function setUp(): void
         $this->session = new Session(new MockArraySessionStorage());
 
         // BC for symfony/security-core < 5.3
-        if (\method_exists(SessionTokenStorage::class, 'getSession')) {
+        if (method_exists(SessionTokenStorage::class, 'getSession')) {
             $request = new Request();
             $request->setSession($this->session);
             $this->requestStack = new RequestStack();
diff --git a/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php b/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php
@@ -24,7 +24,6 @@
 use Symfony\Component\Security\Core\Exception\TokenNotFoundException;
 use Symfony\Component\Security\Core\User\InMemoryUser;
 use Symfony\Component\Security\Core\User\InMemoryUserProvider;
-use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Security\Http\RememberMe\PersistentTokenBasedRememberMeServices;
 use Symfony\Component\Security\Http\RememberMe\RememberMeServicesInterface;
 
diff --git a/Tests/RememberMe/SignatureRememberMeHandlerTest.php b/Tests/RememberMe/SignatureRememberMeHandlerTest.php
@@ -20,8 +20,8 @@
 use Symfony\Component\Security\Core\Signature\Exception\ExpiredSignatureException;
 use Symfony\Component\Security\Core\Signature\Exception\InvalidSignatureException;
 use Symfony\Component\Security\Core\Signature\SignatureHasher;
-use Symfony\Component\Security\Core\User\InMemoryUserProvider;
 use Symfony\Component\Security\Core\User\InMemoryUser;
+use Symfony\Component\Security\Core\User\InMemoryUserProvider;
 use Symfony\Component\Security\Http\RememberMe\RememberMeDetails;
 use Symfony\Component\Security\Http\RememberMe\ResponseListener;
 use Symfony\Component\Security\Http\RememberMe\SignatureRememberMeHandler;
@@ -73,7 +73,7 @@ public function testClearRememberMeCookie()
 
         /** @var Cookie $cookie */
         $cookie = $this->request->attributes->get(ResponseListener::COOKIE_ATTR_NAME);
-        $this->assertEquals(null, $cookie->getValue());
+        $this->assertNull($cookie->getValue());
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ class AuthenticatorManager implements AuthenticatorManagerInterface, UserAuthent`
`57`	`57`	`/**`
`58`	`58`	`* @param AuthenticatorInterface[] $authenticators`
`59`	`59`	`*/`
`60`		`- public function __construct(iterable $authenticators, TokenStorageInterface $tokenStorage, EventDispatcherInterface $eventDispatcher, string $firewallName, ?LoggerInterface $logger = null, bool $eraseCredentials = true, bool $hideUserNotFoundExceptions = true, array $requiredBadges = [])`
	`60`	`+ public function __construct(iterable $authenticators, TokenStorageInterface $tokenStorage, EventDispatcherInterface $eventDispatcher, string $firewallName, LoggerInterface $logger = null, bool $eraseCredentials = true, bool $hideUserNotFoundExceptions = true, array $requiredBadges = [])`
`61`	`61`	`{`
`62`	`62`	`$this->authenticators = $authenticators;`
`63`	`63`	`$this->tokenStorage = $tokenStorage;`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ abstract class AbstractPreAuthenticatedAuthenticator implements InteractiveAuthe`
`41`	`41`	`private $firewallName;`
`42`	`42`	`private $logger;`
`43`	`43`
`44`		`- public function __construct(UserProviderInterface $userProvider, TokenStorageInterface $tokenStorage, string $firewallName, ?LoggerInterface $logger = null)`
	`44`	`+ public function __construct(UserProviderInterface $userProvider, TokenStorageInterface $tokenStorage, string $firewallName, LoggerInterface $logger = null)`
`45`	`45`	`{`
`46`	`46`	`$this->userProvider = $userProvider;`
`47`	`47`	`$this->tokenStorage = $tokenStorage;`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ class HttpBasicAuthenticator implements AuthenticatorInterface, AuthenticationEn`
`38`	`38`	`private $userProvider;`
`39`	`39`	`private $logger;`
`40`	`40`
`41`		`- public function __construct(string $realmName, UserProviderInterface $userProvider, ?LoggerInterface $logger = null)`
	`41`	`+ public function __construct(string $realmName, UserProviderInterface $userProvider, LoggerInterface $logger = null)`
`42`	`42`	`{`
`43`	`43`	`$this->realmName = $realmName;`
`44`	`44`	`$this->userProvider = $userProvider;`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ class JsonLoginAuthenticator implements InteractiveAuthenticatorInterface`
`58`	`58`	`*/`
`59`	`59`	`private $translator;`
`60`	`60`
`61`		`- public function __construct(HttpUtils $httpUtils, UserProviderInterface $userProvider, ?AuthenticationSuccessHandlerInterface $successHandler = null, ?AuthenticationFailureHandlerInterface $failureHandler = null, array $options = [], ?PropertyAccessorInterface $propertyAccessor = null)`
	`61`	`+ public function __construct(HttpUtils $httpUtils, UserProviderInterface $userProvider, AuthenticationSuccessHandlerInterface $successHandler = null, AuthenticationFailureHandlerInterface $failureHandler = null, array $options = [], PropertyAccessorInterface $propertyAccessor = null)`
`62`	`62`	`{`
`63`	`63`	`$this->options = array_merge(['username_path' => 'username', 'password_path' => 'password'], $options);`
`64`	`64`	`$this->httpUtils = $httpUtils;`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class PasswordUpgradeBadge implements BadgeInterface`
`32`	`32`	`* @param string $plaintextPassword The presented password, used in the rehash`
`33`	`33`	`* @param PasswordUpgraderInterface\|null $passwordUpgrader The password upgrader, defaults to the UserProvider if null`
`34`	`34`	`*/`
`35`		`- public function __construct(string $plaintextPassword, ?PasswordUpgraderInterface $passwordUpgrader = null)`
	`35`	`+ public function __construct(string $plaintextPassword, PasswordUpgraderInterface $passwordUpgrader = null)`
`36`	`36`	`{`
`37`	`37`	`$this->plaintextPassword = $plaintextPassword;`
`38`	`38`	`$this->passwordUpgrader = $passwordUpgrader;`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ class UserBadge implements BadgeInterface`
`42`	`42`	`* is thrown). If this is not set, the default user provider will be used with`
`43`	`43`	`* $userIdentifier as username.`
`44`	`44`	`*/`
`45`		`- public function __construct(string $userIdentifier, ?callable $userLoader = null)`
	`45`	`+ public function __construct(string $userIdentifier, callable $userLoader = null)`
`46`	`46`	`{`
`47`	`47`	`$this->userIdentifier = $userIdentifier;`
`48`	`48`	`$this->userLoader = $userLoader;`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class RemoteUserAuthenticator extends AbstractPreAuthenticatedAuthenticator`
`32`	`32`	`{`
`33`	`33`	`private $userKey;`
`34`	`34`
`35`		`- public function __construct(UserProviderInterface $userProvider, TokenStorageInterface $tokenStorage, string $firewallName, string $userKey = 'REMOTE_USER', ?LoggerInterface $logger = null)`
	`35`	`+ public function __construct(UserProviderInterface $userProvider, TokenStorageInterface $tokenStorage, string $firewallName, string $userKey = 'REMOTE_USER', LoggerInterface $logger = null)`
`36`	`36`	`{`
`37`	`37`	`parent::__construct($userProvider, $tokenStorage, $firewallName, $logger);`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ class X509Authenticator extends AbstractPreAuthenticatedAuthenticator`
`31`	`31`	`private $userKey;`
`32`	`32`	`private $credentialsKey;`
`33`	`33`
`34`		`- 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)`
	`34`	`+ 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)`
`35`	`35`	`{`
`36`	`36`	`parent::__construct($userProvider, $tokenStorage, $firewallName, $logger);`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,7 @@ public function isMainRequest(): bool`
`73`	`73`	`{`
`74`	`74`	`return $this->event->isMainRequest();`
`75`	`75`	`}`
	`76`	`+`
`76`	`77`	`/**`
`77`	`78`	`* {@inheritdoc}`
`78`	`79`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ class LoginFailureEvent extends Event`
`35`	`35`	`private $firewallName;`
`36`	`36`	`private $passport;`
`37`	`37`
`38`		`- public function __construct(AuthenticationException $exception, AuthenticatorInterface $authenticator, Request $request, ?Response $response, string $firewallName, ?PassportInterface $passport = null)`
	`38`	`+ public function __construct(AuthenticationException $exception, AuthenticatorInterface $authenticator, Request $request, ?Response $response, string $firewallName, PassportInterface $passport = null)`
`39`	`39`	`{`
`40`	`40`	`$this->exception = $exception;`
`41`	`41`	`$this->authenticator = $authenticator;`