symfony
diff --git a/‎src/Symfony/Component/Security/Core/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Core/CHANGELOG.md
+5Lines changed: 5 additions & 0 deletions b/‎src/Symfony/Component/Security/Core/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Core/CHANGELOG.md
+5Lines changed: 5 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Security/Core/Role/RoleHierarchy.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Core/Role/RoleHierarchy.php
+15Lines changed: 15 additions & 0 deletions b/‎src/Symfony/Component/Security/Core/Role/RoleHierarchy.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Core/Role/RoleHierarchy.php
+15Lines changed: 15 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Security/Core/Role/RoleHierarchyInterface.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Core/Role/RoleHierarchyInterface.php
+2Lines changed: 2 additions & 0 deletions b/‎src/Symfony/Component/Security/Core/Role/RoleHierarchyInterface.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Core/Role/RoleHierarchyInterface.php
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Security/Core/Tests/Role/RoleHierarchyTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Core/Tests/Role/RoleHierarchyTest.php
+17Lines changed: 17 additions & 0 deletions b/‎src/Symfony/Component/Security/Core/Tests/Role/RoleHierarchyTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Core/Tests/Role/RoleHierarchyTest.php
+17Lines changed: 17 additions & 0 deletions
@@ -2,6 +2,11 @@ CHANGELOG
 =========
 
 
+7.1
+---
+
+* Add `getEncompassingRoleNames` method to `RoleHierarchyInterface`
+
 7.0
 ---
 
 
@@ -50,6 +50,21 @@ public function getReachableRoleNames(array $roles): array
         return array_values(array_unique($reachableRoles));
     }
 
+    public function getEncompassingRoleNames(array $roles): array
+    {
+        $encompassingRoles = $roles;
+
+        foreach ($roles as $role) {
+            foreach ($this->map as $parent => $children) {
+                if (\in_array($role, $children)) {
+                    $encompassingRoles[] = $parent;
+                }
+            }
+        }
+
+        return array_values(array_unique($encompassingRoles));
+    }
+
     protected function buildRoleMap(): void
     {
         $this->map = [];
 
@@ -14,6 +14,8 @@
 /**
  * RoleHierarchyInterface is the interface for a role hierarchy.
  *
+ * @method array getEncompassingRoleNames(array $roles)
+ *
  * @author Fabien Potencier <fabien@symfony.com>
  */
 interface RoleHierarchyInterface
 
@@ -30,4 +30,21 @@ public function testGetReachableRoleNames()
         $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']));
     }
+
+    public function testGetEncompassingRoleNames()
+    {
+        $role = new RoleHierarchy([
+            'ROLE_ADMIN' => ['ROLE_USER'],
+            'ROLE_SUPER_ADMIN' => ['ROLE_ADMIN', 'ROLE_FOO'],
+            'ROLE_USER' => ['ROLE_BAR'],
+        ]);
+
+        $this->assertEquals(['ROLE_SUPER_ADMIN'], $role->getEncompassingRoleNames(['ROLE_SUPER_ADMIN']));
+        $this->assertEquals(['ROLE_ADMIN', 'ROLE_SUPER_ADMIN'], $role->getEncompassingRoleNames(['ROLE_ADMIN']));
+        $this->assertEquals(['ROLE_USER', 'ROLE_ADMIN', 'ROLE_SUPER_ADMIN'], $role->getEncompassingRoleNames(['ROLE_USER']));
+        $this->assertEquals(['ROLE_BAR', 'ROLE_ADMIN', 'ROLE_SUPER_ADMIN', 'ROLE_USER'], $role->getEncompassingRoleNames(['ROLE_BAR']));
+        $this->assertEquals(['ROLE_SUPER_ADMIN'], $role->getEncompassingRoleNames(['ROLE_SUPER_ADMIN', 'ROLE_SUPER_ADMIN']));
+        $this->assertEquals(['ROLE_SUPER_ADMIN', 'ROLE_USER', 'ROLE_ADMIN'], $role->getEncompassingRoleNames(['ROLE_SUPER_ADMIN', 'ROLE_USER']));
+        $this->assertEquals(['ROLE_BAR', 'ROLE_FOO', 'ROLE_ADMIN', 'ROLE_SUPER_ADMIN', 'ROLE_USER'], $role->getEncompassingRoleNames(['ROLE_BAR', 'ROLE_FOO']));
+    }
 }