8000 Securityidentity fix · Pull Request #6012 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

Securityidentity fix #6012

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

Securityidentity fix #6012

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
d3c478f
[Security] Added test for custom role implementations used with RoleS…
Nov 14, 2012
40c7b78
[Security] changed RoleSecurityIdentity to work with implementations …
Nov 14, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading 8000
Diff view
Diff view
6 changes: 3 additions & 3 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 @@ -26,12 +26,12 @@ final class RoleSecurityIdentity implements SecurityIdentityInterface
/**
* Constructor
*
* @param mixed $role a Role instance, or its string representation
* @param mixed $role a RoleInterface instance, or its string representation
* @return void
*/
public function __construct($role)
{
if ($role instanceof Role) {
if ($role instanceof RoleInterface) {
$role = $role->getRole();
}

Expand Down
8000
30 changes: 23 additions & 7 deletions tests/Symfony/Tests/Component/Security/Acl/Domain/RoleSecurityIdentityTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,23 @@

class RoleSecurityIdentityTest extends \PHPUnit_Framework_TestCase
{
public function testConstructor()
/**
* @dataProvider getConstructorData
*/
public function testConstructor($role, $roleString)
{
$id = new RoleSecurityIdentity('ROLE_FOO');
$id = new RoleSecurityIdentity($role);

$this->assertEquals('ROLE_FOO', $id->getRole());
$this->assertEquals($roleString, $id->getRole());
}

public function testConstructorWithRoleInstance()
public function getConstructorData()
{
$id = new RoleSecurityIdentity(new Role('ROLE_FOO'));

$this->assertEquals('ROLE_FOO', $id->getRole());
return array(
array('ROLE_FOO', 'ROLE_FOO'),
array(new Role('ROLE_FOO'), 'ROLE_FOO'),
array(new CustomRole(), 'CUSTOM_ROLE'),
);
}

/**
Expand All @@ -53,3 +58,14 @@ public function getCompareData()
);
}
}

class CustomRole implements \Symfony\Component\Security\Core\Role\RoleInterface
{
/**
* {@inheritDoc}
*/
public function getRole()
{
return 'CUSTOM_ROLE';
}
}
0