Merge branch '5.4' into 6.0

* 5.4:
  [Security] phpdoc cleanups
  cs fix

Author: nicolas-grekas

Authentication/RememberMe/PersistentTokenInterface.php

@@ -48,7 +48,7 @@ public function getTokenValue();
     public function getLastUsed();
 
     /**
-     * Returns the identifier used to authenticate (e.g. their e-mailaddress or username).
+     * Returns the identifier used to authenticate (e.g. their email address or username).
      */
     public function getUserIdentifier(): string;
 }

Authentication/Token/AbstractToken.php

@@ -121,41 +121,31 @@ public function __unserialize(array $data): void
     }
 
     /**
-     * Returns the token attributes.
-     *
-     * @return array
+     * {@inheritdoc}
      */
     public function getAttributes()
     {
         return $this->attributes;
     }
 
     /**
-     * Sets the token attributes.
-     *
-     * @param array $attributes The token attributes
+     * {@inheritdoc}
      */
     public function setAttributes(array $attributes)
     {
         $this->attributes = $attributes;
     }
 
     /**
-     * Returns true if the attribute exists.
-     *
-     * @return bool
+     * {@inheritdoc}
      */
     public function hasAttribute(string $name)
     {
         return \array_key_exists($name, $this->attributes);
     }
 
     /**
-     * Returns an attribute value.
-     *
-     * @return mixed
-     *
-     * @throws \InvalidArgumentException When attribute doesn't exist for this token
+     * {@inheritdoc}
      */
     public function getAttribute(string $name)
     {
@@ -166,6 +156,9 @@ public function getAttribute(string $name)
         return $this->attributes[$name];
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function setAttribute(string $name, mixed $value)
     {
         $this->attributes[$name] = $value;

Authentication/Token/RememberMeToken.php

@@ -52,8 +52,6 @@ public function getFirewallName(): string
     }
 
     /**
-     * Returns the secret.
-     *
      * @return string
      */
     public function getSecret()

Authentication/Token/TokenInterface.php

@@ -16,7 +16,7 @@
 /**
  * TokenInterface is the interface for the user authentication information.
  *
- * @method string getUserIdentifier() returns the user identifier used during authentication (e.g. a user's e-mailaddress or username)
+ * @method string getUserIdentifier() returns the user identifier used during authentication (e.g. a user's email address or username)
  *
  * @author Fabien Potencier <[email protected]>
  * @author Johannes M. Schmitt <[email protected]>
@@ -59,38 +59,27 @@ public function setUser(UserInterface $user);
     public function eraseCredentials();
 
     /**
-     * Returns the token attributes.
-     *
      * @return array
      */
     public function getAttributes();
 
     /**
-     * Sets the token attributes.
-     *
      * @param array $attributes The token attributes
      */
     public function setAttributes(array $attributes);
 
     /**
-     * Returns true if the attribute exists.
-     *
      * @return bool
      */
     public function hasAttribute(string $name);
 
     /**
-     * Returns an attribute value.
-     *
      * @return mixed
      *
      * @throws \InvalidArgumentException When attribute doesn't exist for this token
      */
     public function getAttribute(string $name);
 
-    /**
-     * Sets an attribute.
-     */
     public function setAttribute(string $name, mixed $value);
 
     /**

Exception/AuthenticationException.php

@@ -24,8 +24,6 @@ class AuthenticationException extends RuntimeException
     private $token;
 
     /**
-     * Get the token.
-     *
      * @return TokenInterface|null
      */
     public function getToken()

Exception/UserNotFoundException.php

@@ -30,15 +30,15 @@ public function getMessageKey()
     }
 
     /**
-     * Get the user identifier (e.g. username or e-mailaddress).
+     * Get the user identifier (e.g. username or email address).
      */
     public function getUserIdentifier(): ?string
     {
         return $this->identifier;
     }
 
     /**
-     * Set the user identifier (e.g. username or e-mailaddress).
+     * Set the user identifier (e.g. username or email address).
      */
     public function setUserIdentifier(string $identifier): void
     {

User/InMemoryUser.php

@@ -60,7 +60,7 @@ public function getPassword(): ?string
     }
 
     /**
-     * Returns the identifier for this user (e.g. its username or e-mailaddress).
+     * Returns the identifier for this user (e.g. its username or email address).
      */
     public function getUserIdentifier(): string
     {

User/UserInterface.php

@@ -55,7 +55,7 @@ public function getRoles();
     public function eraseCredentials();
 
     /**
-     * Returns the identifier for this user (e.g. its username or e-mailaddress).
+     * Returns the identifier for this user (e.g. its username or email address).
      */
     public function getUserIdentifier(): string;
 }

User/UserProviderInterface.php

@@ -18,7 +18,7 @@
  * Represents a class that loads UserInterface objects from some source for the authentication system.
  *
  * In a typical authentication configuration, a user identifier (e.g. a
- * username or e-mailaddress) credential enters the system (via form login, or
+ * username or email address) credential enters the system (via form login, or
  * any method). The user provider that is configured with that authentication
  * method is asked to load the UserInterface object for the given identifier (via
  * loadUserByIdentifier) so that the rest of the process can continue.