Allow handling any Throwable

src/View/ExceptionStrategy.php

@@ -182,7 +182,10 @@ public function prepareExceptionViewModel(MvcEvent $e)
                 if (is_callable($this->message)) {
                     $callback = $this->message;
                     $message = (string) $callback($exception, $this->displayExceptions);
-                } elseif ($this->displayExceptions && $exception instanceof \Exception) {
+                } elseif ($this->displayExceptions
+                    // @todo clean up once PHP 7 requirement is enforced
+                    && ($exception instanceof \Exception || $exception instanceof \Throwable)
+                ) {
                     $previous = '';
                     $previousException = $exception->getPrevious();
                     while ($previousException) {

src/View/RouteNotFoundStrategy.php

@@ -457,7 +457,8 @@ protected function reportNotFoundReason($e)
         ];
         $report = sprintf("\nReason for failure: %s\n", $reasons[$reason]);
 
-        while ($exception instanceof \Exception) {
+        // @todo clean up once PHP 7 requirement is enforced
+        while ($exception instanceof \Exception || $exception instanceof \Throwable) {
             $report .= sprintf(
                 "Exception: %s\nTrace:\n%s\n",
                 $exception->getMessage(),

test/View/ExceptionStrategyTest.php

@@ -179,15 +179,29 @@ public function testPrepareExceptionViewModelErrorsThatMustGetSameResult()
         }
     }
 
-    public function testPrepareExceptionViewModelErrorException()
+    public function throwables()
+    {
+        $throwables = ['exception' => [\Exception::class]];
+
+        if (version_compare(PHP_VERSION, '7.0.0', '>=')) {
+            $throwables['error'] = [\Error::class];
+        }
+
+        return $throwables;
+    }
+
+    /**
+     * @dataProvider throwables
+     */
+    public function testPrepareExceptionViewModelErrorException($throwable)
     {
         $errors = [Application::ERROR_EXCEPTION, 'user-defined-error'];
 
         foreach ($errors as $error) {
             $events = new EventManager();
             $this->strategy->attach($events);
 
-            $exception = new \Exception('message foo');
+            $exception = new $throwable('message foo');
             $event = new MvcEvent(MvcEvent::EVENT_DISPATCH_ERROR, null, ['exception' => $exception]);
 
             $event->setError($error);

test/View/RouteNotFoundStrategyTest.php

@@ -10,6 +10,7 @@
 use PHPUnit_Framework_TestCase as TestCase;
 use Prophecy\Argument;
 use ReflectionClass;
+use ReflectionMethod;
 use Zend\Console\Adapter\AdapterInterface;
 use Zend\Console\ColorInterface;
 use Zend\Console\Request;
@@ -233,4 +234,31 @@ public function testSetsResultToPopulatedViewModelWhenSuccessful($type, $reasonM
 
         $this->assertNull($this->strategy->handleRouteNotFoundError($event->reveal()));
     }
+
+    public function throwables()
+    {
+        $throwables = ['exception' => [\Exception::class]];
+
+        if (version_compare(PHP_VERSION, '7.0.0', '>=')) {
+            $throwables['error'] = [\Error::class];
+        }
+
+        return $throwables;
+    }
+
+    /**
+     * @dataProvider throwables
+     */
+    public function testWillTraceAnyThrowableWhenAllowedToReportNotFoundReason($throwable)
+    {
+        $event = new MvcEvent();
+        $event->setParam('exception', new $throwable('EXCEPTION THROWN'));
+
+        $r = new ReflectionMethod($this->strategy, 'reportNotFoundReason');
+        $r->setAccessible(true);
+
+        $report = $r->invoke($this->strategy, $event);
+        $this->assertContains('Reason for failure: Unknown', $report);
+        $this->assertContains('Exception: EXCEPTION THROWN', $report);
+    }
 }