8000 Merge branch '2.7' into 2.8 · symfony/symfony@9b9f1be · GitHub
[go: up one dir, main page]

Skip to content

Commit 9b9f1be

Browse files
Merge branch '2.7' into 2.8
* 2.7: [Debug] Remove GLOBALS from exception context to avoid endless recursion
2 parents f0a6ed8 + 0221ffc commit 9b9f1be

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/Symfony/Component/Debug/ErrorHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ public function handleError($type, $message, $file, $line, array $context, array
399399
return $type && $log;
400400
}
401401

402-
if (PHP_VERSION_ID < 50400 && isset($context['GLOBALS']) && ($this->scopedErrors & $type)) {
402+
if (isset($context['GLOBALS']) && ($this->scopedErrors & $type)) {
403403
$e = $context; // Whatever the signature of the method,
404404
unset($e['GLOBALS'], $context); // $context is always a reference in 5.3
405405
$context = $e;

0 commit comments

Comments
 (0)
0