Merge branch '2.8' into 3.0

nicolas-grekas · nicolas-grekas · commit ef0a037f852a · 2016-01-13T11:30:06.000+01:00
* 2.8: [Yaml] Fix tests on PHP 7.0.2 [FrameworkBundle] Don't log twice with the error handler [2.7] Workaround https://bugs.php.net/63206 [2.3] Workaround https://bugs.php.net/63206 Add closing parenthesis [Serializer] Unset object_to_populate after using it [Serializer] Allow to use proxies in object_to_populate Conflicts: src/Symfony/Component/Debug/ErrorHandler.php src/Symfony/Component/HttpFoundation/JsonResponse.php
diff --git a/DependencyInjection/FrameworkExtension.php b/DependencyInjection/FrameworkExtension.php
@@ -137,6 +137,8 @@ public function load(array $configs, ContainerBuilder $container)
         }
 
         if ($container->getParameter('kernel.debug')) {
+            $definition->replaceArgument(2, E_ALL & ~(E_COMPILE_ERROR | E_PARSE | E_ERROR | E_CORE_ERROR | E_RECOVERABLE_ERROR));
+
             $loader->load('debug.xml');
 
             $definition = $container->findDefinition('http_kernel');
@@ -148,7 +150,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
`@@ -137,6 +137,8 @@ public function load(array $configs, ContainerBuilder $container)`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`if ($container->getParameter('kernel.debug')) {`
	`140`	`+ $definition->replaceArgument(2, E_ALL & ~(E_COMPILE_ERROR \| E_PARSE \| E_ERROR \| E_CORE_ERROR \| E_RECOVERABLE_ERROR));`
	`141`	`+`
`140`	`142`	`$loader->load('debug.xml');`
`141`	`143`
`142`	`144`	`$definition = $container->findDefinition('http_kernel');`
`@@ -148,7 +150,7 @@ public function load(array $configs, ContainerBuilder $container)`
`148`	`150`	`$container->setDefinition('debug.event_dispatcher.parent', $definition);`
`149`	`151`	`$container->setAlias('event_dispatcher', 'debug.event_dispatcher');`
`150`	`152`	`} else {`
`151`		`- $definition->replaceArgument(2, E_COMPILE_ERROR \| E_PARSE \| E_ERROR \| E_CORE_ERROR);`
	`153`	`+ $definition->replaceArgument(1, null);`
`152`	`154`	`}`
`153`	`155`
`154`	`156`	`$this->addClassesToCompile(array(`