Merge branch 'hotfix/161' into develop

Forward port #161

Author: weierophinney

CHANGELOG.md

@@ -36,7 +36,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#161](https://github.com/zendframework/zend-mvc/pull/161) fixes the
+  `DispatchListener::marshalBadControllerEvent()` method to allow either
+  `Throwable` or `Exception` types for the `$exception` argument.
 
 ## 3.0.1 - 2016-06-23
 

src/DispatchListener.php

@@ -209,14 +209,14 @@ protected function marshalControllerNotFoundEvent(
      * @param  string $controllerName
      * @param  MvcEvent $event
      * @param  Application $application
-     * @param  \Exception $exception
+     * @param  \Throwable|\Exception $exception
      * @return mixed
      */
     protected function marshalBadControllerEvent(
         $controllerName,
         MvcEvent $event,
         Application $application,
-        \Exception $exception
+        $exception
     ) {
         $event->setName(MvcEvent::EVENT_DISPATCH_ERROR);
         $event->setError($application::ERROR_EXCEPTION);