Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit 9b9f1be11741 · 2016-11-15T07:53:17.000-05:00
* 2.7:
  [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
@@ -399,7 +399,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
`@@ -399,7 +399,7 @@ public function handleError($type, $message, $file, $line, array $context, array`
`399`	`399`	`return $type && $log;`
`400`	`400`	`}`
`401`	`401`
`402`		`- if (PHP_VERSION_ID < 50400 && isset($context['GLOBALS']) && ($this->scopedErrors & $type)) {`
	`402`	`+ if (isset($context['GLOBALS']) && ($this->scopedErrors & $type)) {`
`403`	`403`	`$e = $context; // Whatever the signature of the method,`
`404`	`404`	`unset($e['GLOBALS'], $context); // $context is always a reference in 5.3`
`405`	`405`	`$context = $e;`