support creating new roles (#1050)

src/Security/RolePermissionManager.php

@@ -19,9 +19,14 @@ class RolePermissionManager
      * @var string[]
      */
     protected $knownPermissions = [];
+    /**
+     * @var RoleService
+     */
+    private $roles;
 
-    public function __construct(array $permissions)
+    public function __construct(RoleService $roles, array $permissions)
     {
+        $this->roles = $roles;
         $this->permissions = $permissions;
 
         foreach ($permissions as $role => $perms) {
@@ -46,7 +51,7 @@ class RolePermissionManager
 
     public function getRoles(): array
     {
-        return array_keys($this->permissions);
+        return $this->roles->getAvailableNames();
     }
 
     public function getPermissions(): array

src/Security/RoleService.php

@@ -9,12 +9,16 @@
 
 namespace App\Security;
 
-class RoleService
+final class RoleService
 {
     /**
      * @var array
      */
-    protected $roles;
+    private $roles;
+    /**
+     * @var string[]
+     */
+    private $roleNames = [];
 
     public function __construct(array $roles)
     {
@@ -23,16 +27,20 @@ class RoleService
 
     public function getAvailableNames(): array
     {
-        $roles = [];
-        foreach ($this->roles as $key => $value) {
-            $roles[] = $key;
-            if (is_array($value)) {
-                foreach ($value as $name) {
-                    $roles[] = $name;
+        if (empty($this->roleNames)) {
+            $roles = [];
+            foreach ($this->roles as $key => $value) {
+                $roles[] = $key;
+                if (is_array($value)) {
+                    foreach ($value as $name) {
+                        $roles[] = $name;
+                    }
                 }
             }
+
+            $this->roleNames = array_values(array_unique($roles));
         }
 
-        return array_values(array_unique($roles));
+        return $this->roleNames;
     }
 }

src/Validator/Constraints/RoleValidator.php

@@ -9,7 +9,7 @@
 
 namespace App\Validator\Constraints;
 
-use App\Entity\User;
+use App\Security\RoleService;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
@@ -17,14 +17,14 @@ use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 class RoleValidator extends ConstraintValidator
 {
     /**
-     * @var string[]
+     * @var RoleService
      */
-    protected $allowedRoles = [
-        User::ROLE_USER,
-        User::ROLE_TEAMLEAD,
-        User::ROLE_ADMIN,
-        User::ROLE_SUPER_ADMIN
-    ];
+    private $service;
+
+    public function __construct(RoleService $service)
+    {
+        $this->service = $service;
+    }
 
     /**
      * {@inheritdoc}
@@ -41,8 +41,10 @@ class RoleValidator extends ConstraintValidator
             $roles = [$roles];
         }
 
+        $allowedRoles = $this->service->getAvailableNames();
+
         foreach ($roles as $role) {
-            if (!is_string($role) || !in_array($role, $this->allowedRoles)) {
+            if (!is_string($role) || !in_array($role, $allowedRoles)) {
                 $this->context->buildViolation($constraint->message)
                     ->setParameter('{{ value }}', $this->formatValue($role))
                     ->setCode(Role::ROLE_ERROR)