Fixed Symfony 4.3 wrong role variable type

Andrej-in-ua · nicolas-grekas · commit 489dc6619643 · 2019-12-12T10:55:48.000+01:00
diff --git a/Domain/SecurityIdentityRetrievalStrategy.php b/Domain/SecurityIdentityRetrievalStrategy.php
@@ -58,14 +58,13 @@ public function getSecurityIdentities(TokenInterface $token)
         }
 
         // add all reachable roles
-        $roles = $this->getRoleNames($token);
         if (method_exists($this->roleHierarchy, 'getReachableRoleNames')) {
-            foreach ($this->roleHierarchy->getReachableRoleNames($roles) as $role) {
+            foreach ($this->roleHierarchy->getReachableRoleNames($this->getRoleNames($token)) as $role) {
                 $sids[] = new RoleSecurityIdentity($role);
             }
         } else {
             // Symfony < 4.3 BC layer
-            foreach ($this->roleHierarchy->getReachableRoles($roles) as $role) {
+            foreach ($this->roleHierarchy->getReachableRoles($token->getRoles()) as $role) {
                 $sids[] = new RoleSecurityIdentity($role);
             }
         }
@@ -85,7 +84,7 @@ public function getSecurityIdentities(TokenInterface $token)
         return $sids;
     }
 
-    private function getRoleNames(TokenInterface $token): array
+    private function getRoleNames(TokenInterface $token)
     {
         if (method_exists($token, 'getRoleNames')) {
             return $token->getRoleNames();
diff --git a/Tests/Domain/SecurityIdentityRetrievalStrategyTest.php b/Tests/Domain/SecurityIdentityRetrievalStrategyTest.php
@@ -14,6 +14,7 @@
 use Symfony\Component\Security\Acl\Domain\RoleSecurityIdentity;
 use Symfony\Component\Security\Acl\Domain\UserSecurityIdentity;
 use Symfony\Component\Security\Acl\Domain\SecurityIdentityRetrievalStrategy;
+use Symfony\Component\Security\Core\Role\Role;
 
 class SecurityIdentityRetrievalStrategyTest extends \PHPUnit_Framework_TestCase
 {
@@ -22,8 +23,6 @@ class SecurityIdentityRetrievalStrategyTest extends \PHPUnit_Framework_TestCase
      */
     public function testGetSecurityIdentities($user, array $roles, $authenticationStatus, array $sids)
     {
-        $strategy = $this->getStrategy($roles, $authenticationStatus);
-
         if ('anonymous' === $authenticationStatus) {
             $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\AnonymousToken')
                                 ->disableOriginalConstructor()
@@ -40,16 +39,20 @@ public function testGetSecurityIdentities($user, array $roles, $authenticationSt
         }
 
         if (method_exists($token, 'getRoleNames')) {
+            $strategy = $this->getStrategy($roles, $authenticationStatus, false);
+
             $token
                 ->expects($this->once())
                 ->method('getRoleNames')
                 ->will($this->returnValue(array('foo')))
             ;
         } else {
+            $strategy = $this->getStrategy($roles, $authenticationStatus, true);
+
             $token
                 ->expects($this->once())
                 ->method('getRoles')
-                ->will($this->returnValue(array('foo')))
+                ->will($this->returnValue(array(new Role('foo'))))
             ;
         }
 
@@ -129,15 +132,32 @@ protected function getAccount($username, $class)
         return $account;
     }
 
-    protected function getStrategy(array $roles = array(), $authenticationStatus = 'fullFledged')
+    protected function getStrategy(array $roles = array(), $authenticationStatus = 'fullFledged', $isBC = false)
     {
-        $roleHierarchy = $this->getMock('Symfony\Component\Security\Core\Role\RoleHierarchyInterface');
-        $roleHierarchy
-            ->expects($this->once())
-            ->method('getReachableRoles')
-            ->with($this->equalTo(array('foo')))
-            ->will($this->returnValue($roles))
-        ;
+        $roleHierarchyBuilder = $this->getMockBuilder('Symfony\Component\Security\Core\Role\RoleHierarchyInterface')
+            ->disableProxyingToOriginalMethods()
+            ->disableOriginalConstructor();
+
+        if ($isBC) {
+            $roleHierarchy = $roleHierarchyBuilder->setMethods(['getReachableRoles'])
+                ->getMockForAbstractClass();
+
+            $roleHierarchy
+                ->expects($this->any())
+                ->method('getReachableRoles')
+                ->with($this->equalTo([new Role('foo')]))
+                ->will($this->returnValue($roles));
+        } else {
+            $roleHierarchy = $roleHierarchyBuilder->setMethods(['getReachableRoleNames'])
+                ->getMockForAbstractClass();
+
+            $roleHierarchy
+                ->expects($this->any())
+                ->method('getReachableRoleNames')
+                ->with($this->equalTo(['foo']))
+                ->will($this->returnValue($roles));
+        }
+
 
         $trustResolver = $this->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolverInterface', array(), array('', ''));
 

Original file line number	Diff line number	Diff line change
`@@ -58,14 +58,13 @@ public function getSecurityIdentities(TokenInterface $token)`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`// add all reachable roles`
`61`		`- $roles = $this->getRoleNames($token);`
`62`	`61`	`if (method_exists($this->roleHierarchy, 'getReachableRoleNames')) {`
`63`		`- foreach ($this->roleHierarchy->getReachableRoleNames($roles) as $role) {`
	`62`	`+ foreach ($this->roleHierarchy->getReachableRoleNames($this->getRoleNames($token)) as $role) {`
`64`	`63`	`$sids[] = new RoleSecurityIdentity($role);`
`65`	`64`	`}`
`66`	`65`	`} else {`
`67`	`66`	`// Symfony < 4.3 BC layer`
`68`		`- foreach ($this->roleHierarchy->getReachableRoles($roles) as $role) {`
	`67`	`+ foreach ($this->roleHierarchy->getReachableRoles($token->getRoles()) as $role) {`
`69`	`68`	`$sids[] = new RoleSecurityIdentity($role);`
`70`	`69`	`}`
`71`	`70`	`}`
`@@ -85,7 +84,7 @@ public function getSecurityIdentities(TokenInterface $token)`
`85`	`84`	`return $sids;`
`86`	`85`	`}`
`87`	`86`
`88`		`- private function getRoleNames(TokenInterface $token): array`
	`87`	`+ private function getRoleNames(TokenInterface $token)`
`89`	`88`	`{`
`90`	`89`	`if (method_exists($token, 'getRoleNames')) {`
`91`	`90`	`return $token->getRoleNames();`