bug #17433 [FrameworkBundle] Don't log twice with the error handler (nicolas-grekas)

This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] Don't log twice with the error handler

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #16980, #17202
| License       | MIT
| Doc PR        |

Commits
-------

90d493e [FrameworkBundle] Don't log twice with the error handler
This commit is contained in:
Fabien Potencier 2016-01-19 13:12:05 +01:00
commit 63cb9a90e2
1 changed files with 3 additions and 1 deletions

View File

@ -139,6 +139,8 @@ class FrameworkExtension extends Extension
}
if ($container->getParameter('kernel.debug')) {
$definition->replaceArgument(2, -1 & ~(E_COMPILE_ERROR | E_PARSE | E_ERROR | E_CORE_ERROR | E_RECOVERABLE_ERROR));
$loader->load('debug.xml');
$definition = $container->findDefinition('http_kernel');
@ -150,7 +152,7 @@ class FrameworkExtension extends Extension
$container->setDefinition('debug.event_dispatcher.parent', $definition);
$container->setAlias('event_dispatcher', 'debug.event_dispatcher');
} else {
$definition->replaceArgument(2, E_COMPILE_ERROR | E_PARSE | E_ERROR | E_CORE_ERROR);
$definition->replaceArgument(1, null);
}
$this->addClassesToCompile(array(