Debug: catch Throwable

fprochazka · fprochazka · commit eeae733d03bb · 2016-05-12T19:00:36.000+02:00
diff --git a/src/Symfony/Component/Debug/ErrorHandler.php b/src/Symfony/Component/Debug/ErrorHandler.php
@@ -629,6 +629,8 @@ public static function handleFatalError(array $error = null)
             }
         } catch (\Exception $exception) {
             // Handled below
+        } catch (\Throwable $exception) {
+            // Handled below
         }
 
         if ($error && $error['type'] &= E_PARSE | E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR) {
diff --git a/src/Symfony/Component/Debug/ExceptionHandler.php b/src/Symfony/Component/Debug/ExceptionHandler.php
@@ -144,6 +144,11 @@ public function handle(\Exception $exception)
                 // All handlers failed. Let PHP handle that now.
                 throw $exception;
             }
+        } catch (\Throwable $e) {
+            if (!$caughtLength) {
+                // All handlers failed. Let PHP handle that now.
+                throw $exception;
+            }
         }
     }
 
@@ -285,10 +290,14 @@ public function getContent(FlattenException $exception)
 
                     $content .= "    </ol>\n</div>\n";
                 }
-            } catch (\Exception $e) {
+            } catch (\Exception $renderingException) {
+            } catch (\Throwable $renderingException) {
+            }
+
+            if (isset($renderingException)) {
                 // something nasty happened and we cannot throw an exception anymore
                 if ($this->debug) {
-                    $title = sprintf('Exception thrown when handling an exception (%s: %s)', get_class($e), $this->escapeHtml($e->getMessage()));
+                    $title = sprintf('Exception thrown when handling an exception (%s: %s)', get_class($renderingException), $this->escapeHtml($renderingException->getMessage()));
                 } else {
                     $title = 'Whoops, looks like something went wrong.';
                 }
diff --git a/src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php b/src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php
@@ -122,6 +122,11 @@ class ChildTestingStacking extends TestingStacking { function foo($bar) {} }
             restore_error_handler();
             restore_exception_handler();
 
+            throw $exception;
+        } catch (\Throwable $exception) {
+            restore_error_handler();
+            restore_exception_handler();
+
             throw $exception;
         }
     }
diff --git a/src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php b/src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
@@ -132,6 +132,11 @@ public function testConstruct()
             restore_error_handler();
             restore_exception_handler();
 
+            throw $e;
+        } catch (\Throwable $e) {
+            restore_error_handler();
+            restore_exception_handler();
+
             throw $e;
         }
     }
diff --git a/src/Symfony/Component/Debug/Tests/Fixtures/ToStringThrower.php b/src/Symfony/Component/Debug/Tests/Fixtures/ToStringThrower.php
@@ -16,9 +16,11 @@ public function __toString()
         try {
             throw $this->exception;
         } catch (\Exception $e) {
-            // Using user_error() here is on purpose so we do not forget
-            // that this alias also should work alongside with trigger_error().
-            return user_error($e, E_USER_ERROR);
+        } catch (\Throwable $e) {
         }
+
+        // Using user_error() here is on purpose so we do not forget
+        // that this alias also should work alongside with trigger_error().
+        return user_error($e, E_USER_ERROR);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -629,6 +629,8 @@ public static function handleFatalError(array $error = null)`
`629`	`629`	`}`
`630`	`630`	`} catch (\Exception $exception) {`
`631`	`631`	`// Handled below`
	`632`	`+ } catch (\Throwable $exception) {`
	`633`	`+ // Handled below`
`632`	`634`	`}`
`633`	`635`
`634`	`636`	`if ($error && $error['type'] &= E_PARSE \| E_ERROR \| E_CORE_ERROR \| E_COMPILE_ERROR) {`
Original file line number	Diff line number	Diff line change
`@@ -144,6 +144,11 @@ public function handle(\Exception $exception)`
`144`	`144`	`// All handlers failed. Let PHP handle that now.`
`145`	`145`	`throw $exception;`
`146`	`146`	`}`
	`147`	`+ } catch (\Throwable $e) {`
	`148`	`+ if (!$caughtLength) {`
	`149`	`+ // All handlers failed. Let PHP handle that now.`
	`150`	`+ throw $exception;`
	`151`	`+ }`
`147`	`152`	`}`
`148`	`153`	`}`
`149`	`154`
`@@ -285,10 +290,14 @@ public function getContent(FlattenException $exception)`
`285`	`290`
`286`	`291`	`$content .= " </ol>\n</div>\n";`
`287`	`292`	`}`
`288`		`- } catch (\Exception $e) {`
	`293`	`+ } catch (\Exception $renderingException) {`
	`294`	`+ } catch (\Throwable $renderingException) {`
	`295`	`+ }`
	`296`	`+`
	`297`	`+ if (isset($renderingException)) {`
`289`	`298`	`// something nasty happened and we cannot throw an exception anymore`
`290`	`299`	`if ($this->debug) {`
`291`		`- $title = sprintf('Exception thrown when handling an exception (%s: %s)', get_class($e), $this->escapeHtml($e->getMessage()));`
	`300`	`+ $title = sprintf('Exception thrown when handling an exception (%s: %s)', get_class($renderingException), $this->escapeHtml($renderingException->getMessage()));`
`292`	`301`	`} else {`
`293`	`302`	`$title = 'Whoops, looks like something went wrong.';`
`294`	`303`	`}`
Original file line number	Diff line number	Diff line change
`@@ -122,6 +122,11 @@ class ChildTestingStacking extends TestingStacking { function foo($bar) {} }`
`122`	`122`	`restore_error_handler();`
`123`	`123`	`restore_exception_handler();`
`124`	`124`
	`125`	`+ throw $exception;`
	`126`	`+ } catch (\Throwable $exception) {`
	`127`	`+ restore_error_handler();`
	`128`	`+ restore_exception_handler();`
	`129`	`+`
`125`	`130`	`throw $exception;`
`126`	`131`	`}`
`127`	`132`	`}`
Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,11 @@ public function testConstruct()`
`132`	`132`	`restore_error_handler();`
`133`	`133`	`restore_exception_handler();`
`134`	`134`
	`135`	`+ throw $e;`
	`136`	`+ } catch (\Throwable $e) {`
	`137`	`+ restore_error_handler();`
	`138`	`+ restore_exception_handler();`
	`139`	`+`
`135`	`140`	`throw $e;`
`136`	`141`	`}`
`137`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,11 @@ public function __toString()`
`16`	`16`	`try {`
`17`	`17`	`throw $this->exception;`
`18`	`18`	`} catch (\Exception $e) {`
`19`		`- // Using user_error() here is on purpose so we do not forget`
`20`		`- // that this alias also should work alongside with trigger_error().`
`21`		`- return user_error($e, E_USER_ERROR);`
	`19`	`+ } catch (\Throwable $e) {`
`22`	`20`	`}`
	`21`	`+`
	`22`	`+ // Using user_error() here is on purpose so we do not forget`
	`23`	`+ // that this alias also should work alongside with trigger_error().`
	`24`	`+ return user_error($e, E_USER_ERROR);`
`23`	`25`	`}`
`24`	`26`	`}`