bug symfony#20519 [Debug] Remove GLOBALS from exception context to avoid endless recursion (Seldaek)

nicolas-grekas · nicolas-grekas · commit 0221ffcb8f1b · 2016-11-15T07:52:31.000-05:00
This PR was merged into the 2.7 branch. Discussion ---------- [Debug] Remove GLOBALS from exception context to avoid endless recursion | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | License | MIT This fixes a endless recursion as seen in felixfbecker/php-language-server#137 - it only happens if you trigger an error in the global context so it's kinda hard to write a test for, but hopefully the fix can be accepted. Commits ------- 1bb95ac [Debug] Remove GLOBALS from exception context to avoid endless recursion
diff --git a/src/Symfony/Component/Debug/ErrorHandler.php b/src/Symfony/Component/Debug/ErrorHandler.php
@@ -373,7 +373,7 @@ public function handleError($type, $message, $file, $line, array $context, array
             return $type && $log;
         }
 
-        if (PHP_VERSION_ID < 50400 && isset($context['GLOBALS']) && ($this->scopedErrors & $type)) {
+        if (isset($context['GLOBALS']) && ($this->scopedErrors & $type)) {
             $e = $context;                  // Whatever the signature of the method,
             unset($e['GLOBALS'], $context); // $context is always a reference in 5.3
             $context = $e;

Original file line number	Diff line number	Diff line change
`@@ -373,7 +373,7 @@ public function handleError($type, $message, $file, $line, array $context, array`
`373`	`373`	`return $type && $log;`
`374`	`374`	`}`
`375`	`375`
`376`		`- if (PHP_VERSION_ID < 50400 && isset($context['GLOBALS']) && ($this->scopedErrors & $type)) {`
	`376`	`+ if (isset($context['GLOBALS']) && ($this->scopedErrors & $type)) {`
`377`	`377`	`$e = $context; // Whatever the signature of the method,`
`378`	`378`	`unset($e['GLOBALS'], $context); // $context is always a reference in 5.3`
`379`	`379`	`$context = $e;`