feature #39852 [Security] RoleHierarchy returns an unique array of roles (lyrixx)

fabpot · fabpot · commit 93e853dd0910 · 2021-01-17T08:29:02.000+01:00
This PR was merged into the 5.3-dev branch. Discussion ---------- [Security] RoleHierarchy returns an unique array of roles | Q | A | ------------- | --- | Branch? | 5.x | Bug fix? | no | New feature? | yes: performance | Deprecations? | | Tickets | | License | MIT | Doc PR | Speedup: https://github.com/symfony/symfony/blob/5.x/src/Symfony/Component/Security/Core/Authorization/Voter/RoleVoter.php#L48 BTW, why isn't an `in_array()` there? Commits ------- aa0494c [Security] RoleHierarchy returns unique an unique array of roles
diff --git a/src/Symfony/Component/Security/Core/Role/RoleHierarchy.php b/src/Symfony/Component/Security/Core/Role/RoleHierarchy.php
@@ -48,7 +48,7 @@ public function getReachableRoleNames(array $roles): array
             }
         }
 
-        return $reachableRoles;
+        return array_values(array_unique($reachableRoles));
     }
 
     protected function buildRoleMap()
diff --git a/src/Symfony/Component/Security/Core/Tests/Role/RoleHierarchyTest.php b/src/Symfony/Component/Security/Core/Tests/Role/RoleHierarchyTest.php
@@ -28,5 +28,6 @@ public function testGetReachableRoleNames()
         $this->assertEquals(['ROLE_ADMIN', 'ROLE_USER'], $role->getReachableRoleNames(['ROLE_ADMIN']));
         $this->assertEquals(['ROLE_FOO', 'ROLE_ADMIN', 'ROLE_USER'], $role->getReachableRoleNames(['ROLE_FOO', 'ROLE_ADMIN']));
         $this->assertEquals(['ROLE_SUPER_ADMIN', 'ROLE_ADMIN', 'ROLE_FOO', 'ROLE_USER'], $role->getReachableRoleNames(['ROLE_SUPER_ADMIN']));
+        $this->assertEquals(['ROLE_SUPER_ADMIN', 'ROLE_ADMIN', 'ROLE_FOO', 'ROLE_USER'], $role->getReachableRoleNames(['ROLE_SUPER_ADMIN', 'ROLE_SUPER_ADMIN']));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public function getReachableRoleNames(array $roles): array`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
`51`		`- return $reachableRoles;`
	`51`	`+ return array_values(array_unique($reachableRoles));`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`protected function buildRoleMap()`
Original file line number	Diff line number	Diff line change
`@@ -28,5 +28,6 @@ public function testGetReachableRoleNames()`
`28`	`28`	`$this->assertEquals(['ROLE_ADMIN', 'ROLE_USER'], $role->getReachableRoleNames(['ROLE_ADMIN']));`
`29`	`29`	`$this->assertEquals(['ROLE_FOO', 'ROLE_ADMIN', 'ROLE_USER'], $role->getReachableRoleNames(['ROLE_FOO', 'ROLE_ADMIN']));`
`30`	`30`	`$this->assertEquals(['ROLE_SUPER_ADMIN', 'ROLE_ADMIN', 'ROLE_FOO', 'ROLE_USER'], $role->getReachableRoleNames(['ROLE_SUPER_ADMIN']));`
	`31`	`+ $this->assertEquals(['ROLE_SUPER_ADMIN', 'ROLE_ADMIN', 'ROLE_FOO', 'ROLE_USER'], $role->getReachableRoleNames(['ROLE_SUPER_ADMIN', 'ROLE_SUPER_ADMIN']));`
`31`	`32`	`}`
`32`	`33`	`}`