bug #15000 [2.3][Debug] Fix fatal-errors handling on HHVM (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 17ffb5a81a72 · 2015-06-18T14:49:57.000+02:00
This PR was merged into the 2.3 branch. Discussion ---------- [2.3][Debug] Fix fatal-errors handling on HHVM | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #14967 | License | MIT | Doc PR | - Commits ------- d29bfdc [2.3][Debug] Fix fatal-errors handling on HHVM
diff --git a/src/Symfony/Component/Debug/ErrorHandler.php b/src/Symfony/Component/Debug/ErrorHandler.php
@@ -133,6 +133,7 @@ function ($row) {
                 unset($context['GLOBALS']);
             }
 
+            $level &= E_ALL | E_STRICT;
             $exception = new ContextErrorException(sprintf('%s: %s in %s line %d', isset($this->levels[$level]) ? $this->levels[$level] : $level, $message, $file, $line), 0, $level, $file, $line, $context);
 
             // Exceptions thrown from error handlers are sometimes not caught by the exception
@@ -173,7 +174,7 @@ public function handleFatal()
         }
 
         $this->reservedMemory = '';
-        $type = $error['type'];
+        $type = $error['type'] & (E_ALL | E_STRICT);
         if (0 === $this->level || !in_array($type, array(E_ERROR, E_CORE_ERROR, E_COMPILE_ERROR, E_PARSE))) {
             return;
         }

Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,7 @@ function ($row) {`
`133`	`133`	`unset($context['GLOBALS']);`
`134`	`134`	`}`
`135`	`135`
	`136`	`+ $level &= E_ALL \| E_STRICT;`
`136`	`137`	`$exception = new ContextErrorException(sprintf('%s: %s in %s line %d', isset($this->levels[$level]) ? $this->levels[$level] : $level, $message, $file, $line), 0, $level, $file, $line, $context);`
`137`	`138`
`138`	`139`	`// Exceptions thrown from error handlers are sometimes not caught by the exception`
`@@ -173,7 +174,7 @@ public function handleFatal()`
`173`	`174`	`}`
`174`	`175`
`175`	`176`	`$this->reservedMemory = '';`
`176`		`- $type = $error['type'];`
	`177`	`+ $type = $error['type'] & (E_ALL \| E_STRICT);`
`177`	`178`	`if (0 === $this->level \|\| !in_array($type, array(E_ERROR, E_CORE_ERROR, E_COMPILE_ERROR, E_PARSE))) {`
`178`	`179`	`return;`
`179`	`180`	`}`