Merge pull request #712 from sroze/doctrine-service-is-public

`doctrine` service is public
doctrine · Oct 8, 2017 · 96a074a · 96a074a
2 parents 8294997 + e0a9109
commit 96a074a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/DependencyInjection/DoctrineExtension.php b/DependencyInjection/DoctrineExtension.php
@@ -123,6 +123,7 @@ protected function dbalLoad(array $config, ContainerBuilder $container)
         $this->defaultConnection = $config['default_connection'];
 
         $container->setAlias('database_connection', sprintf('doctrine.dbal.%s_connection', $this->defaultConnection));
+        $container->getAlias('database_connection')->setPublic(true);
         $container->setAlias('doctrine.dbal.event_manager', new Alias(sprintf('doctrine.dbal.%s_connection.event_manager', $this->defaultConnection), false));
 
         $container->setParameter('doctrine.dbal.connection_factory.types', $config['types']);
@@ -351,6 +352,7 @@ protected function ormLoad(array $config, ContainerBuilder $container)
         }
 
         $container->setAlias('doctrine.orm.entity_manager', sprintf('doctrine.orm.%s_entity_manager', $config['default_entity_manager']));
+        $container->getAlias('doctrine.orm.entity_manager')->setPublic(true);
 
         $config['entity_managers'] = $this->fixManagersAutoMappings($config['entity_managers'], $container->getParameter('kernel.bundles'));
 

diff --git a/Resources/config/dbal.xml b/Resources/config/dbal.xml
@@ -56,7 +56,7 @@
 
         <service id="doctrine.dbal.connection.configuration" class="%doctrine.dbal.configuration.class%" public="false" abstract="true" />
 
-        <service id="doctrine" class="%doctrine.class%">
+        <service id="doctrine" class="%doctrine.class%" public="true">
             <argument type="service" id="service_container" />
             <argument>%doctrine.connections%</argument>
             <argument>%doctrine.entity_managers%</argument>

diff --git a/Tests/DependencyInjection/DoctrineExtensionTest.php b/Tests/DependencyInjection/DoctrineExtensionTest.php
@@ -56,6 +56,19 @@ public function testAutowiringAlias()
         }
     }
 
+    public function testPublicServicesAndAliases()
+    {
+        $container = $this->getContainer();
+        $extension = new DoctrineExtension();
+        $config = BundleConfigurationBuilder::createBuilderWithBaseValues()->build();
+
+        $extension->load(array($config), $container);
+
+        $this->assertTrue($container->getDefinition('doctrine')->isPublic());
+        $this->assertTrue($container->getAlias('doctrine.orm.entity_manager')->isPublic());
+        $this->assertTrue($container->getAlias('database_connection')->isPublic());
+    }
+
     public function testDbalGenerateDefaultConnectionConfiguration()
     {
         $container = $this->getContainer();