Merge branch '3.4' into 4.4

* 3.4:
  fix typo
  [Validator] clarify stringable type annotations
  [Security/Core] fix some annotations

Author: nicolas-grekas

Authentication/Token/AbstractToken.php

@@ -31,7 +31,7 @@ abstract class AbstractToken implements TokenInterface
     private $attributes = [];
 
     /**
-     * @param string[] $roles An array of roles
+     * @param (Role|string)[] $roles An array of roles
      *
      * @throws \InvalidArgumentException
      */
@@ -41,7 +41,7 @@ public function __construct(array $roles = [])
             if (\is_string($role)) {
                 $role = new Role($role, false);
             } elseif (!$role instanceof Role) {
-                throw new \InvalidArgumentException(sprintf('$roles must be an array of strings, or Role instances, but got %s.', \gettype($role)));
+                throw new \InvalidArgumentException(sprintf('$roles must be an array of strings or Role instances, but got %s.', \gettype($role)));
             }
 
             $this->roles[] = $role;

Authentication/Token/AnonymousToken.php

@@ -11,6 +11,9 @@
 
 namespace Symfony\Component\Security\Core\Authentication\Token;
 
+use Symfony\Component\Security\Core\Role\Role;
+use Symfony\Component\Security\Core\User\UserInterface;
+
 /**
  * AnonymousToken represents an anonymous token.
  *
@@ -21,9 +24,9 @@ class AnonymousToken extends AbstractToken
     private $secret;
 
     /**
-     * @param string        $secret A secret used to make sure the token is created by the app and not by a malicious client
-     * @param string|object $user   The user can be a UserInterface instance, or an object implementing a __toString method or the username as a regular string
-     * @param string[]      $roles  An array of roles
+     * @param string                           $secret A secret used to make sure the token is created by the app and not by a malicious client
+     * @param string|\Stringable|UserInterface $user
+     * @param (Role|string)[]                  $roles
      */
     public function __construct(string $secret, $user, array $roles = [])
     {

Authentication/Token/PreAuthenticatedToken.php

@@ -11,6 +11,9 @@
 
 namespace Symfony\Component\Security\Core\Authentication\Token;
 
+use Symfony\Component\Security\Core\Role\Role;
+use Symfony\Component\Security\Core\User\UserInterface;
+
 /**
  * PreAuthenticatedToken implements a pre-authenticated token.
  *
@@ -22,10 +25,10 @@ class PreAuthenticatedToken extends AbstractToken
     private $providerKey;
 
     /**
-     * @param string|object $user        The user can be a UserInterface instance, or an object implementing a __toString method or the username as a regular string
-     * @param mixed         $credentials The user credentials
-     * @param string        $providerKey The provider key
-     * @param string[]      $roles       An array of roles
+     * @param string|\Stringable|UserInterface $user
+     * @param mixed                            $credentials
+     * @param string                           $providerKey
+     * @param (Role|string)[]                  $roles
      */
     public function __construct($user, $credentials, string $providerKey, array $roles = [])
     {

Authentication/Token/TokenInterface.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\Security\Core\Authentication\Token;
 
 use Symfony\Component\Security\Core\Role\Role;
+use Symfony\Component\Security\Core\User\UserInterface;
 
 /**
  * TokenInterface is the interface for the user authentication information.
@@ -53,8 +54,7 @@ public function getCredentials();
     /**
      * Returns a user representation.
      *
-     * @return string|object Can be a UserInterface instance, an object implementing a __toString method,
-     *                       or the username as a regular string
+     * @return string|\Stringable|UserInterface
      *
      * @see AbstractToken::setUser()
      */
@@ -66,7 +66,7 @@ public function getUser();
      * The user can be a UserInterface instance, or an object implementing
      * a __toString method or the username as a regular string.
      *
-     * @param string|object $user The user
+     * @param string|\Stringable|UserInterface $user
      *
      * @throws \InvalidArgumentException
      */

Authentication/Token/UsernamePasswordToken.php

@@ -11,6 +11,9 @@
 
 namespace Symfony\Component\Security\Core\Authentication\Token;
 
+use Symfony\Component\Security\Core\Role\Role;
+use Symfony\Component\Security\Core\User\UserInterface;
+
 /**
  * UsernamePasswordToken implements a username and password token.
  *
@@ -22,10 +25,10 @@ class UsernamePasswordToken extends AbstractToken
     private $providerKey;
 
     /**
-     * @param string|object $user        The username (like a nickname, email address, etc.), or a UserInterface instance or an object implementing a __toString method
-     * @param mixed         $credentials This usually is the password of the user
-     * @param string        $providerKey The provider key
-     * @param string[]      $roles       An array of roles
+     * @param string|\Stringable|UserInterface $user        The username (like a nickname, email address, etc.) or a UserInterface instance
+     * @param mixed                            $credentials
+     * @param string                           $providerKey
+     * @param (Role|string)[]                  $roles
      *
      * @throws \InvalidArgumentException
      */