refs symfony#8313

robocoder · robocoder · commit cadb807fc20c · 2013-09-30T17:37:42.000-04:00
diff --git a/src/Symfony/Component/Security/Acl/Domain/RoleSecurityIdentity.php b/src/Symfony/Component/Security/Acl/Domain/RoleSecurityIdentity.php
@@ -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
@@ -30,7 +30,7 @@ final class RoleSecurityIdentity implements SecurityIdentityInterface
      */
     public function __construct($role)
     {
-        if ($role instanceof Role) {
+        if ($role instanceof RoleInterface) {
             $role = $role->getRole();
         }
 
diff --git a/src/Symfony/Component/Security/Tests/Acl/Domain/RoleSecurityIdentityTest.php b/src/Symfony/Component/Security/Tests/Acl/Domain/RoleSecurityIdentityTest.php
@@ -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
@@ -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;
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`namespace Symfony\Component\Security\Acl\Domain;`
`13`	`13`
`14`	`14`	`use Symfony\Component\Security\Acl\Model\SecurityIdentityInterface;`
`15`		`-use Symfony\Component\Security\Core\Role\Role;`
	`15`	`+use Symfony\Component\Security\Core\Role\RoleInterface;`
`16`	`16`
`17`	`17`	`/**`
`18`	`18`	`* A SecurityIdentity implementation for roles`
`@@ -30,7 +30,7 @@ final class RoleSecurityIdentity implements SecurityIdentityInterface`
`30`	`30`	`*/`
`31`	`31`	`public function __construct($role)`
`32`	`32`	`{`
`33`		`- if ($role instanceof Role) {`
	`33`	`+ if ($role instanceof RoleInterface) {`
`34`	`34`	`$role = $role->getRole();`
`35`	`35`	`}`
`36`	`36`