8000 [Security] RoleSecurityIdentity checks for instances of RoleInterface to allow custom Role implementation by cabello · Pull Request #8313 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Security] RoleSecurityIdentity checks for instances of RoleInterface to allow custom Role implementation #8313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

[Security] RoleSecurityIdentity checks for instances of RoleInterface to allow custom Role implementation #8313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de9d547
Flexible RoleSecurityIdentity now checks for interface instead of a c…
Jun 19, 2013
b52a8f8
Remove duplicated test (one line on data provider)
Jun 20, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Symfony/Component/Security/Acl/Domain/RoleSecurityIdentity.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
namespace Symfony\Component\Security\Acl\Domain;

use Symfony\Component\Security\Acl\Model\SecurityIdentityInterface;
use Symfony\Component\Security\Core\Role\Role;
use Symfony\Component\Security\Core\Role\RoleInterface;

/**
* A SecurityIdentity implementation for roles
Expand All @@ -30,7 +30,7 @@ final class RoleSecurityIdentity implements SecurityIdentityInterface
*/
public function __construct($role)
{
if ($role instanceof Role) {
if ($role instanceof RoleInterface) {
$role = $role->getRole();
}

Expand Down
26 changes: 26 additions & 0 deletions src/Symfony/Component/Security/Tests/Acl/Domain/RoleSecurityIdentityTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

use Symfony\Component\Security\Acl\Domain\UserSecurityIdentity;
use Symfony\Component\Security\Core\Role\Role;
use Symfony\Component\Security\Core\Role\RoleInterface;
use Symfony\Component\Security\Acl\Domain\RoleSecurityIdentity;

class RoleSecurityIdentityTest extends \PHPUnit_Framework_TestCase
Expand Down Expand Up @@ -50,6 +51,31 @@ public function getCompareData()
array(new RoleSecurityIdentity('ROLE_FOO'), new RoleSecurityIdentity(new Role('ROLE_FOO')), true),
array(new RoleSecurityIdentity('ROLE_USER'), new RoleSecurityIdentity('ROLE_FOO'), false),
array(new RoleSecurityIdentity('ROLE_FOO'), new UserSecurityIdentity('ROLE_FOO', 'Foo'), false),
array(new RoleSecurityIdentity('ROLE_FOO'), new RoleSecurityIdentity(new MyRole('ROLE_FOO')), true),
array(new RoleSecurityIdentity('ROLE_USER'), new RoleSecurityIdentity(new MyRole('ROLE_FOO')), false),
);
}
}

class MyRole implements RoleInterface
{
private $role;

/**
* Constructor.
*
* @param string $role The role name
*/
public function __construct($role)
{
$this->role = (string) $role;
}

/**
* {@inheritdoc}
*/
public function getRole()
{
return $this->role;
}
}
0