Make sure we know what type we are dealing with

Happyr · May 29, 2020 · df5581e · df5581e
1 parent 966d25b
commit df5581e
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/Security/Authentication/Token/SSOToken.php b/Security/Authentication/Token/SSOToken.php
@@ -135,9 +135,14 @@ public function getRoles()
         $allRoles = array_merge($parentRoles, $this->storedRoles);
         $uniqueRoles = [];
 
-        /** @var Role $role */
+        /** @var Role|string $role */
         foreach ($allRoles as $role) {
-            $uniqueRoles[$role->getRole()] = $role;
+            $stringRole = $role;
+            if ($role instanceof Role) {
+                $stringRole = $role->getRole();
+            }
+
+            $uniqueRoles[$stringRole] = $role;
         }
 
         return array_values($uniqueRoles);