merged branch yktd26/master (PR #1673)

fabpot · fabpot · commit af70ac8d7778 · 2011-07-13T11:30:35.000+02:00
Commits ------- 26ff05b fixes #1538 Discussion ---------- fixes #1538 Constructor of Symfony\Component\Security\Acl\Domain\RoleSecurityIdentity -------------------------------------------------------------------------------------------------------- currently it check if the argument is instance of Symfony\Component\Security\Core\Role\Role by ``if ($role instanceof Role)`` Maybe it should be changed to ``if ($role instanceof RoleInterface)`` Because if we use another Role class which implements RoleInterface it dosen't work when we check access, it will throw a *NoAceFoundException* when vote
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
@@ -31,7 +31,7 @@ final class RoleSecurityIdentity implements SecurityIdentityInterface
      */
     public function __construct($role)
     {
-        if ($role instanceof Role) {
+        if ($role instanceof RoleInterface) {
             $role = $role->getRole();
         }
 

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`
`@@ -31,7 +31,7 @@ final class RoleSecurityIdentity implements SecurityIdentityInterface`
`31`	`31`	`*/`
`32`	`32`	`public function __construct($role)`
`33`	`33`	`{`
`34`		`- if ($role instanceof Role) {`
	`34`	`+ if ($role instanceof RoleInterface) {`
`35`	`35`	`$role = $role->getRole();`
`36`	`36`	`}`
`37`	`37`