Merge branch '5.4' into 6.3

* 5.4: Fix implicitly-required parameters List CS fix in .git-blame-ignore-revs Apply php-cs-fixer fix --rules nullable_type_declaration_for_default_null_value [Messenger][AmazonSqs] Allow async-aws/sqs version 2
symfony · Jan 23, 2024 · 5131409 · 5131409
2 parents 82161c4 + 23b9782
commit 5131409
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git a/Exception/InvalidPasswordException.php b/Exception/InvalidPasswordException.php
@@ -16,7 +16,7 @@
  */
 class InvalidPasswordException extends \RuntimeException implements ExceptionInterface
 {
-    public function __construct(string $message = 'Invalid password.', int $code = 0, \Throwable $previous = null)
+    public function __construct(string $message = 'Invalid password.', int $code = 0, ?\Throwable $previous = null)
     {
         parent::__construct($message, $code, $previous);
     }

diff --git a/Hasher/MessageDigestPasswordHasher.php b/Hasher/MessageDigestPasswordHasher.php
@@ -48,7 +48,7 @@ public function __construct(string $algorithm = 'sha512', bool $encodeHashAsBase
         $this->iterations = $iterations;
     }
 
-    public function hash(#[\SensitiveParameter] string $plainPassword, string $salt = null): string
+    public function hash(#[\SensitiveParameter] string $plainPassword, ?string $salt = null): string
     {
         if ($this->isPasswordTooLong($plainPassword)) {
             throw new InvalidPasswordException();
@@ -69,7 +69,7 @@ public function hash(#[\SensitiveParameter] string $plainPassword, string $salt
         return $this->encodeHashAsBase64 ? base64_encode($digest) : bin2hex($digest);
     }
 
-    public function verify(string $hashedPassword, #[\SensitiveParameter] string $plainPassword, string $salt = null): bool
+    public function verify(string $hashedPassword, #[\SensitiveParameter] string $plainPassword, ?string $salt = null): bool
     {
         if (\strlen($hashedPassword) !== $this->hashLength || str_contains($hashedPassword, '$')) {
             return false;

diff --git a/Hasher/MigratingPasswordHasher.php b/Hasher/MigratingPasswordHasher.php
@@ -33,12 +33,12 @@ public function __construct(PasswordHasherInterface $bestHasher, PasswordHasherI
         $this->extraHashers = $extraHashers;
     }
 
-    public function hash(#[\SensitiveParameter] string $plainPassword, string $salt = null): string
+    public function hash(#[\SensitiveParameter] string $plainPassword, ?string $salt = null): string
     {
         return $this->bestHasher->hash($plainPassword, $salt);
     }
 
-    public function verify(string $hashedPassword, #[\SensitiveParameter] string $plainPassword, string $salt = null): bool
+    public function verify(string $hashedPassword, #[\SensitiveParameter] string $plainPassword, ?string $salt = null): bool
     {
         if ($this->bestHasher->verify($hashedPassword, $plainPassword, $salt)) {
             return true;

diff --git a/Hasher/NativePasswordHasher.php b/Hasher/NativePasswordHasher.php
@@ -31,7 +31,7 @@ final class NativePasswordHasher implements PasswordHasherInterface
     /**
      * @param string|null $algorithm An algorithm supported by password_hash() or null to use the best available algorithm
      */
-    public function __construct(int $opsLimit = null, int $memLimit = null, int $cost = null, string $algorithm = null)
+    public function __construct(?int $opsLimit = null, ?int $memLimit = null, ?int $cost = null, ?string $algorithm = null)
     {
         $cost ??= 13;
         $opsLimit ??= max(4, \defined('SODIUM_CRYPTO_PWHASH_OPSLIMIT_INTERACTIVE') ? \SODIUM_CRYPTO_PWHASH_OPSLIMIT_INTERACTIVE : 4);

diff --git a/Hasher/Pbkdf2PasswordHasher.php b/Hasher/Pbkdf2PasswordHasher.php
@@ -59,7 +59,7 @@ public function __construct(string $algorithm = 'sha512', bool $encodeHashAsBase
         $this->iterations = $iterations;
     }
 
-    public function hash(#[\SensitiveParameter] string $plainPassword, string $salt = null): string
+    public function hash(#[\SensitiveParameter] string $plainPassword, ?string $salt = null): string
     {
         if ($this->isPasswordTooLong($plainPassword)) {
             throw new InvalidPasswordException();
@@ -74,7 +74,7 @@ public function hash(#[\SensitiveParameter] string $plainPassword, string $salt
         return $this->encodeHashAsBase64 ? base64_encode($digest) : bin2hex($digest);
     }
 
-    public function verify(string $hashedPassword, #[\SensitiveParameter] string $plainPassword, string $salt = null): bool
+    public function verify(string $hashedPassword, #[\SensitiveParameter] string $plainPassword, ?string $salt = null): bool
     {
         if (\strlen($hashedPassword) !== $this->encodedLength || str_contains($hashedPassword, '$')) {
             return false;

diff --git a/Hasher/PlaintextPasswordHasher.php b/Hasher/PlaintextPasswordHasher.php
@@ -35,7 +35,7 @@ public function __construct(bool $ignorePasswordCase = false)
         $this->ignorePasswordCase = $ignorePasswordCase;
     }
 
-    public function hash(#[\SensitiveParameter] string $plainPassword, string $salt = null): string
+    public function hash(#[\SensitiveParameter] string $plainPassword, ?string $salt = null): string
     {
         if ($this->isPasswordTooLong($plainPassword)) {
             throw new InvalidPasswordException();
@@ -44,7 +44,7 @@ public function hash(#[\SensitiveParameter] string $plainPassword, string $salt
         return $this->mergePasswordAndSalt($plainPassword, $salt);
     }
 
-    public function verify(string $hashedPassword, #[\SensitiveParameter] string $plainPassword, string $salt = null): bool
+    public function verify(string $hashedPassword, #[\SensitiveParameter] string $plainPassword, ?string $salt = null): bool
     {
         if ($this->isPasswordTooLong($plainPassword)) {
             return false;

diff --git a/Hasher/SodiumPasswordHasher.php b/Hasher/SodiumPasswordHasher.php
@@ -29,7 +29,7 @@ final class SodiumPasswordHasher implements PasswordHasherInterface
     private int $opsLimit;
     private int $memLimit;
 
-    public function __construct(int $opsLimit = null, int $memLimit = null)
+    public function __construct(?int $opsLimit = null, ?int $memLimit = null)
     {
         if (!self::isSupported()) {
             throw new LogicException('Libsodium is not available. You should either install the sodium extension or use a different password hasher.');

diff --git a/LegacyPasswordHasherInterface.php b/LegacyPasswordHasherInterface.php
@@ -27,10 +27,10 @@ interface LegacyPasswordHasherInterface extends PasswordHasherInterface
      *
      * @throws InvalidPasswordException If the plain password is invalid, e.g. excessively long
      */
-    public function hash(#[\SensitiveParameter] string $plainPassword, string $salt = null): string;
+    public function hash(#[\SensitiveParameter] string $plainPassword, ?string $salt = null): string;
 
     /**
      * Checks that a plain password and a salt match a password hash.
      */
-    public function verify(string $hashedPassword, #[\SensitiveParameter] string $plainPassword, string $salt = null): bool;
+    public function verify(string $hashedPassword, #[\SensitiveParameter] string $plainPassword, ?string $salt = null): bool;
 }