diff --git a/Controller/PermissionsGroupController.php b/Controller/PermissionsGroupController.php index cf8230e09..a3d69cbbd 100644 --- a/Controller/PermissionsGroupController.php +++ b/Controller/PermissionsGroupController.php @@ -174,9 +174,9 @@ class PermissionsGroupController extends Controller $roleProvider = $this->roleProvider; $roleScopesSorted = array(); foreach($roleScopes as $roleScope) { + /* @var $roleScope RoleScope */ $title = $roleProvider->getRoleTitle($roleScope->getRole()); - var_dump($title); $roleScopesSorted[$title][] = $roleScope; } ksort($roleScopesSorted); diff --git a/Security/RoleProvider.php b/Security/RoleProvider.php index ced7e584a..f72435cb1 100644 --- a/Security/RoleProvider.php +++ b/Security/RoleProvider.php @@ -40,9 +40,7 @@ class RoleProvider * * @var array|null */ - private $rolesTitlesCache = []; - // sf4 check: mis [] au lieu de null - // pour éviter `Warning: array_key_exists() expects parameter 2 to be array, null given` L129 + private $rolesTitlesCache = null; /** * Add a role provider