Merge branch 'hotfix/153' into release-2.7

Close #153
Fixes #146

Author: weierophinney

CHANGELOG.md

@@ -36,6 +36,9 @@ All notable changes to this project will be documented in this file, in reverse
 - [#149](https://github.com/zendframework/zend-mvc/pull/149) and
   [#158](https://github.com/zendframework/zend-mvc/pull/158) fix an "undefined
   variable" issue with `Zend\Mvc\Service\DiAbstractServiceFactoryFactory`.
+- [#153](https://github.com/zendframework/zend-mvc/pull/153) removes the
+  typehint from the `$exception` argument of `DispatchListener::marshalBadControllerEvent()`,
+  fixing an issue when PHP 7 Error types are caught and passed to the method.
 
 ## 2.7.8 - 2016-05-31
 

src/DispatchListener.php

@@ -232,18 +232,16 @@ protected function marshallControllerNotFoundEvent(
     /**
      * Marshal a bad controller exception event
      *
+     * @todo   Update $exception typehint to "Throwable" once PHP 7 requirement
+     *         is enforced
      * @param  string $controllerName
      * @param  MvcEvent $event
      * @param  Application $application
-     * @param  \Exception $exception
+     * @param  \Exception|\Throwable $exception
      * @return mixed
      */
-    protected function marshalBadControllerEvent(
-        $controllerName,
-        MvcEvent $event,
-        Application $application,
-        \Exception $exception
-    ) {
+    protected function marshalBadControllerEvent($controllerName, MvcEvent $event, Application $application, $exception)
+    {
         $event->setName(MvcEvent::EVENT_DISPATCH_ERROR);
         $event->setError($application::ERROR_EXCEPTION);
         $event->setController($controllerName);