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

nicolas-grekas · nicolas-grekas · commit c60053e0fd20 · 2016-01-13T10:41:30.000+01:00
This PR was merged into the 2.8 branch. Discussion ---------- [FrameworkBundle] Don't log twice with the error handler | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #16980 | License | MIT | Doc PR | - ping @Tobion @yapro does it work as expected with this patch? Commits ------- 5926ff2 [FrameworkBundle] Don't log twice with the error handler
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -143,6 +143,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');
@@ -154,7 +156,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
`@@ -143,6 +143,8 @@ public function load(array $configs, ContainerBuilder $container)`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`if ($container->getParameter('kernel.debug')) {`
	`146`	`+ $definition->replaceArgument(2, -1 & ~(E_COMPILE_ERROR \| E_PARSE \| E_ERROR \| E_CORE_ERROR \| E_RECOVERABLE_ERROR));`
	`147`	`+`
`146`	`148`	`$loader->load('debug.xml');`
`147`	`149`
`148`	`150`	`$definition = $container->findDefinition('http_kernel');`
`@@ -154,7 +156,7 @@ public function load(array $configs, ContainerBuilder $container)`
`154`	`156`	`$container->setDefinition('debug.event_dispatcher.parent', $definition);`
`155`	`157`	`$container->setAlias('event_dispatcher', 'debug.event_dispatcher');`
`156`	`158`	`} else {`
`157`		`- $definition->replaceArgument(2, E_COMPILE_ERROR \| E_PARSE \| E_ERROR \| E_CORE_ERROR);`
	`159`	`+ $definition->replaceArgument(1, null);`
`158`	`160`	`}`
`159`	`161`
`160`	`162`	`$this->addClassesToCompile(array(`