bug #9168 [FrameworkBundle] made sure that the debug event dispatcher is used everywhere (fabpot)

fabpot · fabpot · commit d866a5acc454 · 2013-10-28T15:29:55.000+01:00
This PR was merged into the master branch. Discussion ---------- [FrameworkBundle] made sure that the debug event dispatcher is used everywhere | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #6686, #7673 | License | MIT | Doc PR | n/a The removal of the Profiler dependency on the TraceableEventDispatcher (#9170) allows to remerge the patch from #9068 that fixes #6686. This PR also cleans up how profiles are stored. A Profile is now always stored only once. The fix will only be available on 2.4+ as the changes are too deep to be backported to 2.2 and 2.3. Commits ------- 1e1835e [FrameworkBundle] made sure that the debug event dispatcher is used everywhere
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -60,16 +60,14 @@ public function load(array $configs, ContainerBuilder $container)
         if ($container->getParameter('kernel.debug')) {
             $loader->load('debug.xml');
 
-            // we can't replace the event_dispatcher service with the debug
-            // one as it would lead to circular references (mainly because the debug
-            // event dispatcher needs the profiler, which triggers the creation of many
-            // other services that can depend on the dispatcher itself -- CLI commands
-            // like assetic:dump and twig:lint exhibits this issue for instance)
             $definition = $container->findDefinition('http_kernel');
-            $arguments = $definition->getArguments();
-            $arguments[0] = new Reference('debug.event_dispatcher');
-            $arguments[2] = new Reference('debug.controller_resolver');
-            $definition->setArguments($arguments);
+            $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');
         }
 
         $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
@@ -16,7 +16,7 @@
 
         <service id="debug.event_dispatcher" class="%debug.event_dispatcher.class%">
             <tag name="monolog.logger" channel="event" />
-            <argument type="service" id="event_dispatcher" />
+            <argument type="service" id="debug.event_dispatcher.parent" />
             <argument type="service" id="debug.stopwatch" />
             <argument type="service" id="logger" on-invalid="null" />
         </service>
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterListenersPass.php b/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)) {
+        if (!$container->hasDefinition($this->dispatcherService) && !$container->hasAlias($this->dispatcherService)) {
             return;
         }
 
-        $definition = $container->getDefinition($this->dispatcherService);
+        $definition = $container->findDefinition($this->dispatcherService);
 
         foreach ($container->findTaggedServiceIds($this->listenerTag) as $id => $events) {
             $def = $container->getDefinition($id);
diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterListenersPassTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterListenersPassTest.php
@@ -83,8 +83,11 @@ public function testValidEventSubscriber()
             ->method('getDefinition')
             ->will($this->returnValue($definition));
 
-        $registerListenersPass = new RegisterListenersPass();
+        $builder->expects($this->atLeastOnce())
+            ->method('findDefinition')
+            ->will($this->returnValue($definition));
 
+        $registerListenersPass = new RegisterListenersPass();
         $registerListenersPass->process($builder);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -50,11 +50,11 @@ public function __construct($dispatcherService = 'event_dispatcher', $listenerTa`
`50`	`50`
`51`	`51`	`public function process(ContainerBuilder $container)`
`52`	`52`	`{`
`53`		`- if (!$container->hasDefinition($this->dispatcherService)) {`
	`53`	`+ if (!$container->hasDefinition($this->dispatcherService) && !$container->hasAlias($this->dispatcherService)) {`
`54`	`54`	`return;`
`55`	`55`	`}`
`56`	`56`
`57`		`- $definition = $container->getDefinition($this->dispatcherService);`
	`57`	`+ $definition = $container->findDefinition($this->dispatcherService);`
`58`	`58`
`59`	`59`	`foreach ($container->findTaggedServiceIds($this->listenerTag) as $id => $events) {`
`60`	`60`	`$def = $container->getDefinition($id);`