minor #61507 [Security] Preserve ordering of roles in RoleHierarchy (nicolas-grekas)

fabpot · fabpot · commit c85a696a83f2 · 2025-08-24T08:34:56.000+02:00
This PR was merged into the 7.4 branch. Discussion ---------- [Security] Preserve ordering of roles in RoleHierarchy | Q | A | ------------- | --- | Branch? | 7.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | - | License | MIT As suggested in #61057 /cc `@simonjamain` Commits ------- d4338b1 [Security] Preserve ordering of roles in RoleHierarchy
diff --git a/src/Symfony/Component/Security/Core/Role/RoleHierarchy.php b/src/Symfony/Component/Security/Core/Role/RoleHierarchy.php
@@ -54,8 +54,11 @@ protected function buildRoleMap(): void
             $this->map[$main] = $roles;
             $visited = [];
             $additionalRoles = $roles;
-            while ($role = array_pop($additionalRoles)) {
+            while (null !== $role = key($additionalRoles)) {
+                $role = $additionalRoles[$role];
+
                 if (!isset($this->hierarchy[$role])) {
+                    next($additionalRoles);
                     continue;
                 }
 
@@ -68,6 +71,8 @@ protected function buildRoleMap(): void
                 foreach (array_diff($this->hierarchy[$role], $visited) as $additionalRole) {
                     $additionalRoles[] = $additionalRole;
                 }
+
+                next($additionalRoles);
             }
 
             $this->map[$main] = array_unique($this->map[$main]);

Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,11 @@ protected function buildRoleMap(): void`
`54`	`54`	`$this->map[$main] = $roles;`
`55`	`55`	`$visited = [];`
`56`	`56`	`$additionalRoles = $roles;`
`57`		`- while ($role = array_pop($additionalRoles)) {`
	`57`	`+ while (null !== $role = key($additionalRoles)) {`
	`58`	`+ $role = $additionalRoles[$role];`
	`59`	`+`
`58`	`60`	`if (!isset($this->hierarchy[$role])) {`
	`61`	`+ next($additionalRoles);`
`59`	`62`	`continue;`
`60`	`63`	`}`
`61`	`64`
`@@ -68,6 +71,8 @@ protected function buildRoleMap(): void`
`68`	`71`	`foreach (array_diff($this->hierarchy[$role], $visited) as $additionalRole) {`
`69`	`72`	`$additionalRoles[] = $additionalRole;`
`70`	`73`	`}`
	`74`	`+`
	`75`	`+ next($additionalRoles);`
`71`	`76`	`}`
`72`	`77`
`73`	`78`	`$this->map[$main] = array_unique($this->map[$main]);`