RoleDefinitionInterface

Container/User/UserContainer.php

@@ -4,6 +4,7 @@ namespace Lc\SovBundle\Container\User;
 
 use Lc\SovBundle\Builder\User\UserBuilder;
 use Lc\SovBundle\Definition\Field\User\UserFieldDefinition;
+use Lc\SovBundle\Definition\RolesDefinitionInterface;
 use Lc\SovBundle\Factory\User\UserFactory;
 use Lc\SovBundle\Repository\User\UserRepositoryQuery;
 use Lc\SovBundle\Repository\User\UserStore;
@@ -17,14 +18,16 @@ class UserContainer
     protected UserStore $store;
     protected UserSolver $solver;
     protected UserFieldDefinition $fieldDefinition;
+    protected RolesDefinitionInterface $rolesDefinition;
 
     public function __construct(
-            UserFactory $factory,
-            UserBuilder $builder,
-            UserRepositoryQuery $repositoryQuery,
-            UserStore $store,
-            UserSolver $solver,
-            UserFieldDefinition $fieldDefinition
+        UserFactory $factory,
+        UserBuilder $builder,
+        UserRepositoryQuery $repositoryQuery,
+        UserStore $store,
+        UserSolver $solver,
+        UserFieldDefinition $fieldDefinition,
+        RolesDefinitionInterface $rolesDefinition
     ) {
         $this->factory = $factory;
         $this->builder = $builder;
@@ -32,6 +35,7 @@ class UserContainer
         $this->store = $store;
         $this->solver = $solver;
         $this->fieldDefinition = $fieldDefinition;
+        $this->rolesDefinition = $rolesDefinition;
     }
 
     public function getFactory(): UserFactory
@@ -63,4 +67,9 @@ class UserContainer
     {
         return $this->fieldDefinition;
     }
+
+    public function getRoleDefinition(): RolesDefinitionInterface
+    {
+        return $this->rolesDefinition;
+    }
 }

Controller/User/UserAdminController.php

@@ -22,14 +22,6 @@ use Symfony\Component\HttpFoundation\Session\SessionInterface;
 
 abstract class UserAdminController extends AbstractAdminController
 {
-    protected RolesDefinitionInterface $rolesDefinition;
-
-    public function __construct(
-        RolesDefinitionInterface $rolesDefinition
-    ) {
-        $this->rolesDefinition = $rolesDefinition;
-    }
-
     public function buildIndexActions(Actions $actions): void
     {
         parent::buildIndexActions($actions); // TODO: Change the autogenerated stub
@@ -76,7 +68,7 @@ abstract class UserAdminController extends AbstractAdminController
             ChoiceField::new('roles')
                 ->allowMultipleChoices()
                 ->autocomplete()
-                ->setChoices($this->rolesDefinition->getRolesList())
+                ->setChoices($this->getUserContainer()->getRoleDefinition()->getRolesList())
         ];
     }