Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit 93428e8a3457 · 2021-08-17T17:35:52.000+02:00
* 5.4:
  [Serializer] cs fix
  Cleanup more `@return` annotations
  [Form] Fix phpdoc on FormBuilderInterface
diff --git a/LegacyPasswordHasherInterface.php b/LegacyPasswordHasherInterface.php
@@ -25,8 +25,6 @@ interface LegacyPasswordHasherInterface extends PasswordHasherInterface
     /**
      * Hashes a plain password.
      *
-     * @return string The hashed password
-     *
      * @throws InvalidPasswordException If the plain password is invalid, e.g. excessively long
      */
     public function hash(string $plainPassword, string $salt = null): string;

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,6 @@ interface LegacyPasswordHasherInterface extends PasswordHasherInterface`
`25`	`25`	`/**`
`26`	`26`	`* Hashes a plain password.`
`27`	`27`	`*`
`28`		`- * @return string The hashed password`
`29`		`- *`
`30`	`28`	`* @throws InvalidPasswordException If the plain password is invalid, e.g. excessively long`
`31`	`29`	`*/`
`32`	`30`	`public function hash(string $plainPassword, string $salt = null): string;`