Make all services public that we are retrieving directly from the container.

sheeep · sheeep · commit d6df8a8afbfc · 2018-02-19T17:46:07.000+01:00
diff --git a/src/DependencyInjection/Compiler/MakeServicesPublicPass.php b/src/DependencyInjection/Compiler/MakeServicesPublicPass.php
@@ -14,6 +14,7 @@
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 
 /**
  * Makes services public that we need to retrieve directly.
@@ -25,8 +26,27 @@ class MakeServicesPublicPass implements CompilerPassInterface
      */
     public function process(ContainerBuilder $container): void
     {
-        if ($container->hasDefinition('security.firewall.map')) {
-            $container->getDefinition('security.firewall.map')->setPublic(true);
+        $services = [
+            'assets.packages',
+            'database_connection',
+            'doctrine.dbal.default_connection',
+            'fragment.handler',
+            'lexik_maintenance.driver.factory',
+            'monolog.logger.contao',
+            'security.firewall.map',
+            'security.logout_url_generator',
+            'swiftmailer.mailer'
+        ];
+
+        foreach ($services as $service) {
+            // Uses findDefinition instead of hasDefinition/getDefinition
+            // as hasDefinition does not check aliased services
+            try {
+                $definition = $container->findDefinition($service);
+                $definition->setPublic(true);
+            } catch (ServiceNotFoundException $exception) {
+                continue;
+            }
         }
     }
-}
+}
diff --git a/tests/DependencyInjection/Compiler/MakeServicesPublicPassTest.php b/tests/DependencyInjection/Compiler/MakeServicesPublicPassTest.php
@@ -29,11 +29,23 @@ public function testCanBeInstantiated(): void
     public function testMakesTheServicesPublic(): void
     {
         $container = new ContainerBuilder();
-        $container->setDefinition('security.firewall.map', new Definition());
+        $container->setDefinition('security.firewall.map', (new Definition())->setPublic(false));
 
         $pass = new MakeServicesPublicPass();
         $pass->process($container);
 
         $this->assertTrue($container->getDefinition('security.firewall.map')->isPublic());
     }
+    
+    public function testMakesAliasedServicesPublic(): void
+    {
+        $container = new ContainerBuilder();
+        $container->setDefinition('contao.fragment.handler', (new Definition())->setPublic(false));
+        $container->setAlias('fragment.handler', 'contao.fragment.handler');
+
+        $pass = new MakeServicesPublicPass();
+        $pass->process($container);
+
+        $this->assertTrue($container->getDefinition('contao.fragment.handler')->isPublic());
+    }
 }
