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

nicolas-grekas · xabbuh · commit 90d493ea9712 · 2016-01-19T00:13:42.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -139,6 +139,8 @@ public function load(array $configs, ContainerBuilder $container)
         }
 
         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 @@ public function load(array $configs, ContainerBuilder $container)
             $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(

Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,8 @@ public function load(array $configs, ContainerBuilder $container)`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`if ($container->getParameter('kernel.debug')) {`
	`142`	`+ $definition->replaceArgument(2, -1 & ~(E_COMPILE_ERROR \| E_PARSE \| E_ERROR \| E_CORE_ERROR \| E_RECOVERABLE_ERROR));`
	`143`	`+`
`142`	`144`	`$loader->load('debug.xml');`
`143`	`145`
`144`	`146`	`$definition = $container->findDefinition('http_kernel');`
`@@ -150,7 +152,7 @@ public function load(array $configs, ContainerBuilder $container)`
`150`	`152`	`$container->setDefinition('debug.event_dispatcher.parent', $definition);`
`151`	`153`	`$container->setAlias('event_dispatcher', 'debug.event_dispatcher');`
`152`	`154`	`} else {`
`153`		`- $definition->replaceArgument(2, E_COMPILE_ERROR \| E_PARSE \| E_ERROR \| E_CORE_ERROR);`
	`155`	`+ $definition->replaceArgument(1, null);`
`154`	`156`	`}`
`155`	`157`
`156`	`158`	`$this->addClassesToCompile(array(`