Apply php-cs-fixer fix --rules nullable_type_declaration_for_default_null_value

nicolas-grekas · nicolas-grekas · commit 3cbacefb2a35 · 2024-01-23T14:51:25.000+01:00
diff --git a/Authentication/AuthenticationTrustResolver.php b/Authentication/AuthenticationTrustResolver.php
@@ -22,7 +22,7 @@
  */
 class AuthenticationTrustResolver implements AuthenticationTrustResolverInterface
 {
-    public function isAuthenticated(TokenInterface $token = null): bool
+    public function isAuthenticated(?TokenInterface $token = null): bool
     {
         return $token && $token->getUser()
             // @deprecated since Symfony 5.4, TokenInterface::isAuthenticated() and AnonymousToken no longer exists in 6.0
@@ -32,7 +32,7 @@ public function isAuthenticated(TokenInterface $token = null): bool
     /**
      * {@inheritdoc}
      */
-    public function isAnonymous(TokenInterface $token = null/* , $deprecation = true */)
+    public function isAnonymous(?TokenInterface $token = null/* , $deprecation = true */)
     {
         if (1 === \func_num_args() || false !== func_get_arg(1)) {
             trigger_deprecation('symfony/security-core', '5.4', 'The "%s()" method is deprecated, use "isAuthenticated()" or "isFullFledged()" if you want to check if the request is (fully) authenticated.', __METHOD__);
@@ -44,15 +44,15 @@ public function isAnonymous(TokenInterface $token = null/* , $deprecation = true
     /**
      * {@inheritdoc}
      */
-    public function isRememberMe(TokenInterface $token = null)
+    public function isRememberMe(?TokenInterface $token = null)
     {
         return $token && $token instanceof RememberMeToken;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function isFullFledged(TokenInterface $token = null)
+    public function isFullFledged(?TokenInterface $token = null)
     {
         return $token && !$this->isAnonymous($token, false) && !$this->isRememberMe($token);
     }
diff --git a/Authentication/AuthenticationTrustResolverInterface.php b/Authentication/AuthenticationTrustResolverInterface.php
@@ -32,20 +32,20 @@ interface AuthenticationTrustResolverInterface
      *
      * @deprecated since Symfony 5.4, use !isAuthenticated() instead
      */
-    public function isAnonymous(TokenInterface $token = null);
+    public function isAnonymous(?TokenInterface $token = null);
 
     /**
      * Resolves whether the passed token implementation is authenticated
      * using remember-me capabilities.
      *
      * @return bool
      */
-    public function isRememberMe(TokenInterface $token = null);
+    public function isRememberMe(?TokenInterface $token = null);
 
     /**
      * Resolves whether the passed token implementation is fully authenticated.
      *
      * @return bool
      */
-    public function isFullFledged(TokenInterface $token = null);
+    public function isFullFledged(?TokenInterface $token = null);
 }
diff --git a/Authentication/Token/Storage/TokenStorage.php b/Authentication/Token/Storage/TokenStorage.php
@@ -43,7 +43,7 @@ public function getToken()
     /**
      * {@inheritdoc}
      */
-    public function setToken(TokenInterface $token = null)
+    public function setToken(?TokenInterface $token = null)
     {
         if ($token) {
             // ensure any initializer is called
diff --git a/Authentication/Token/Storage/TokenStorageInterface.php b/Authentication/Token/Storage/TokenStorageInterface.php
@@ -32,5 +32,5 @@ public function getToken();
      *
      * @param TokenInterface|null $token A TokenInterface token, or null if no further authentication information should be stored
      */
-    public function setToken(TokenInterface $token = null);
+    public function setToken(?TokenInterface $token = null);
 }
diff --git a/Authentication/Token/Storage/UsageTrackingTokenStorage.php b/Authentication/Token/Storage/UsageTrackingTokenStorage.php
@@ -50,7 +50,7 @@ public function getToken(): ?TokenInterface
     /**
      * {@inheritdoc}
      */
-    public function setToken(TokenInterface $token = null): void
+    public function setToken(?TokenInterface $token = null): void
     {
         $this->storage->setToken($token);
 
diff --git a/Authorization/ExpressionLanguage.php b/Authorization/ExpressionLanguage.php
@@ -32,7 +32,7 @@ class ExpressionLanguage extends BaseExpressionLanguage
         /**
          * {@inheritdoc}
          */
-        public function __construct(CacheItemPoolInterface $cache = null, array $providers = [])
+        public function __construct(?CacheItemPoolInterface $cache = null, array $providers = [])
         {
             // prepend the default provider to let users override it easily
             array_unshift($providers, new ExpressionLanguageProvider());
diff --git a/Authorization/Voter/ExpressionVoter.php b/Authorization/Voter/ExpressionVoter.php
@@ -31,7 +31,7 @@ class ExpressionVoter implements CacheableVoterInterface
     private $authChecker;
     private $roleHierarchy;
 
-    public function __construct(ExpressionLanguage $expressionLanguage, AuthenticationTrustResolverInterface $trustResolver, AuthorizationCheckerInterface $authChecker, RoleHierarchyInterface $roleHierarchy = null)
+    public function __construct(ExpressionLanguage $expressionLanguage, AuthenticationTrustResolverInterface $trustResolver, AuthorizationCheckerInterface $authChecker, ?RoleHierarchyInterface $roleHierarchy = null)
     {
         $this->expressionLanguage = $expressionLanguage;
         $this->trustResolver = $trustResolver;
diff --git a/Encoder/NativePasswordEncoder.php b/Encoder/NativePasswordEncoder.php
@@ -31,7 +31,7 @@ final class NativePasswordEncoder implements PasswordEncoderInterface, SelfSalti
     /**
      * @param string|null $algo An algorithm supported by password_hash() or null to use the stronger available algorithm
      */
-    public function __construct(int $opsLimit = null, int $memLimit = null, int $cost = null, string $algo = null)
+    public function __construct(?int $opsLimit = null, ?int $memLimit = null, ?int $cost = null, ?string $algo = null)
     {
         $this->hasher = new NativePasswordHasher($opsLimit, $memLimit, $cost, $algo);
     }
diff --git a/Encoder/PasswordHasherAdapter.php b/Encoder/PasswordHasherAdapter.php
@@ -29,12 +29,12 @@ public function __construct(PasswordEncoderInterface $passwordEncoder)
         $this->passwordEncoder = $passwordEncoder;
     }
 
-    public function hash(string $plainPassword, string $salt = null): string
+    public function hash(string $plainPassword, ?string $salt = null): string
     {
         return $this->passwordEncoder->encodePassword($plainPassword, $salt);
     }
 
-    public function verify(string $hashedPassword, string $plainPassword, string $salt = null): bool
+    public function verify(string $hashedPassword, string $plainPassword, ?string $salt = null): bool
     {
         return $this->passwordEncoder->isPasswordValid($hashedPassword, $plainPassword, $salt);
     }
diff --git a/Encoder/SodiumPasswordEncoder.php b/Encoder/SodiumPasswordEncoder.php
@@ -28,7 +28,7 @@ final class SodiumPasswordEncoder implements PasswordEncoderInterface, SelfSalti
 {
     use LegacyEncoderTrait;
 
-    public function __construct(int $opsLimit = null, int $memLimit = null)
+    public function __construct(?int $opsLimit = null, ?int $memLimit = null)
     {
         $this->hasher = new SodiumPasswordHasher($opsLimit, $memLimit);
     }
diff --git a/Exception/AccessDeniedException.php b/Exception/AccessDeniedException.php
@@ -21,7 +21,7 @@ class AccessDeniedException extends RuntimeException
     private $attributes = [];
     private $subject;
 
-    public function __construct(string $message = 'Access Denied.', \Throwable $previous = null)
+    public function __construct(string $message = 'Access Denied.', ?\Throwable $previous = null)
     {
         parent::__construct($message, 403, $previous);
     }
diff --git a/Exception/AuthenticationException.php b/Exception/AuthenticationException.php
@@ -26,7 +26,7 @@ class AuthenticationException extends RuntimeException
 
     private $token;
 
-    public function __construct(string $message = '', int $code = 0, \Throwable $previous = null)
+    public function __construct(string $message = '', int $code = 0, ?\Throwable $previous = null)
     {
         unset($this->serialized);
         parent::__construct($message, $code, $previous);
diff --git a/Exception/CustomUserMessageAccountStatusException.php b/Exception/CustomUserMessageAccountStatusException.php
@@ -27,7 +27,7 @@ class CustomUserMessageAccountStatusException extends AccountStatusException
 
     private $messageData = [];
 
-    public function __construct(string $message = '', array $messageData = [], int $code = 0, \Throwable $previous = null)
+    public function __construct(string $message = '', array $messageData = [], int $code = 0, ?\Throwable $previous = null)
     {
         parent::__construct($message, $code, $previous);
 
diff --git a/Exception/CustomUserMessageAuthenticationException.php b/Exception/CustomUserMessageAuthenticationException.php
@@ -26,7 +26,7 @@ class CustomUserMessageAuthenticationException extends AuthenticationException
 
     private $messageData = [];
 
-    public function __construct(string $message = '', array $messageData = [], int $code = 0, \Throwable $previous = null)
+    public function __construct(string $message = '', array $messageData = [], int $code = 0, ?\Throwable $previous = null)
     {
         parent::__construct($message, $code, $previous);
 
diff --git a/Exception/LogoutException.php b/Exception/LogoutException.php
@@ -18,7 +18,7 @@
  */
 class LogoutException extends RuntimeException
 {
-    public function __construct(string $message = 'Logout Exception', \Throwable $previous = null)
+    public function __construct(string $message = 'Logout Exception', ?\Throwable $previous = null)
     {
         parent::__construct($message, 403, $previous);
     }
diff --git a/Exception/TooManyLoginAttemptsAuthenticationException.php b/Exception/TooManyLoginAttemptsAuthenticationException.php
@@ -21,7 +21,7 @@ class TooManyLoginAttemptsAuthenticationException extends AuthenticationExceptio
 {
     private $threshold;
 
-    public function __construct(int $threshold = null)
+    public function __construct(?int $threshold = null)
     {
         $this->threshold = $threshold;
     }
diff --git a/Signature/SignatureHasher.php b/Signature/SignatureHasher.php
@@ -35,7 +35,7 @@ class SignatureHasher
      * @param ExpiredSignatureStorage|null $expiredSignaturesStorage If provided, secures a sequence of hashes that are expired
      * @param int|null                     $maxUses                  Used together with $expiredSignatureStorage to allow a maximum usage of a hash
      */
-    public function __construct(PropertyAccessorInterface $propertyAccessor, array $signatureProperties, string $secret, ExpiredSignatureStorage $expiredSignaturesStorage = null, int $maxUses = null)
+    public function __construct(PropertyAccessorInterface $propertyAccessor, array $signatureProperties, string $secret, ?ExpiredSignatureStorage $expiredSignaturesStorage = null, ?int $maxUses = null)
     {
         $this->propertyAccessor = $propertyAccessor;
         $this->signatureProperties = $signatureProperties;
diff --git a/Tests/Authentication/Token/AbstractTokenTest.php b/Tests/Authentication/Token/AbstractTokenTest.php
@@ -359,7 +359,7 @@ class ConcreteToken extends AbstractToken
 {
     private $credentials = 'credentials_value';
 
-    public function __construct(array $roles = [], UserInterface $user = null)
+    public function __construct(array $roles = [], ?UserInterface $user = null)
     {
         parent::__construct($roles);
 
diff --git a/Validator/Constraints/UserPassword.php b/Validator/Constraints/UserPassword.php
@@ -23,7 +23,7 @@ class UserPassword extends Constraint
     public $message = 'This value should be the user\'s current password.';
     public $service = 'security.validator.user_password';
 
-    public function __construct(array $options = null, string $message = null, string $service = null, array $groups = null, $payload = null)
+    public function __construct(?array $options = null, ?string $message = null, ?string $service = null, ?array $groups = null, $payload = null)
     {
         parent::__construct($options, $groups, $payload);
 

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`*/`
`23`	`23`	`class AuthenticationTrustResolver implements AuthenticationTrustResolverInterface`
`24`	`24`	`{`
`25`		`- public function isAuthenticated(TokenInterface $token = null): bool`
	`25`	`+ public function isAuthenticated(?TokenInterface $token = null): bool`
`26`	`26`	`{`
`27`	`27`	`return $token && $token->getUser()`
`28`	`28`	`// @deprecated since Symfony 5.4, TokenInterface::isAuthenticated() and AnonymousToken no longer exists in 6.0`
`@@ -32,7 +32,7 @@ public function isAuthenticated(TokenInterface $token = null): bool`
`32`	`32`	`/**`
`33`	`33`	`* {@inheritdoc}`
`34`	`34`	`*/`
`35`		`- public function isAnonymous(TokenInterface $token = null/* , $deprecation = true */)`
	`35`	`+ public function isAnonymous(?TokenInterface $token = null/* , $deprecation = true */)`
`36`	`36`	`{`
`37`	`37`	`if (1 === \func_num_args() \|\| false !== func_get_arg(1)) {`
`38`	`38`	`trigger_deprecation('symfony/security-core', '5.4', 'The "%s()" method is deprecated, use "isAuthenticated()" or "isFullFledged()" if you want to check if the request is (fully) authenticated.', __METHOD__);`
`@@ -44,15 +44,15 @@ public function isAnonymous(TokenInterface $token = null/* , $deprecation = true`
`44`	`44`	`/**`
`45`	`45`	`* {@inheritdoc}`
`46`	`46`	`*/`
`47`		`- public function isRememberMe(TokenInterface $token = null)`
	`47`	`+ public function isRememberMe(?TokenInterface $token = null)`
`48`	`48`	`{`
`49`	`49`	`return $token && $token instanceof RememberMeToken;`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`/**`
`53`	`53`	`* {@inheritdoc}`
`54`	`54`	`*/`
`55`		`- public function isFullFledged(TokenInterface $token = null)`
	`55`	`+ public function isFullFledged(?TokenInterface $token = null)`
`56`	`56`	`{`
`57`	`57`	`return $token && !$this->isAnonymous($token, false) && !$this->isRememberMe($token);`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,20 +32,20 @@ interface AuthenticationTrustResolverInterface`
`32`	`32`	`*`
`33`	`33`	`* @deprecated since Symfony 5.4, use !isAuthenticated() instead`
`34`	`34`	`*/`
`35`		`- public function isAnonymous(TokenInterface $token = null);`
	`35`	`+ public function isAnonymous(?TokenInterface $token = null);`
`36`	`36`
`37`	`37`	`/**`
`38`	`38`	`* Resolves whether the passed token implementation is authenticated`
`39`	`39`	`* using remember-me capabilities.`
`40`	`40`	`*`
`41`	`41`	`* @return bool`
`42`	`42`	`*/`
`43`		`- public function isRememberMe(TokenInterface $token = null);`
	`43`	`+ public function isRememberMe(?TokenInterface $token = null);`
`44`	`44`
`45`	`45`	`/**`
`46`	`46`	`* Resolves whether the passed token implementation is fully authenticated.`
`47`	`47`	`*`
`48`	`48`	`* @return bool`
`49`	`49`	`*/`
`50`		`- public function isFullFledged(TokenInterface $token = null);`
	`50`	`+ public function isFullFledged(?TokenInterface $token = null);`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function getToken()`
`43`	`43`	`/**`
`44`	`44`	`* {@inheritdoc}`
`45`	`45`	`*/`
`46`		`- public function setToken(TokenInterface $token = null)`
	`46`	`+ public function setToken(?TokenInterface $token = null)`
`47`	`47`	`{`
`48`	`48`	`if ($token) {`
`49`	`49`	`// ensure any initializer is called`
Original file line number	Diff line number	Diff line change
`@@ -32,5 +32,5 @@ public function getToken();`
`32`	`32`	`*`
`33`	`33`	`* @param TokenInterface\|null $token A TokenInterface token, or null if no further authentication information should be stored`
`34`	`34`	`*/`
`35`		`- public function setToken(TokenInterface $token = null);`
	`35`	`+ public function setToken(?TokenInterface $token = null);`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public function getToken(): ?TokenInterface`
`50`	`50`	`/**`
`51`	`51`	`* {@inheritdoc}`
`52`	`52`	`*/`
`53`		`- public function setToken(TokenInterface $token = null): void`
	`53`	`+ public function setToken(?TokenInterface $token = null): void`
`54`	`54`	`{`
`55`	`55`	`$this->storage->setToken($token);`
`56`	`56`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class ExpressionLanguage extends BaseExpressionLanguage`
`32`	`32`	`/**`
`33`	`33`	`* {@inheritdoc}`
`34`	`34`	`*/`
`35`		`- public function __construct(CacheItemPoolInterface $cache = null, array $providers = [])`
	`35`	`+ public function __construct(?CacheItemPoolInterface $cache = null, array $providers = [])`
`36`	`36`	`{`
`37`	`37`	`// prepend the default provider to let users override it easily`
`38`	`38`	`array_unshift($providers, new ExpressionLanguageProvider());`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ class ExpressionVoter implements CacheableVoterInterface`
`31`	`31`	`private $authChecker;`
`32`	`32`	`private $roleHierarchy;`
`33`	`33`
`34`		`- public function __construct(ExpressionLanguage $expressionLanguage, AuthenticationTrustResolverInterface $trustResolver, AuthorizationCheckerInterface $authChecker, RoleHierarchyInterface $roleHierarchy = null)`
	`34`	`+ public function __construct(ExpressionLanguage $expressionLanguage, AuthenticationTrustResolverInterface $trustResolver, AuthorizationCheckerInterface $authChecker, ?RoleHierarchyInterface $roleHierarchy = null)`
`35`	`35`	`{`
`36`	`36`	`$this->expressionLanguage = $expressionLanguage;`
`37`	`37`	`$this->trustResolver = $trustResolver;`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ final class NativePasswordEncoder implements PasswordEncoderInterface, SelfSalti`
`31`	`31`	`/**`
`32`	`32`	`* @param string\|null $algo An algorithm supported by password_hash() or null to use the stronger available algorithm`
`33`	`33`	`*/`
`34`		`- public function __construct(int $opsLimit = null, int $memLimit = null, int $cost = null, string $algo = null)`
	`34`	`+ public function __construct(?int $opsLimit = null, ?int $memLimit = null, ?int $cost = null, ?string $algo = null)`
`35`	`35`	`{`
`36`	`36`	`$this->hasher = new NativePasswordHasher($opsLimit, $memLimit, $cost, $algo);`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,12 +29,12 @@ public function __construct(PasswordEncoderInterface $passwordEncoder)`
`29`	`29`	`$this->passwordEncoder = $passwordEncoder;`
`30`	`30`	`}`
`31`	`31`
`32`		`- public function hash(string $plainPassword, string $salt = null): string`
	`32`	`+ public function hash(string $plainPassword, ?string $salt = null): string`
`33`	`33`	`{`
`34`	`34`	`return $this->passwordEncoder->encodePassword($plainPassword, $salt);`
`35`	`35`	`}`
`36`	`36`
`37`		`- public function verify(string $hashedPassword, string $plainPassword, string $salt = null): bool`
	`37`	`+ public function verify(string $hashedPassword, string $plainPassword, ?string $salt = null): bool`
`38`	`38`	`{`
`39`	`39`	`return $this->passwordEncoder->isPasswordValid($hashedPassword, $plainPassword, $salt);`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ final class SodiumPasswordEncoder implements PasswordEncoderInterface, SelfSalti`
`28`	`28`	`{`
`29`	`29`	`use LegacyEncoderTrait;`
`30`	`30`
`31`		`- public function __construct(int $opsLimit = null, int $memLimit = null)`
	`31`	`+ public function __construct(?int $opsLimit = null, ?int $memLimit = null)`
`32`	`32`	`{`
`33`	`33`	`$this->hasher = new SodiumPasswordHasher($opsLimit, $memLimit);`
`34`	`34`	`}`