Merge branch '2.8' into 3.4

* 2.8: Pass on previous exception in FatalThrowableError [Routing] remove dead code [Routing] fix typo
Merge branch '2.7' into 2.8
2026-03-25 17:52:07 +01:00 · 2018-02-28 13:49:22 -08:00 · 2018-02-28 13:47:46 -08:00 · 2018-02-28 13:02:44 -08:00 · 2018-02-03 15:55:07 +01:00 · 2018-02-03 15:53:47 +01:00
5 changed files with 20 additions and 8 deletions
--- a/DebugClassLoader.php
+++ b/DebugClassLoader.php
@@ -141,7 +141,7 @@ class DebugClassLoader
            if ($this->isFinder && !isset($this->loaded[$class])) {
                $this->loaded[$class] = true;
                if ($file = $this->classLoader[0]->findFile($class) ?: false) {
-                    $wasCached = \function_exists('opcache_is_script_cached') && opcache_is_script_cached($file);
+                    $wasCached = \function_exists('opcache_is_script_cached') && @opcache_is_script_cached($file);

                    require $file;

--- a/ErrorHandler.php
+++ b/ErrorHandler.php
@@ -136,9 +136,20 @@ class ErrorHandler
        }
        if (!$replace && $prev) {
            restore_error_handler();
+            $handlerIsRegistered = is_array($prev) && $handler === $prev[0];
+        } else {
+            $handlerIsRegistered = true;
        }
-        if (is_array($prev = set_exception_handler(array($handler, 'handleException'))) && $prev[0] === $handler) {
+        if (is_array($prev = set_exception_handler(array($handler, 'handleException'))) && $prev[0] instanceof self) {
            restore_exception_handler();
+            if (!$handlerIsRegistered) {
+                $handler = $prev[0];
+            } elseif ($handler !== $prev[0] && $replace) {
+                set_exception_handler(array($handler, 'handleException'));
+                $p = $prev[0]->setExceptionHandler(null);
+                $handler->setExceptionHandler($p);
+                $prev[0]->setExceptionHandler($p);
+            }
        } else {
            $handler->setExceptionHandler($prev);
        }
--- a/Exception/FatalThrowableError.php
+++ b/Exception/FatalThrowableError.php
@@ -36,7 +36,8 @@ class FatalThrowableError extends FatalErrorException
            $e->getCode(),
            $severity,
            $e->getFile(),
-            $e->getLine()
+            $e->getLine(),
+            $e->getPrevious()
        );

        $this->setTrace($e->getTrace());
--- a/Tests/ErrorHandlerTest.php
+++ b/Tests/ErrorHandlerTest.php
@@ -35,7 +35,7 @@ class ErrorHandlerTest extends TestCase

            $newHandler = new ErrorHandler();

-            $this->assertSame($newHandler, ErrorHandler::register($newHandler, false));
+            $this->assertSame($handler, ErrorHandler::register($newHandler, false));
            $h = set_error_handler('var_dump');
            restore_error_handler();
            $this->assertSame(array($handler, 'handleError'), $h);
--- a/Tests/Exception/FlattenExceptionTest.php
+++ b/Tests/Exception/FlattenExceptionTest.php
@@ -111,7 +111,7 @@ class FlattenExceptionTest extends TestCase
    /**
     * @dataProvider flattenDataProvider
     */
-    public function testFlattenHttpException(\Exception $exception, $statusCode)
+    public function testFlattenHttpException(\Exception $exception)
    {
        $flattened = FlattenException::create($exception);
        $flattened2 = FlattenException::create($exception);
@@ -126,7 +126,7 @@ class FlattenExceptionTest extends TestCase
    /**
     * @dataProvider flattenDataProvider
     */
-    public function testPrevious(\Exception $exception, $statusCode)
+    public function testPrevious(\Exception $exception)
    {
        $flattened = FlattenException::create($exception);
        $flattened2 = FlattenException::create($exception);
@@ -173,7 +173,7 @@ class FlattenExceptionTest extends TestCase
    /**
     * @dataProvider flattenDataProvider
     */
-    public function testToArray(\Exception $exception, $statusCode)
+    public function testToArray(\Exception $exception)
    {
        $flattened = FlattenException::create($exception);
        $flattened->setTrace(array(), 'foo.php', 123);
@@ -193,7 +193,7 @@ class FlattenExceptionTest extends TestCase
    public function flattenDataProvider()
    {
        return array(
-            array(new \Exception('test', 123), 500),
+            array(new \Exception('test', 123)),
        );
    }
Author	SHA1	Message	Date
Fabien Potencier	9b1071f86e	Merge branch '2.8' into 3.4 * 2.8: Pass on previous exception in FatalThrowableError [Routing] remove dead code [Routing] fix typo	2018-02-28 13:49:22 -08:00
Fabien Potencier	f693ba8818	Merge branch '2.7' into 2.8 * 2.7: Pass on previous exception in FatalThrowableError [Routing] remove dead code [Routing] fix typo	2018-02-28 13:47:46 -08:00
Philipp Keck	6a76089f75	Pass on previous exception in FatalThrowableError	2018-02-28 13:02:44 -08:00
Nicolas Grekas	709ea1dc13	Merge branch '2.8' into 3.4 * 2.8: [CssSelector] For AND operator, the left operand should have parentheses, not only right operand Removed unused parameter from flattenDataProvider(). Update MongoDB extension on travis to make the builds green again.	2018-02-03 15:55:07 +01:00
Nicolas Grekas	338c06c0dc	Merge branch '2.7' into 2.8 * 2.7: [CssSelector] For AND operator, the left operand should have parentheses, not only right operand Removed unused parameter from flattenDataProvider(). Update MongoDB extension on travis to make the builds green again.	2018-02-03 15:53:47 +01:00
Robin Chalas	9cca71588a	Merge branch '2.8' into 3.4 * 2.8: [Intl] Fixed the broken link [Routing] Fix trailing slash redirection for non-safe verbs [Debug] Fix bad registration of exception handler, leading to mem leak [Form] Fixed empty data on expanded ChoiceType and FileType	2018-02-03 01:57:06 +01:00
Alexander M. Turek	7d96be3eaf	Removed unused parameter from flattenDataProvider().	2018-02-03 01:09:36 +01:00
Robin Chalas	0d52d1c98c	Merge branch '2.7' into 2.8 * 2.7: [Intl] Fixed the broken link [Routing] Fix trailing slash redirection for non-safe verbs [Debug] Fix bad registration of exception handler, leading to mem leak [Form] Fixed empty data on expanded ChoiceType and FileType	2018-02-03 00:51:31 +01:00
Kevin Frantz	4917f03992	Fixed issue #25985	2018-01-31 23:22:47 +01:00
Nicolas Grekas	a91a8fdd8c	[Debug] Fix bad registration of exception handler, leading to mem leak	2018-01-30 16:14:37 +01:00