Merge branch '2.8' into 3.1

* 2.8: [Debug] Remove GLOBALS from exception context to avoid endless recursion
Merge branch '2.7' into 2.8
2026-03-25 17:52:07 +01:00 · 2016-11-15 07:55:20 -05:00 · 2016-11-15 07:53:17 -05:00 · 2016-11-15 07:52:31 -05:00 · 2016-11-15 13:37:17 +01:00 · 2016-11-03 09:04:31 +01:00
5 changed files with 21 additions and 17 deletions
--- a/ErrorHandler.php
+++ b/ErrorHandler.php
@@ -372,6 +372,10 @@ class ErrorHandler
            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
--- a/Resources/ext/tests/001.phpt
+++ b/Resources/ext/tests/001.phpt
@@ -1,14 +1,14 @@
 --TEST--
 Test symfony_zval_info API
 --SKIPIF--
-<?php if (!extension_loaded("symfony_debug")) print "skip"; ?>
+<?php if (!extension_loaded('symfony_debug')) print 'skip'; ?>
 --FILE--
 <?php

 $int = 42;
 $float = 42.42;
-$str = "foobar";
-$object = new StdClass;
+$str = 'foobar';
+$object = new StdClass();
 $array = array('foo', 'bar');
 $resource = tmpfile();
 $null = null;
@@ -17,15 +17,17 @@ $bool = true;
 $anotherint = 42;
 $refcount2 = &$anotherint;

-$var = array('int' => $int,
-			 'float' => $float,
-			 'str' => $str,
-			 'object' => $object,
-			 'array' => $array,
-			 'resource' => $resource,
-			 'null' => $null,
-			 'bool' => $bool,
-			 'refcount' => &$refcount2);
+$var = array(
+    'int' => $int,
+    'float' => $float,
+    'str' => $str,
+    'object' => $object,
+    'array' => $array,
+    'resource' => $resource,
+    'null' => $null,
+    'bool' => $bool,
+    'refcount' => &$refcount2,
+);

 var_dump(symfony_zval_info('int', $var));
 var_dump(symfony_zval_info('float', $var));
--- a/Resources/ext/tests/002.phpt
+++ b/Resources/ext/tests/002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test symfony_debug_backtrace in case of fatal error
 --SKIPIF--
-<?php if (!extension_loaded("symfony_debug")) print "skip"; ?>
+<?php if (!extension_loaded('symfony_debug')) print 'skip'; ?>
 --FILE--
 <?php

@@ -18,7 +18,6 @@ function foo()
 function bt()
 {
    print_r(symfony_debug_backtrace());
-
 }

 register_shutdown_function('bt');
--- a/Resources/ext/tests/002_1.phpt
+++ b/Resources/ext/tests/002_1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test symfony_debug_backtrace in case of non fatal error
 --SKIPIF--
-<?php if (!extension_loaded("symfony_debug")) print "skip"; ?>
+<?php if (!extension_loaded('symfony_debug')) print 'skip'; ?>
 --FILE--
 <?php

@@ -13,7 +13,6 @@ function bar()
 function bt()
 {
    print_r(symfony_debug_backtrace());
-
 }

 bar();
--- a/Resources/ext/tests/003.phpt
+++ b/Resources/ext/tests/003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ErrorHandler in case of fatal error
 --SKIPIF--
-<?php if (!extension_loaded("symfony_debug")) print "skip"; ?>
+<?php if (!extension_loaded('symfony_debug')) print 'skip'; ?>
 --FILE--
 <?php
Author	SHA1	Message	Date
Nicolas Grekas	c058661c32	Merge branch '2.8' into 3.1 * 2.8: [Debug] Remove GLOBALS from exception context to avoid endless recursion	2016-11-15 07:55:20 -05:00
Nicolas Grekas	62a68f6404	Merge branch '2.7' into 2.8 * 2.7: [Debug] Remove GLOBALS from exception context to avoid endless recursion	2016-11-15 07:53:17 -05:00
Nicolas Grekas	a9844f3cd2	bug #20519 [Debug] Remove GLOBALS from exception context to avoid endless recursion (Seldaek) 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 https://github.com/felixfbecker/php-language-server/pull/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	2016-11-15 07:52:31 -05:00
Jordi Boggiano	0a8d55717a	[Debug] Remove GLOBALS from exception context to avoid endless recursion	2016-11-15 13:37:17 +01:00
Nicolas Grekas	3a4386431f	Merge branch '2.8' into 3.1 * 2.8: CS fixes Remove trailing space CS: apply rules [Yaml] Clean some messages + add test case [Console] simplified code [Form] Fix UrlType transforms valid protocols [SecurityBundle] Changed encoder configuration example to bcrypt	2016-11-03 09:04:31 +01:00
Nicolas Grekas	d99867cf7b	Merge branch '2.7' into 2.8 * 2.7: CS fixes Remove trailing space CS: apply rules [Yaml] Clean some messages + add test case [Form] Fix UrlType transforms valid protocols [SecurityBundle] Changed encoder configuration example to bcrypt	2016-11-03 08:52:58 +01:00
Dariusz Ruminski	6945a0d019	CS: apply rules	2016-11-03 08:44:53 +01:00