Merge branch '6.3' into 6.4

nicolas-grekas · nicolas-grekas · commit 5189cdfe89a9 · 2024-01-23T15:51:35.000+01:00
* 6.3:
  minor #53524 [Messenger] [AmazonSqs] Allow `async-aws/sqs` version 2 (smoench)
  Fix bad merge
  List CS fix in .git-blame-ignore-revs
  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
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;
 }

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`*/`
`17`	`17`	`class InvalidPasswordException extends \RuntimeException implements ExceptionInterface`
`18`	`18`	`{`
`19`		`- public function __construct(string $message = 'Invalid password.', int $code = 0, \Throwable $previous = null)`
	`19`	`+ public function __construct(string $message = 'Invalid password.', int $code = 0, ?\Throwable $previous = null)`
`20`	`20`	`{`
`21`	`21`	`parent::__construct($message, $code, $previous);`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public function __construct(string $algorithm = 'sha512', bool $encodeHashAsBase`
`48`	`48`	`$this->iterations = $iterations;`
`49`	`49`	`}`
`50`	`50`
`51`		`- public function hash(#[\SensitiveParameter] string $plainPassword, string $salt = null): string`
	`51`	`+ public function hash(#[\SensitiveParameter] string $plainPassword, ?string $salt = null): string`
`52`	`52`	`{`
`53`	`53`	`if ($this->isPasswordTooLong($plainPassword)) {`
`54`	`54`	`throw new InvalidPasswordException();`
`@@ -69,7 +69,7 @@ public function hash(#[\SensitiveParameter] string $plainPassword, string $salt`
`69`	`69`	`return $this->encodeHashAsBase64 ? base64_encode($digest) : bin2hex($digest);`
`70`	`70`	`}`
`71`	`71`
`72`		`- public function verify(string $hashedPassword, #[\SensitiveParameter] string $plainPassword, string $salt = null): bool`
	`72`	`+ public function verify(string $hashedPassword, #[\SensitiveParameter] string $plainPassword, ?string $salt = null): bool`
`73`	`73`	`{`
`74`	`74`	`if (\strlen($hashedPassword) !== $this->hashLength \|\| str_contains($hashedPassword, '$')) {`
`75`	`75`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -33,12 +33,12 @@ public function __construct(PasswordHasherInterface $bestHasher, PasswordHasherI`
`33`	`33`	`$this->extraHashers = $extraHashers;`
`34`	`34`	`}`
`35`	`35`
`36`		`- public function hash(#[\SensitiveParameter] string $plainPassword, string $salt = null): string`
	`36`	`+ public function hash(#[\SensitiveParameter] string $plainPassword, ?string $salt = null): string`
`37`	`37`	`{`
`38`	`38`	`return $this->bestHasher->hash($plainPassword, $salt);`
`39`	`39`	`}`
`40`	`40`
`41`		`- public function verify(string $hashedPassword, #[\SensitiveParameter] string $plainPassword, string $salt = null): bool`
	`41`	`+ public function verify(string $hashedPassword, #[\SensitiveParameter] string $plainPassword, ?string $salt = null): bool`
`42`	`42`	`{`
`43`	`43`	`if ($this->bestHasher->verify($hashedPassword, $plainPassword, $salt)) {`
`44`	`44`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ final class NativePasswordHasher implements PasswordHasherInterface`
`31`	`31`	`/**`
`32`	`32`	`* @param string\|null $algorithm An algorithm supported by password_hash() or null to use the best available algorithm`
`33`	`33`	`*/`
`34`		`- public function __construct(int $opsLimit = null, int $memLimit = null, int $cost = null, string $algorithm = null)`
	`34`	`+ public function __construct(?int $opsLimit = null, ?int $memLimit = null, ?int $cost = null, ?string $algorithm = null)`
`35`	`35`	`{`
`36`	`36`	`$cost ??= 13;`
`37`	`37`	`$opsLimit ??= max(4, \defined('SODIUM_CRYPTO_PWHASH_OPSLIMIT_INTERACTIVE') ? \SODIUM_CRYPTO_PWHASH_OPSLIMIT_INTERACTIVE : 4);`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public function __construct(string $algorithm = 'sha512', bool $encodeHashAsBase`
`59`	`59`	`$this->iterations = $iterations;`
`60`	`60`	`}`
`61`	`61`
`62`		`- public function hash(#[\SensitiveParameter] string $plainPassword, string $salt = null): string`
	`62`	`+ public function hash(#[\SensitiveParameter] string $plainPassword, ?string $salt = null): string`
`63`	`63`	`{`
`64`	`64`	`if ($this->isPasswordTooLong($plainPassword)) {`
`65`	`65`	`throw new InvalidPasswordException();`
`@@ -74,7 +74,7 @@ public function hash(#[\SensitiveParameter] string $plainPassword, string $salt`
`74`	`74`	`return $this->encodeHashAsBase64 ? base64_encode($digest) : bin2hex($digest);`
`75`	`75`	`}`
`76`	`76`
`77`		`- public function verify(string $hashedPassword, #[\SensitiveParameter] string $plainPassword, string $salt = null): bool`
	`77`	`+ public function verify(string $hashedPassword, #[\SensitiveParameter] string $plainPassword, ?string $salt = null): bool`
`78`	`78`	`{`
`79`	`79`	`if (\strlen($hashedPassword) !== $this->encodedLength \|\| str_contains($hashedPassword, '$')) {`
`80`	`80`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public function __construct(bool $ignorePasswordCase = false)`
`35`	`35`	`$this->ignorePasswordCase = $ignorePasswordCase;`
`36`	`36`	`}`
`37`	`37`
`38`		`- public function hash(#[\SensitiveParameter] string $plainPassword, string $salt = null): string`
	`38`	`+ public function hash(#[\SensitiveParameter] string $plainPassword, ?string $salt = null): string`
`39`	`39`	`{`
`40`	`40`	`if ($this->isPasswordTooLong($plainPassword)) {`
`41`	`41`	`throw new InvalidPasswordException();`
`@@ -44,7 +44,7 @@ public function hash(#[\SensitiveParameter] string $plainPassword, string $salt`
`44`	`44`	`return $this->mergePasswordAndSalt($plainPassword, $salt);`
`45`	`45`	`}`
`46`	`46`
`47`		`- public function verify(string $hashedPassword, #[\SensitiveParameter] string $plainPassword, string $salt = null): bool`
	`47`	`+ public function verify(string $hashedPassword, #[\SensitiveParameter] string $plainPassword, ?string $salt = null): bool`
`48`	`48`	`{`
`49`	`49`	`if ($this->isPasswordTooLong($plainPassword)) {`
`50`	`50`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ final class SodiumPasswordHasher implements PasswordHasherInterface`
`29`	`29`	`private int $opsLimit;`
`30`	`30`	`private int $memLimit;`
`31`	`31`
`32`		`- public function __construct(int $opsLimit = null, int $memLimit = null)`
	`32`	`+ public function __construct(?int $opsLimit = null, ?int $memLimit = null)`
`33`	`33`	`{`
`34`	`34`	`if (!self::isSupported()) {`
`35`	`35`	`throw new LogicException('Libsodium is not available. You should either install the sodium extension or use a different password hasher.');`
Original file line number	Diff line number	Diff line change
`@@ -27,10 +27,10 @@ interface LegacyPasswordHasherInterface extends PasswordHasherInterface`
`27`	`27`	`*`
`28`	`28`	`* @throws InvalidPasswordException If the plain password is invalid, e.g. excessively long`
`29`	`29`	`*/`
`30`		`- public function hash(#[\SensitiveParameter] string $plainPassword, string $salt = null): string;`
	`30`	`+ public function hash(#[\SensitiveParameter] string $plainPassword, ?string $salt = null): string;`
`31`	`31`
`32`	`32`	`/**`
`33`	`33`	`* Checks that a plain password and a salt match a password hash.`
`34`	`34`	`*/`
`35`		`- public function verify(string $hashedPassword, #[\SensitiveParameter] string $plainPassword, string $salt = null): bool;`
	`35`	`+ public function verify(string $hashedPassword, #[\SensitiveParameter] string $plainPassword, ?string $salt = null): bool;`
`36`	`36`	`}`