Commit72e189a

committed

Merge branch '4.0'

* 4.0: fix merge

2 parents7ecfc7f +527f7e4 commit72e189aCopy full SHA for 72e189a

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 3 deletions

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`

Comments

(0)