CS fix

nicolas-grekas · nicolas-grekas · commit 8ea54b7efd09 · 2021-06-30T15:15:49.000+02:00
diff --git a/Authentication/AuthenticatorManager.php b/Authentication/AuthenticatorManager.php
@@ -58,7 +58,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)
+    public function __construct(iterable $authenticators, TokenStorageInterface $tokenStorage, EventDispatcherInterface $eventDispatcher, string $firewallName, LoggerInterface $logger = null, bool $eraseCredentials = true, bool $hideUserNotFoundExceptions = true)
     {
         $this->authenticators = $authenticators;
         $this->tokenStorage = $tokenStorage;
diff --git a/Authenticator/AbstractPreAuthenticatedAuthenticator.php b/Authenticator/AbstractPreAuthenticatedAuthenticator.php
@@ -42,7 +42,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
@@ -41,7 +41,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
@@ -61,7 +61,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
@@ -33,7 +33,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
@@ -45,7 +45,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
@@ -32,7 +32,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/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/RememberMeListener.php b/EventListener/RememberMeListener.php
@@ -36,7 +36,7 @@ class RememberMeListener implements EventSubscriberInterface
     private $rememberMeServices;
     private $logger;
 
-    public function __construct(RememberMeServicesInterface $rememberMeServices, ?LoggerInterface $logger = null)
+    public function __construct(RememberMeServicesInterface $rememberMeServices, LoggerInterface $logger = null)
     {
         $this->rememberMeServices = $rememberMeServices;
         $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);

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ class AuthenticatorManager implements AuthenticatorManagerInterface, UserAuthent`
`58`	`58`	`/**`
`59`	`59`	`* @param AuthenticatorInterface[] $authenticators`
`60`	`60`	`*/`
`61`		`- public function __construct(iterable $authenticators, TokenStorageInterface $tokenStorage, EventDispatcherInterface $eventDispatcher, string $firewallName, ?LoggerInterface $logger = null, bool $eraseCredentials = true, bool $hideUserNotFoundExceptions = true)`
	`61`	`+ public function __construct(iterable $authenticators, TokenStorageInterface $tokenStorage, EventDispatcherInterface $eventDispatcher, string $firewallName, LoggerInterface $logger = null, bool $eraseCredentials = true, bool $hideUserNotFoundExceptions = true)`
`62`	`62`	`{`
`63`	`63`	`$this->authenticators = $authenticators;`
`64`	`64`	`$this->tokenStorage = $tokenStorage;`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ abstract class AbstractPreAuthenticatedAuthenticator implements InteractiveAuthe`
`42`	`42`	`private $firewallName;`
`43`	`43`	`private $logger;`
`44`	`44`
`45`		`- public function __construct(UserProviderInterface $userProvider, TokenStorageInterface $tokenStorage, string $firewallName, ?LoggerInterface $logger = null)`
	`45`	`+ public function __construct(UserProviderInterface $userProvider, TokenStorageInterface $tokenStorage, string $firewallName, LoggerInterface $logger = null)`
`46`	`46`	`{`
`47`	`47`	`$this->userProvider = $userProvider;`
`48`	`48`	`$this->tokenStorage = $tokenStorage;`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ class HttpBasicAuthenticator implements AuthenticatorInterface, AuthenticationEn`
`41`	`41`	`private $userProvider;`
`42`	`42`	`private $logger;`
`43`	`43`
`44`		`- public function __construct(string $realmName, UserProviderInterface $userProvider, ?LoggerInterface $logger = null)`
	`44`	`+ public function __construct(string $realmName, UserProviderInterface $userProvider, LoggerInterface $logger = null)`
`45`	`45`	`{`
`46`	`46`	`$this->realmName = $realmName;`
`47`	`47`	`$this->userProvider = $userProvider;`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ class JsonLoginAuthenticator implements InteractiveAuthenticatorInterface`
`61`	`61`	`*/`
`62`	`62`	`private $translator;`
`63`	`63`
`64`		`- public function __construct(HttpUtils $httpUtils, UserProviderInterface $userProvider, ?AuthenticationSuccessHandlerInterface $successHandler = null, ?AuthenticationFailureHandlerInterface $failureHandler = null, array $options = [], ?PropertyAccessorInterface $propertyAccessor = null)`
	`64`	`+ public function __construct(HttpUtils $httpUtils, UserProviderInterface $userProvider, AuthenticationSuccessHandlerInterface $successHandler = null, AuthenticationFailureHandlerInterface $failureHandler = null, array $options = [], PropertyAccessorInterface $propertyAccessor = null)`
`65`	`65`	`{`
`66`	`66`	`$this->options = array_merge(['username_path' => 'username', 'password_path' => 'password'], $options);`
`67`	`67`	`$this->httpUtils = $httpUtils;`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class PasswordUpgradeBadge implements BadgeInterface`
`33`	`33`	`* @param string $plaintextPassword The presented password, used in the rehash`
`34`	`34`	`* @param PasswordUpgraderInterface\|null $passwordUpgrader The password upgrader, defaults to the UserProvider if null`
`35`	`35`	`*/`
`36`		`- public function __construct(string $plaintextPassword, ?PasswordUpgraderInterface $passwordUpgrader = null)`
	`36`	`+ public function __construct(string $plaintextPassword, PasswordUpgraderInterface $passwordUpgrader = null)`
`37`	`37`	`{`
`38`	`38`	`$this->plaintextPassword = $plaintextPassword;`
`39`	`39`	`$this->passwordUpgrader = $passwordUpgrader;`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ class UserBadge implements BadgeInterface`
`45`	`45`	`* is thrown). If this is not set, the default user provider will be used with`
`46`	`46`	`* $userIdentifier as username.`
`47`	`47`	`*/`
`48`		`- public function __construct(string $userIdentifier, ?callable $userLoader = null)`
	`48`	`+ public function __construct(string $userIdentifier, callable $userLoader = null)`
`49`	`49`	`{`
`50`	`50`	`$this->userIdentifier = $userIdentifier;`
`51`	`51`	`$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
`@@ -32,7 +32,7 @@ class X509Authenticator extends AbstractPreAuthenticatedAuthenticator`
`32`	`32`	`private $userKey;`
`33`	`33`	`private $credentialsKey;`
`34`	`34`
`35`		`- 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`	`+ 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)`
`36`	`36`	`{`
`37`	`37`	`parent::__construct($userProvider, $tokenStorage, $firewallName, $logger);`
`38`	`38`
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;`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class RememberMeListener implements EventSubscriberInterface`
`36`	`36`	`private $rememberMeServices;`
`37`	`37`	`private $logger;`
`38`	`38`
`39`		`- public function __construct(RememberMeServicesInterface $rememberMeServices, ?LoggerInterface $logger = null)`
	`39`	`+ public function __construct(RememberMeServicesInterface $rememberMeServices, LoggerInterface $logger = null)`
`40`	`40`	`{`
`41`	`41`	`$this->rememberMeServices = $rememberMeServices;`
`42`	`42`	`$this->logger = $logger;`