Merge branch '4.0'

nicolas-grekas · nicolas-grekas · commit 72e189a356ac · 2017-12-12T10:23:59.000+01:00
* 4.0:
  fix merge
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -505,13 +505,13 @@ protected function initializeContainer()
 
                 $oldContainer = file_exists($cache->getPath()) && is_object($oldContainer = include $cache->getPath()) ? new \ReflectionClass($oldContainer) : false;
             } finally {
-                if ($this->debug && true !== $previousHandler) {
+                if (!$this->debug) {
+                    error_reporting($errorLevel);
+                } elseif (true !== $previousHandler) {
                     restore_error_handler();
 
                     file_put_contents($cacheDir.'/'.$class.'Deprecations.log', serialize(array_values($collectedLogs)));
                     file_put_contents($cacheDir.'/'.$class.'Compiler.log', null !== $container ? implode("\n", $container->getCompiler()->getLog()) : '');
-                } else {
-                    error_reporting($errorLevel);
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -505,13 +505,13 @@ protected function initializeContainer()`
`505`	`505`
`506`	`506`	`$oldContainer = file_exists($cache->getPath()) && is_object($oldContainer = include $cache->getPath()) ? new \ReflectionClass($oldContainer) : false;`
`507`	`507`	`} finally {`
`508`		`- if ($this->debug && true !== $previousHandler) {`
	`508`	`+ if (!$this->debug) {`
	`509`	`+ error_reporting($errorLevel);`
	`510`	`+ } elseif (true !== $previousHandler) {`
`509`	`511`	`restore_error_handler();`
`510`	`512`
`511`	`513`	`file_put_contents($cacheDir.'/'.$class.'Deprecations.log', serialize(array_values($collectedLogs)));`
`512`	`514`	`file_put_contents($cacheDir.'/'.$class.'Compiler.log', null !== $container ? implode("\n", $container->getCompiler()->getLog()) : '');`
`513`		`- } else {`
`514`		`- error_reporting($errorLevel);`
`515`	`515`	`}`
`516`	`516`	`}`
`517`	`517`