Merge branch 'hotfix/295'

Close #295

Author: weierophinney

CHANGELOG.md

@@ -14,6 +14,9 @@ Initial stable release.
   Documentation can now be found at: https://zendframework.github.io/zend-expressive/
 - [#299](https://github.com/zendframework/zend-expressive/pull/299) adds
   component-specific CSS to the documentation.
+- [#295](https://github.com/zendframework/zend-expressive/pull/295) adds
+  support for handling PHP 7 engine exceptions in the templated and whoops final
+  handlers.
 
 ### Deprecated
 

src/TemplatedErrorHandler.php

@@ -160,12 +160,12 @@ protected function handleError($error, Request $request, Response $response)
      * Proxies to `handleError()`; exists primarily to as an extension point
      * for other handlers.
      *
-     * @param \Exception $exception
+     * @param \Throwable $exception
      * @param Request    $request
      * @param Response   $response
      * @return Response
      */
-    protected function handleException(\Exception $exception, Request $request, Response $response)
+    protected function handleException($exception, Request $request, Response $response)
     {
         return $this->handleError($exception, $request, $response);
     }
@@ -277,7 +277,7 @@ private function handleErrorResponse($error, Request $request, Response $respons
     {
         $response = $response->withStatus(Utils::getStatusCode($error, $response));
 
-        if (! $error instanceof \Exception) {
+        if (! $error instanceof \Exception && ! $error instanceof \Throwable) {
             return $this->handleError($error, $request, $response);
         }
 

src/WhoopsErrorHandler.php

@@ -69,12 +69,12 @@ public function __construct(
      * the generated payload, and then injects the response with the result
      * of whoops handling the exception.
      *
-     * @param \Exception $exception
+     * @param \Throwable $exception
      * @param Request $request
      * @param Response $response
      * @return Response
      */
-    protected function handleException(\Exception $exception, Request $request, Response $response)
+    protected function handleException($exception, Request $request, Response $response)
     {
         $this->prepareWhoopsHandler($request);