Mark some services public (#1036)

sonata-project · Jun 8, 2018 · 36780a4 · 36780a4
1 parent 8e28ce7
commit 36780a4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/DependencyInjection/SonataUserExtension.php b/src/DependencyInjection/SonataUserExtension.php
@@ -260,6 +260,10 @@ protected function aliasManagers(ContainerBuilder $container, $managerType): voi
     {
         $container->setAlias('sonata.user.user_manager', sprintf('sonata.user.%s.user_manager', $managerType));
         $container->setAlias('sonata.user.group_manager', sprintf('sonata.user.%s.group_manager', $managerType));
+
+        // NEXT_MAJOR: call setPublic(true) directly, when dropping support for Sf 3.3
+        $container->getAlias('sonata.user.user_manager')->setPublic(true);
+        $container->getAlias('sonata.user.group_manager')->setPublic(true);
     }
 
     /**

diff --git a/src/Resources/config/admin.xml b/src/Resources/config/admin.xml
@@ -30,7 +30,7 @@
             <argument type="service" id="translator"/>
             <argument>%security.role_hierarchy.roles%</argument>
         </service>
-        <service id="sonata.user.form.roles_matrix_type" class="Sonata\UserBundle\Form\Type\RolesMatrixType">
+        <service id="sonata.user.form.roles_matrix_type" class="Sonata\UserBundle\Form\Type\RolesMatrixType" public="true">
             <tag name="form.type"/>
             <argument type="service" id="sonata.user.matrix_roles_builder"/>
         </service>

diff --git a/src/Resources/config/orm.xml b/src/Resources/config/orm.xml
@@ -7,7 +7,7 @@
             <argument type="service" id="fos_user.object_manager"/>
             <argument>%fos_user.model.user.class%</argument>
         </service>
-        <service id="sonata.user.manager.user" class="Sonata\UserBundle\Entity\UserManagerProxy">
+        <service id="sonata.user.manager.user" class="Sonata\UserBundle\Entity\UserManagerProxy" public="true">
             <argument>%fos_user.model.user.class%</argument>
             <argument type="service" id="doctrine"/>
             <argument type="service" id="sonata.user.orm.user_manager"/>