diff options
Diffstat (limited to 'Core')
| -rw-r--r-- | Core/Authentication/Token/AnonymousToken.php | 8 | ||||
| -rw-r--r-- | Core/Authentication/Token/PreAuthenticatedToken.php | 2 | ||||
| -rw-r--r-- | Core/Authentication/Token/UsernamePasswordToken.php | 2 | ||||
| -rw-r--r-- | Core/Role/Role.php | 3 | ||||
| -rw-r--r-- | Core/Role/RoleInterface.php | 2 | ||||
| -rw-r--r-- | Core/composer.json | 2 |
6 files changed, 10 insertions, 9 deletions
diff --git a/Core/Authentication/Token/AnonymousToken.php b/Core/Authentication/Token/AnonymousToken.php index 76c88ba..33b480c 100644 --- a/Core/Authentication/Token/AnonymousToken.php +++ b/Core/Authentication/Token/AnonymousToken.php @@ -11,7 +11,7 @@ namespace Symfony\Component\Security\Core\Authentication\Token; -use Symfony\Component\Security\Core\Role\RoleInterface; +use Symfony\Component\Security\Core\Role\Role; /** * AnonymousToken represents an anonymous token. @@ -25,9 +25,9 @@ class AnonymousToken extends AbstractToken /** * Constructor. * - * @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 RoleInterface[] $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|object $user The user can be a UserInterface instance, or an object implementing a __toString method or the username as a regular string + * @param Role[] $roles An array of roles */ public function __construct($secret, $user, array $roles = array()) { diff --git a/Core/Authentication/Token/PreAuthenticatedToken.php b/Core/Authentication/Token/PreAuthenticatedToken.php index a5460f5..99fb082 100644 --- a/Core/Authentication/Token/PreAuthenticatedToken.php +++ b/Core/Authentication/Token/PreAuthenticatedToken.php @@ -11,7 +11,7 @@ namespace Symfony\Component\Security\Core\Authentication\Token; -use Symfony\Component\Security\Core\Role\RoleInterface; +use Symfony\Component\Security\Core\Role\Role; /** * PreAuthenticatedToken implements a pre-authenticated token. diff --git a/Core/Authentication/Token/UsernamePasswordToken.php b/Core/Authentication/Token/UsernamePasswordToken.php index 71d19ad..7f94677 100644 --- a/Core/Authentication/Token/UsernamePasswordToken.php +++ b/Core/Authentication/Token/UsernamePasswordToken.php @@ -11,7 +11,7 @@ namespace Symfony\Component\Security\Core\Authentication\Token; -use Symfony\Component\Security\Core\Role\RoleInterface; +use Symfony\Component\Security\Core\Role\Role; /** * UsernamePasswordToken implements a username and password token. diff --git a/Core/Role/Role.php b/Core/Role/Role.php index 5b50981..7cb4698 100644 --- a/Core/Role/Role.php +++ b/Core/Role/Role.php @@ -12,8 +12,7 @@ namespace Symfony\Component\Security\Core\Role; /** - * Role is a simple implementation of a RoleInterface where the role is a - * string. + * Role is a simple implementation representing a role identified by a string. * * @author Fabien Potencier <fabien@symfony.com> */ diff --git a/Core/Role/RoleInterface.php b/Core/Role/RoleInterface.php index 3d4cbea..a0621ba 100644 --- a/Core/Role/RoleInterface.php +++ b/Core/Role/RoleInterface.php @@ -18,6 +18,8 @@ namespace Symfony\Component\Security\Core\Role; * supported by at least one AccessDecisionManager. * * @author Fabien Potencier <fabien@symfony.com> + * + * @deprecated The RoleInterface is deprecated since version 3.3 and will be removed in 4.0. Extend the Symfony\Component\Security\Core\Role\Role class instead. */ interface RoleInterface { diff --git a/Core/composer.json b/Core/composer.json index 25cc061..b062419 100644 --- a/Core/composer.json +++ b/Core/composer.json @@ -44,7 +44,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.3-dev" } } } |