Use setPublic() instead of aliases

GuilhemN · GuilhemN · commit e8d00537e940 · 2016-03-12T14:35:03.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/FormPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/FormPass.php
@@ -36,10 +36,7 @@ public function process(ContainerBuilder $container)
         foreach ($container->findTaggedServiceIds('form.type') as $serviceId => $tag) {
             $serviceDefinition = $container->getDefinition($serviceId);
             if (!$serviceDefinition->isPublic()) {
-                $alias = sprintf('public_services.%s', $serviceId);
-                $container->setAlias($alias, $serviceId);
-
-                $serviceId = $alias;
+                $serviceDefinition->setPublic(true);
             }
 
             // Support type access by FQCN
@@ -53,10 +50,7 @@ public function process(ContainerBuilder $container)
         foreach ($container->findTaggedServiceIds('form.type_extension') as $serviceId => $tag) {
             $serviceDefinition = $container->getDefinition($serviceId);
             if (!$serviceDefinition->isPublic()) {
-                $alias = sprintf('public_services.%s', $serviceId);
-                $container->setAlias($alias, $serviceId);
-
-                $serviceId = $alias;
+                $serviceDefinition->setPublic(true);
             }
 
             if (isset($tag[0]['extended_type'])) {
@@ -72,13 +66,10 @@ public function process(ContainerBuilder $container)
 
         // Find all services annotated with "form.type_guesser"
         $guessers = array_keys($container->findTaggedServiceIds('form.type_guesser'));
-        foreach ($guessers as &$serviceId) {
+        foreach ($guessers as $serviceId) {
             $serviceDefinition = $container->getDefinition($serviceId);
             if (!$serviceDefinition->isPublic()) {
-                $alias = sprintf('public_services.%s', $serviceId);
-                $container->setAlias($alias, $serviceId);
-
-                $serviceId = $alias;
+                $serviceDefinition->setPublic(true)
             }
         }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/FormPassTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/FormPassTest.php
@@ -166,13 +166,14 @@ public function testPrivateTaggedServices($id, $tagName, $argument, $expectedArg
         ));
 
         $container->setDefinition('form.extension', $extDefinition);
-        $container->register($id, 'stdClass')->setPublic(false)->addTag($tagName, array('extended_type' => 'stdClass'));
+        $extension = $container->register($id, 'stdClass')->setPublic(false)->addTag($tagName, array('extended_type' => 'stdClass'));
 
         $container->compile();
 
         $extDefinition = $container->getDefinition('form.extension');
 
         $this->assertSame($expectedArguments, $extDefinition->getArgument($argument));
+        $this->assertTrue($extension->isPublic());
     }
 
     public function privateTaggedServicesProvider()
diff --git a/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php b/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php
@@ -59,10 +59,7 @@ public function process(ContainerBuilder $container)
         foreach ($container->findTaggedServiceIds($this->listenerTag) as $id => $events) {
             $def = $container->getDefinition($id);
             if (!$def->isPublic()) {
-                $alias = sprintf('public_services.%s', $id);
-                $container->setAlias($alias, $id);
-
-                $id = $alias;
+                $def->setPublic(true)
             }
 
             if ($def->isAbstract()) {
@@ -91,10 +88,7 @@ public function process(ContainerBuilder $container)
         foreach ($container->findTaggedServiceIds($this->subscriberTag) as $id => $attributes) {
             $def = $container->getDefinition($id);
             if (!$def->isPublic()) {
-                $alias = sprintf('public_services.%s', $id);
-                $container->setAlias($alias, $id);
-
-                $id = $alias;
+                $def->setPublic(true);
             }
 
             if ($def->isAbstract()) {
diff --git a/src/Symfony/Component/EventDispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php b/src/Symfony/Component/EventDispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php
@@ -103,7 +103,7 @@ public function testValidEventSubscriber()
     public function testPrivateEventListenerAndSubscriber($tag, array $tagAttributes, array $methodCalls)
     {
         $container = new ContainerBuilder();
-        $container
+        $listener = $container
             ->register('foo', SubscriberService::class)
             ->setPublic(false)
             ->addTag($tag, $tagAttributes);
@@ -113,16 +113,17 @@ public function testPrivateEventListenerAndSubscriber($tag, array $tagAttributes
         $registerListenersPass->process($container);
 
         $this->assertSame($methodCalls, $eventDispatcher->getMethodCalls());
+        $this->assertTrue($listener->isPublic());
     }
 
     public function privateTaggedServicesProvider()
     {
         return array(
             array('kernel.event_subscriber', array(), array(
-                array('addSubscriberService', array('public_services.foo', SubscriberService::class)),
+                array('addSubscriberService', array('foo', SubscriberService::class)),
             )),
             array('kernel.event_listener', array('event' => 'foo_bar'), array(
-                array('addListenerService', array('foo_bar', array('public_services.foo', 'onFoobar'), 0)),
+                array('addListenerService', array('foo_bar', array('foo', 'onFoobar'), 0)),
             )),
         );
     }
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/FragmentRendererPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/FragmentRendererPass.php
@@ -44,10 +44,7 @@ public function process(ContainerBuilder $container)
         foreach ($container->findTaggedServiceIds($this->rendererTag) as $id => $tags) {
             $def = $container->getDefinition($id);
             if (!$def->isPublic()) {
-                $alias = sprintf('public_services.%s', $id);
-                $container->setAlias($alias, $id);
-
-                $id = $alias;
+                $def->setPublic(true);
             }
 
             if ($def->isAbstract()) {
