Merge branch '2.3'

* 2.3:
  Revert "merged branch fabpot/event-dispatcher-debug (PR symfony#9068)"

Author: fabpot

src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

@@ -57,14 +57,12 @@ public function load(array $configs, ContainerBuilder $container)
         if ($container->getParameter('kernel.debug')) {
             $loader->load('debug.xml');
 
+            // only HttpKernel needs the debug event dispatcher
             $definition = $container->findDefinition('http_kernel');
-            $definition->replaceArgument(2, new Reference('debug.controller_resolver'));
-
-            // replace the regular event_dispatcher service with the debug one
-            $definition = $container->findDefinition('event_dispatcher');
-            $definition->setPublic(false);
-            $container->setDefinition('debug.event_dispatcher.parent', $definition);
-            $container->setAlias('event_dispatcher', 'debug.event_dispatcher');
+            $arguments = $definition->getArguments();
+            $arguments[0] = new Reference('debug.event_dispatcher');
+            $arguments[2] = new Reference('debug.controller_resolver');
+            $definition->setArguments($arguments);
         }
 
         $configuration = $this->getConfiguration($configs, $container);

src/Symfony/Bundle/FrameworkBundle/Resources/config/debug.xml

@@ -16,7 +16,7 @@
 
         <service id="debug.event_dispatcher" class="%debug.event_dispatcher.class%">
             <tag name="monolog.logger" channel="event" />
-            <argument type="service" id="debug.event_dispatcher.parent" />
+            <argument type="service" id="event_dispatcher" />
             <argument type="service" id="debug.stopwatch" />
             <argument type="service" id="logger" on-invalid="null" />
             <call method="setProfiler"><argument type="service" id="profiler" on-invalid="null" /></call>

src/Symfony/Component/HttpKernel/DependencyInjection/RegisterListenersPass.php

@@ -50,11 +50,11 @@ public function __construct($dispatcherService = 'event_dispatcher', $listenerTa
 
     public function process(ContainerBuilder $container)
     {
-        if (!$container->hasDefinition($this->dispatcherService) && !$container->hasAlias($this->dispatcherService)) {
+        if (!$container->hasDefinition($this->dispatcherService)) {
             return;
         }
 
-        $definition = $container->findDefinition($this->dispatcherService);
+        $definition = $container->getDefinition($this->dispatcherService);
 
         foreach ($container->findTaggedServiceIds($this->listenerTag) as $id => $events) {
             $def = $container->getDefinition($id);

src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterListenersPassTest.php

@@ -84,11 +84,8 @@ public function testValidEventSubscriber()
             ->method('getDefinition')
             ->will($this->returnValue($definition));
 
-        $builder->expects($this->atLeastOnce())
-            ->method('findDefinition')
-            ->will($this->returnValue($definition));
-
         $registerListenersPass = new RegisterListenersPass();
+
         $registerListenersPass->process($builder);
     }