bug #30886 [Workflow] Fixed Guard Listener usage of RoleHierarchyInterface (lyrixx)

fabpot · fabpot · commit a7c4767a8e57 · 2019-04-06T13:25:08.000+02:00
This PR was merged into the 4.3-dev branch. Discussion ---------- [Workflow] Fixed Guard Listener usage of RoleHierarchyInterface | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | EUFOSSA related to #30388 Commits ------- a12b359 [Workflow] Fixed Guard Listener usage of RoleHierarchyInterface
diff --git a/src/Symfony/Component/Workflow/EventListener/GuardListener.php b/src/Symfony/Component/Workflow/EventListener/GuardListener.php
@@ -97,10 +97,10 @@ private function getVariables(GuardEvent $event): array
         }
 
         if (null !== $this->roleHierarchy && method_exists($this->roleHierarchy, 'getReachableRoleNames')) {
-            $roleNames = $this->roleHierarchy->getReachableRoleNames($roles);
+            $roleNames = $this->roleHierarchy->getReachableRoleNames($roleNames);
             $roles = array_map(function (string $role) { return new Role($role, false); }, $roleNames);
         } elseif (null !== $this->roleHierarchy) {
-            $roles = $this->roleHierarchy->getReachableRoles($token->getRoles(false));
+            $roles = $this->roleHierarchy->getReachableRoles($roles);
             $roleNames = array_map(function (Role $role) { return $role->getRole(); }, $roles);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -97,10 +97,10 @@ private function getVariables(GuardEvent $event): array`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`if (null !== $this->roleHierarchy && method_exists($this->roleHierarchy, 'getReachableRoleNames')) {`
`100`		`- $roleNames = $this->roleHierarchy->getReachableRoleNames($roles);`
	`100`	`+ $roleNames = $this->roleHierarchy->getReachableRoleNames($roleNames);`
`101`	`101`	`$roles = array_map(function (string $role) { return new Role($role, false); }, $roleNames);`
`102`	`102`	`} elseif (null !== $this->roleHierarchy) {`
`103`		`- $roles = $this->roleHierarchy->getReachableRoles($token->getRoles(false));`
	`103`	`+ $roles = $this->roleHierarchy->getReachableRoles($roles);`
`104`	`104`	`$roleNames = array_map(function (Role $role) { return $role->getRole(); }, $roles);`
`105`	`105`	`}`
`106`	`106`