bug #22830 [SecurityBundle] forward compatibility with Symfony 4 (xabbuh)

nicolas-grekas · nicolas-grekas · commit bb2a2e2a32b9 · 2017-05-21T19:30:27.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- [SecurityBundle] forward compatibility with Symfony 4 | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #...  | License | MIT | Doc PR | #22821 (comment) Commits ------- c783e1e forward compatibility with Symfony 4
diff --git a/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php b/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php
@@ -12,6 +12,7 @@
 namespace Symfony\Bundle\SecurityBundle\DataCollector;
 
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Security\Core\Role\RoleHierarchyInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -110,15 +111,23 @@ public function collect(Request $request, Response $response, \Exception $except
                 // fail silently when the logout URL cannot be generated
             }
 
+            $extractRoles = function ($role) {
+                if (!$role instanceof RoleInterface && !$role instanceof Role) {
+                    throw new \InvalidArgumentException(sprintf('Roles must be instances of %s or %s (%s given).', RoleInterface::class, Role::class, is_object($role) ? get_class($role) : gettype($role)));
+                }
+
+                return $role->getRole();
+            };
+
             $this->data = array(
                 'enabled' => true,
                 'authenticated' => $token->isAuthenticated(),
                 'token' => $token,
                 'token_class' => $this->hasVarDumper ? new ClassStub(get_class($token)) : get_class($token),
                 'logout_url' => $logoutUrl,
                 'user' => $token->getUsername(),
-                'roles' => array_map(function (RoleInterface $role) { return $role->getRole(); }, $assignedRoles),
-                'inherited_roles' => array_map(function (RoleInterface $role) { return $role->getRole(); }, $inheritedRoles),
+                'roles' => array_map($extractRoles, $assignedRoles),
+                'inherited_roles' => array_map($extractRoles, $inheritedRoles),
                 'supports_role_hierarchy' => null !== $this->roleHierarchy,
             );
         }
