Merge branch '2.8' into 3.1

* 2.8: [Debug] Remove GLOBALS from exception context to avoid endless recursion
symfony · Nov 15, 2016 · 30e83dc · 30e83dc
2 parents 6b7dd44 + 9b9f1be
commit 30e83dc
Showing 1 changed file with 4 additions and 0 deletions.
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