Merge branch '2.8' into 3.1

nicolas-grekas · nicolas-grekas · commit 30e83dcc4b36 · 2016-11-15T07:55:20.000-05:00
* 2.8:
  [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
@@ -372,6 +372,10 @@ public function handleError($type, $message, $file, $line, array $context, array
             return $type && $log;
         }
 
+        if (isset($context['GLOBALS']) && ($this->scopedErrors & $type)) {
+            unset($context['GLOBALS']);
+        }
+
         if (null !== $backtrace && $type & E_ERROR) {
             // E_ERROR fatal errors are triggered on HHVM when
             // hhvm.error_handling.call_user_handler_on_fatals=1
