Merge pull request #1473 from fprochazka/1.7-php7-throwable

handle throwable
FriendsOfSymfony · May 14, 2016 · d6dfe60 · d6dfe60
2 parents 51dd615 + ae061a6
commit d6dfe60
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/Controller/ExceptionController.php b/Controller/ExceptionController.php
@@ -122,7 +122,11 @@ public function showAction(Request $request, $exception, DebugLoggerInterface $l
             }
 
             $response = $viewHandler->handle($view);
-        } catch (\Exception $e) {
+        } catch (\Exception $handleException) {
+        } catch (\Throwable $handleException) {
+        }
+
+        if (isset($handleException)) {
             $message = 'An Exception was thrown while handling: ';
             $message .= $this->getExceptionMessage($exception);
             $response = $this->createPlainResponse($message, Codes::HTTP_INTERNAL_SERVER_ERROR, $exception->getHeaders());