show unique inherited roles

yceruto · yceruto · commit 7061bfbf3a5e · 2017-06-05T14:17:49.000-04:00
diff --git a/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php b/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php
@@ -82,7 +82,7 @@ public function collect(Request $request, Response $response, \Exception $except
                 'token_class' => get_class($token),
                 'user' => $token->getUsername(),
                 'roles' => array_map(function (RoleInterface $role) { return $role->getRole(); }, $assignedRoles),
-                'inherited_roles' => array_map(function (RoleInterface $role) { return $role->getRole(); }, $inheritedRoles),
+                'inherited_roles' => array_unique(array_map(function (RoleInterface $role) { return $role->getRole(); }, $inheritedRoles)),
                 'supports_role_hierarchy' => null !== $this->roleHierarchy,
             );
         }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DataCollector/SecurityDataCollectorTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DataCollector/SecurityDataCollectorTest.php
@@ -111,13 +111,19 @@ public function provideRoles()
                 array('ROLE_ADMIN'),
                 array('ROLE_USER', 'ROLE_ALLOWED_TO_SWITCH'),
             ),
+            array(
+                array('ROLE_ADMIN', 'ROLE_OPERATOR'),
+                array('ROLE_ADMIN', 'ROLE_OPERATOR'),
+                array('ROLE_USER', 'ROLE_ALLOWED_TO_SWITCH'),
+            ),
         );
     }
 
     private function getRoleHierarchy()
     {
         return new RoleHierarchy(array(
             'ROLE_ADMIN' => array('ROLE_USER', 'ROLE_ALLOWED_TO_SWITCH'),
+            'ROLE_OPERATOR' => array('ROLE_USER'),
         ));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public function collect(Request $request, Response $response, \Exception $except`
`82`	`82`	`'token_class' => get_class($token),`
`83`	`83`	`'user' => $token->getUsername(),`
`84`	`84`	`'roles' => array_map(function (RoleInterface $role) { return $role->getRole(); }, $assignedRoles),`
`85`		`- 'inherited_roles' => array_map(function (RoleInterface $role) { return $role->getRole(); }, $inheritedRoles),`
	`85`	`+ 'inherited_roles' => array_unique(array_map(function (RoleInterface $role) { return $role->getRole(); }, $inheritedRoles)),`
`86`	`86`	`'supports_role_hierarchy' => null !== $this->roleHierarchy,`
`87`	`87`	`);`
`88`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -111,13 +111,19 @@ public function provideRoles()`
`111`	`111`	`array('ROLE_ADMIN'),`
`112`	`112`	`array('ROLE_USER', 'ROLE_ALLOWED_TO_SWITCH'),`
`113`	`113`	`),`
	`114`	`+ array(`
	`115`	`+ array('ROLE_ADMIN', 'ROLE_OPERATOR'),`
	`116`	`+ array('ROLE_ADMIN', 'ROLE_OPERATOR'),`
	`117`	`+ array('ROLE_USER', 'ROLE_ALLOWED_TO_SWITCH'),`
	`118`	`+ ),`
`114`	`119`	`);`
`115`	`120`	`}`
`116`	`121`
`117`	`122`	`private function getRoleHierarchy()`
`118`	`123`	`{`
`119`	`124`	`return new RoleHierarchy(array(`
`120`	`125`	`'ROLE_ADMIN' => array('ROLE_USER', 'ROLE_ALLOWED_TO_SWITCH'),`
	`126`	`+ 'ROLE_OPERATOR' => array('ROLE_USER'),`
`121`	`127`	`));`
`122`	`128`	`}`
`123`	`129`