8000 Merge branch '2.2' into 2.3 · symfony/symfony@c60a8e9 · GitHub
[go: up one dir, main page]
Skip to content
8000

Commit c60a8e9

Browse files
fabpotfabpot
committed
Merge branch '2.2' into 2.3
* 2.2: Revert "merged branch fabpot/event-dispatcher-debug (PR #9068)" Conflicts: src/Symfony/Component/HttpKernel/DependencyInjection/RegisterListenersPass.php src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterListenersPassTest.php
2 parents 775a39c + c2f9355 commit c60a8e9

File tree

4 files changed

+9
-14
lines changed

4 files changed

+9
-14
lines changed

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,12 @@ public function load(array $configs, ContainerBuilder $container)
5353
if ($container->getParameter('kernel.debug')) {
5454
$loader->load('debug.xml');
5555

56+
// only HttpKernel needs the debug event dispatcher
5657
$definition = $container->findDefinition('http_kernel');
57-
$definition->replaceArgument(2, new Reference('debug.controller_resolver'));
58-
59-
// replace the regular event_dispatcher service with the debug one
60-
$definition = $container->findDefinition('event_dispatcher');
61-
$definition->setPublic(false);
62-
$container->setDefinition('debug.event_dispatcher.parent', $definition);
63-
$container->setAlias('event_dispatcher', 'debug.event_dispatcher');
58+
$arguments = $definition->getArguments();
59+
$arguments[0] = new Reference('debug.event_dispatcher');
60+
$arguments[2] = new Reference('debug.controller_resolver');
61+
$definition->setArguments($arguments);
6462
}
6563

6664
$configuration = $this->getConfiguration($configs, $container);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<service id="debug.event_dispatcher" class="%debug.event_dispatcher.class%">
1818
<tag name="monolog.logger" channel="event" />
19-
<argument type="service" id="debug.event_dispatcher.parent" />
19+
<argument type="service" id="event_dispatcher" />
2020
<argument type="service" id="debug.stopwatch" />
2121
<argument type="service" id="logger" on-invalid="null" />
2222
<call method="setProfiler"><argument type="service" id="profiler" on-invalid="null" /></call>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ public function __construct($dispatcherService = 'event_dispatcher', $listenerTa
5050

5151
public function process(ContainerBuilder $container)
5252
{
53-
if (!$container->hasDefinition($this->dispatcherService) && !$container->hasAlias($this->dispatcherService)) {
53+
if (!$container->hasDefinition($this->dispatcherService)) {
5454
return;
5555
}
5656

57-
$definition = $container->findDefinition($this->dispatcherService);
57+
$definition = $container->getDefinition($this->dispatcherService);
5858

5959
foreach ($container->findTaggedServiceIds($this->listenerTag) as $id => $events) {
6060
$def = $container->getDefinition($id);

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,8 @@ public function testValidEventSubscriber()
8484
->method('getDefinition')
8585
->will($this->returnValue($definition));
8686

87-
$builder->expects($this->atLeastOnce())
88-
->method('findDefinition')
89-
->will($this->returnValue($definition));
90-
9187
$registerListenersPass = new RegisterListenersPass();
88+
9289
$registerListenersPass->process($builder);
9390
}
9491

0 commit comments

Comments
 (0)
0