Merge branch '5.2' into 5.3

* 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
symfony · Jun 30, 2021 · 61dd1e9 · 61dd1e9
1 parent eacf514
commit 61dd1e9
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 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(string $plainPassword, ?string $salt = null): string
+    public function hash(string $plainPassword, string $salt = null): string
     {
         if ($this->isPasswordTooLong($plainPassword)) {
             throw new InvalidPasswordException();
@@ -69,7 +69,7 @@ public function hash(string $plainPassword, ?string $salt = null): string
         return $this->encodeHashAsBase64 ? base64_encode($digest) : bin2hex($digest);
     }
 
-    public function verify(string $hashedPassword, string $plainPassword, ?string $salt = null): bool
+    public function verify(string $hashedPassword, string $plainPassword, string $salt = null): bool
     {
         if (\strlen($hashedPassword) !== $this->hashLength || false !== strpos($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(string $plainPassword, ?string $salt = null): string
+    public function hash(string $plainPassword, string $salt = null): string
     {
         return $this->bestHasher->hash($plainPassword, $salt);
     }
 
-    public function verify(string $hashedPassword, string $plainPassword, ?string $salt = null): bool
+    public function verify(string $hashedPassword, 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 = $cost ?? 13;
         $opsLimit = $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(string $plainPassword, ?string $salt = null): string
+    public function hash(string $plainPassword, string $salt = null): string
     {
         if ($this->isPasswordTooLong($plainPassword)) {
             throw new InvalidPasswordException();
@@ -74,7 +74,7 @@ public function hash(string $plainPassword, ?string $salt = null): string
         return $this->encodeHashAsBase64 ? base64_encode($digest) : bin2hex($digest);
     }
 
-    public function verify(string $hashedPassword, string $plainPassword, ?string $salt = null): bool
+    public function verify(string $hashedPassword, string $plainPassword, string $salt = null): bool
     {
         if (\strlen($hashedPassword) !== $this->encodedLength || false !== strpos($hashedPassword, '$')) {
             return false;

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

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