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
This commit is contained in:
commit
c60a8e962b
@ -53,14 +53,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);
|
||||
|
@ -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>
|
||||
|
@ -50,11 +50,11 @@ class RegisterListenersPass implements CompilerPassInterface
|
||||
|
||||
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);
|
||||
|
@ -84,11 +84,8 @@ class RegisterListenersPassTest extends \PHPUnit_Framework_TestCase
|
||||
->method('getDefinition')
|
||||
->will($this->returnValue($definition));
|
||||
|
||||
$builder->expects($this->atLeastOnce())
|
||||
->method('findDefinition')
|
||||
->will($this->returnValue($definition));
|
||||
|
||||
$registerListenersPass = new RegisterListenersPass();
|
||||
|
||||
$registerListenersPass->process($builder);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user