From c2f935593dacf435d3be4f1b859d94731606607a Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Mon, 23 Sep 2013 17:54:49 +0200
Subject: [PATCH] Revert "merged branch fabpot/event-dispatcher-debug (PR
 #9068)"

This reverts commit 1843b820153ed7efb635c7353a76d1ef75fb4422, reversing
changes made to 510960ed31861e1516bc4fd05f272ca6a36edb2a.
---
 .../Compiler/RegisterKernelListenersPass.php         |  4 ++--
 .../DependencyInjection/FrameworkExtension.php       | 12 +++++-------
 .../FrameworkBundle/Resources/config/debug.xml       |  2 +-
 .../Compiler/RegisterKernelListenersPassTest.php     |  4 ----
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/RegisterKernelListenersPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/RegisterKernelListenersPass.php
index 94157bce6f..4a152f575e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/RegisterKernelListenersPass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/RegisterKernelListenersPass.php
@@ -18,11 +18,11 @@ class RegisterKernelListenersPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container)
     {
-        if (!$container->hasDefinition('event_dispatcher') && !$container->hasAlias('event_dispatcher')) {
+        if (!$container->hasDefinition('event_dispatcher')) {
             return;
         }
 
-        $definition = $container->findDefinition('event_dispatcher');
+        $definition = $container->getDefinition('event_dispatcher');
 
         foreach ($container->findTaggedServiceIds('kernel.event_listener') as $id => $events) {
             $def = $container->getDefinition($id);
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 767400b16d..b4decdfefc 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -51,14 +51,12 @@ class FrameworkExtension extends Extension
         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);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug.xml
index d05f98ab4b..7d10cc70b9 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug.xml
@@ -17,7 +17,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>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/RegisterKernelListenersPassTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/RegisterKernelListenersPassTest.php
index 5592619a7f..a0bbcdc3d8 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/RegisterKernelListenersPassTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/RegisterKernelListenersPassTest.php
@@ -84,10 +84,6 @@ class RegisterKernelListenersPassTest extends \PHPUnit_Framework_TestCase
             ->method('getDefinition')
             ->will($this->returnValue($definition));
 
-        $builder->expects($this->atLeastOnce())
-            ->method('findDefinition')
-            ->will($this->returnValue($definition));
-
         $registerListenersPass = new RegisterKernelListenersPass();
         $registerListenersPass->process($builder);
     }