From 7b6d115a271c8aff72a867c5e1ddd81034aee323 Mon Sep 17 00:00:00 2001 From: Christophe Coevoet Date: Fri, 24 Oct 2014 11:21:28 +0200 Subject: [PATCH] Improved the phpdoc for security token classes --- .../Security/Core/Authentication/Token/AbstractToken.php | 2 +- .../Core/Authentication/Token/UsernamePasswordToken.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php index 6813adf99d..3982b08d9c 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php +++ b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php @@ -88,7 +88,7 @@ abstract class AbstractToken implements TokenInterface * The user can be a UserInterface instance, or an object implementing * a __toString method or the username as a regular string. * - * @param mixed $user The user + * @param string|object $user The user * @throws \InvalidArgumentException */ public function setUser($user) diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php index b6dfce45c7..9248136982 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php +++ b/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php @@ -26,10 +26,10 @@ class UsernamePasswordToken extends AbstractToken /** * Constructor. * - * @param string $user The username (like a nickname, email address, etc.), or a UserInterface instance or an object implementing a __toString method. - * @param string $credentials This usually is the password of the user - * @param string $providerKey The provider key - * @param RoleInterface[] $roles An array of roles + * @param string|object $user The username (like a nickname, email address, etc.), or a UserInterface instance or an object implementing a __toString method. + * @param string $credentials This usually is the password of the user + * @param string $providerKey The provider key + * @param RoleInterface[]|string[] $roles An array of roles * * @throws \InvalidArgumentException */