Merge branch '5.4' into 6.0

* 5.4:
  [Serializer] cs fix
  Cleanup more `@return` annotations
  [Form] Fix phpdoc on FormBuilderInterface

Author: nicolas-grekas

Authentication/Provider/AuthenticationProviderInterface.php

@@ -38,7 +38,7 @@ interface AuthenticationProviderInterface extends AuthenticationManagerInterface
     /**
      * Checks whether this provider supports the given token.
      *
-     * @return bool true if the implementation supports the Token, false otherwise
+     * @return bool
      */
     public function supports(TokenInterface $token);
 }

Authentication/Provider/UserAuthenticationProvider.php

@@ -115,7 +115,7 @@ public function supports(TokenInterface $token)
     /**
      * Retrieves the user from an implementation-specific location.
      *
-     * @return UserInterface The user
+     * @return UserInterface
      *
      * @throws AuthenticationException if the credentials could not be validated
      */

Authentication/Token/AbstractToken.php

@@ -207,7 +207,7 @@ public function __unserialize(array $data): void
     /**
      * Returns the token attributes.
      *
-     * @return array The token attributes
+     * @return array
      */
     public function getAttributes()
     {
@@ -227,7 +227,7 @@ public function setAttributes(array $attributes)
     /**
      * Returns true if the attribute exists.
      *
-     * @return bool true if the attribute exists, false otherwise
+     * @return bool
      */
     public function hasAttribute(string $name)
     {
@@ -237,7 +237,7 @@ public function hasAttribute(string $name)
     /**
      * Returns an attribute value.
      *
-     * @return mixed The attribute value
+     * @return mixed
      *
      * @throws \InvalidArgumentException When attribute doesn't exist for this token
      */

Authentication/Token/TokenInterface.php

@@ -33,14 +33,14 @@ public function __toString(): string;
     /**
      * Returns the user roles.
      *
-     * @return string[] The associated roles
+     * @return string[]
      */
     public function getRoleNames(): array;
 
     /**
      * Returns the user credentials.
      *
-     * @return mixed The user credentials
+     * @return mixed
      *
      * @deprecated since 5.4
      */
@@ -86,7 +86,7 @@ public function eraseCredentials();
     /**
      * Returns the token attributes.
      *
-     * @return array The token attributes
+     * @return array
      */
     public function getAttributes();
 
@@ -100,14 +100,14 @@ public function setAttributes(array $attributes);
     /**
      * Returns true if the attribute exists.
      *
-     * @return bool true if the attribute exists, false otherwise
+     * @return bool
      */
     public function hasAttribute(string $name);
 
     /**
      * Returns an attribute value.
      *
-     * @return mixed The attribute value
+     * @return mixed
      *
      * @throws \InvalidArgumentException When attribute doesn't exist for this token
      */

Authorization/AccessDecisionManagerInterface.php

@@ -26,7 +26,7 @@ interface AccessDecisionManagerInterface
      * @param array $attributes An array of attributes associated with the method being invoked
      * @param mixed $object     The object to secure
      *
-     * @return bool true if the access is granted, false otherwise
+     * @return bool
      */
     public function decide(TokenInterface $token, array $attributes, mixed $object = null);
 }

Authorization/Voter/Voter.php

@@ -59,7 +59,7 @@ public function vote(TokenInterface $token, mixed $subject, array $attributes)
      *
      * @param $subject The subject to secure, e.g. an object the user wants to access or any other PHP type
      *
-     * @return bool True if the attribute and subject are supported, false otherwise
+     * @return bool
      */
     abstract protected function supports(string $attribute, mixed $subject);
 

User/PasswordAuthenticatedUserInterface.php

@@ -23,8 +23,6 @@ interface PasswordAuthenticatedUserInterface
      * Returns the hashed password used to authenticate the user.
      *
      * Usually on authentication, a plain-text password will be compared to this value.
-     *
-     * @return string|null The hashed password or null (if not set or erased)
      */
     public function getPassword(): ?string;
 }

User/User.php

@@ -104,8 +104,6 @@ public function getUserIdentifier(): string
      * Internally, if this method returns false, the authentication system
      * will throw an AccountExpiredException and prevent login.
      *
-     * @return bool true if the user's account is non expired, false otherwise
-     *
      * @see AccountExpiredException
      */
     public function isAccountNonExpired(): bool
@@ -119,8 +117,6 @@ public function isAccountNonExpired(): bool
      * Internally, if this method returns false, the authentication system
      * will throw a LockedException and prevent login.
      *
-     * @return bool true if the user is not locked, false otherwise
-     *
      * @see LockedException
      */
     public function isAccountNonLocked(): bool
@@ -134,8 +130,6 @@ public function isAccountNonLocked(): bool
      * Internally, if this method returns false, the authentication system
      * will throw a CredentialsExpiredException and prevent login.
      *
-     * @return bool true if the user's credentials are non expired, false otherwise
-     *
      * @see CredentialsExpiredException
      */
     public function isCredentialsNonExpired(): bool
@@ -149,8 +143,6 @@ public function isCredentialsNonExpired(): bool
      * Internally, if this method returns false, the authentication system
      * will throw a DisabledException and prevent login.
      *
-     * @return bool true if the user is enabled, false otherwise
-     *
      * @see DisabledException
      */
     public function isEnabled(): bool

User/UserInterface.php

@@ -44,7 +44,7 @@ interface UserInterface
      * and populated in any number of different ways when the user object
      * is created.
      *
-     * @return string[] The user roles
+     * @return string[]
      */
     public function getRoles();