summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Core/Authentication/Token/AbstractToken.php2
-rw-r--r--Core/Authentication/Token/AnonymousToken.php8
-rw-r--r--Core/Authentication/Token/PreAuthenticatedToken.php10
-rw-r--r--Core/Authentication/Token/UsernamePasswordToken.php10
-rw-r--r--Core/Role/Role.php3
-rw-r--r--Core/Role/RoleInterface.php2
-rw-r--r--Guard/Token/PostAuthenticationGuardToken.php8
-rw-r--r--Http/Tests/Firewall/SwitchUserListenerTest.php9
8 files changed, 27 insertions, 25 deletions
diff --git a/Core/Authentication/Token/AbstractToken.php b/Core/Authentication/Token/AbstractToken.php
index 7538648..2f517f3 100644
--- a/Core/Authentication/Token/AbstractToken.php
+++ b/Core/Authentication/Token/AbstractToken.php
@@ -33,7 +33,7 @@ abstract class AbstractToken implements TokenInterface
/**
* Constructor.
*
- * @param RoleInterface[]|string[] $roles An array of roles
+ * @param (Role|string)[] $roles An array of roles
*
* @throws \InvalidArgumentException
*/
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 b4b5e70..feb53cc 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.
@@ -26,10 +26,10 @@ class PreAuthenticatedToken extends AbstractToken
/**
* Constructor.
*
- * @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 RoleInterface[]|string[] $roles An array of roles
+ * @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 (Role|string)[] $roles An array of roles
*/
public function __construct($user, $credentials, $providerKey, array $roles = array())
{
diff --git a/Core/Authentication/Token/UsernamePasswordToken.php b/Core/Authentication/Token/UsernamePasswordToken.php
index 33b00f0..a7d530c 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.
@@ -26,10 +26,10 @@ class UsernamePasswordToken extends AbstractToken
/**
* Constructor.
*
- * @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
+ * @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 (Role|string)[] $roles An array of roles
*
* @throws \InvalidArgumentException
*/
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/Guard/Token/PostAuthenticationGuardToken.php b/Guard/Token/PostAuthenticationGuardToken.php
index 36c40ca..6852d9e 100644
--- a/Guard/Token/PostAuthenticationGuardToken.php
+++ b/Guard/Token/PostAuthenticationGuardToken.php
@@ -12,7 +12,7 @@
namespace Symfony\Component\Security\Guard\Token;
use Symfony\Component\Security\Core\Authentication\Token\AbstractToken;
-use Symfony\Component\Security\Core\Role\RoleInterface;
+use Symfony\Component\Security\Core\Role\Role;
use Symfony\Component\Security\Core\User\UserInterface;
/**
@@ -28,9 +28,9 @@ class PostAuthenticationGuardToken extends AbstractToken implements GuardTokenIn
private $providerKey;
/**
- * @param UserInterface $user The user!
- * @param string $providerKey The provider (firewall) key
- * @param RoleInterface[]|string[] $roles An array of roles
+ * @param UserInterface $user The user!
+ * @param string $providerKey The provider (firewall) key
+ * @param (Role|string)[] $roles An array of roles
*
* @throws \InvalidArgumentException
*/
diff --git a/Http/Tests/Firewall/SwitchUserListenerTest.php b/Http/Tests/Firewall/SwitchUserListenerTest.php
index 28d73e0..140a580 100644
--- a/Http/Tests/Firewall/SwitchUserListenerTest.php
+++ b/Http/Tests/Firewall/SwitchUserListenerTest.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\Security\Http\Tests\Firewall;
+use Symfony\Component\Security\Core\Role\Role;
use Symfony\Component\Security\Http\Event\SwitchUserEvent;
use Symfony\Component\Security\Http\Firewall\SwitchUserListener;
use Symfony\Component\Security\Http\SecurityEvents;
@@ -66,7 +67,7 @@ class SwitchUserListenerTest extends \PHPUnit_Framework_TestCase
*/
public function testExitUserThrowsAuthenticationExceptionIfOriginalTokenCannotBeFound()
{
- $token = $this->getToken(array($this->getMock('Symfony\Component\Security\Core\Role\RoleInterface')));
+ $token = $this->getToken(array(new Role('the role')));
$this->tokenStorage->expects($this->any())->method('getToken')->will($this->returnValue($token));
$this->request->expects($this->any())->method('get')->with('_switch_user')->will($this->returnValue('_exit'));
@@ -216,7 +217,7 @@ class SwitchUserListenerTest extends \PHPUnit_Framework_TestCase
*/
public function testSwitchUserIsDisallowed()
{
- $token = $this->getToken(array($this->getMock('Symfony\Component\Security\Core\Role\RoleInterface')));
+ $token = $this->getToken(array(new Role('the role')));
$this->tokenStorage->expects($this->any())->method('getToken')->will($this->returnValue($token));
$this->request->expects($this->any())->method('get')->with('_switch_user')->will($this->returnValue('kuba'));
@@ -231,7 +232,7 @@ class SwitchUserListenerTest extends \PHPUnit_Framework_TestCase
public function testSwitchUser()
{
- $token = $this->getToken(array($this->getMock('Symfony\Component\Security\Core\Role\RoleInterface')));
+ $token = $this->getToken(array(new Role('the role')));
$user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
$user->expects($this->any())->method('getRoles')->will($this->returnValue(array()));
@@ -261,7 +262,7 @@ class SwitchUserListenerTest extends \PHPUnit_Framework_TestCase
public function testSwitchUserKeepsOtherQueryStringParameters()
{
- $token = $this->getToken(array($this->getMock('Symfony\Component\Security\Core\Role\RoleInterface')));
+ $token = $this->getToken(array(new Role('the role')));
$user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
$user->expects($this->any())->method('getRoles')->will($this->returnValue(array()));
generated by cgit v1.1 at 2025-05-11 19:41:52 +0000