Merge branch 'hotfix/187'

Close #187
zendframework · Aug 29, 2016 · 651928a · 651928a
2 parents 0842115 + b62a6ed
commit 651928a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,10 @@ All notable changes to this project will be documented in this file, in reverse
 - [#184](https://github.com/zendframework/zend-mvc/pull/184) provides a
   performance optimization for `DELETE` requests to `AbstractRestfulController`
   instances.
+- [#187](https://github.com/zendframework/zend-mvc/pull/187) removes a typehint
+  for `Exception` from an argument in
+  `DispatchListener::marshalControllerNotFoundEvent()`, allowing it to be used
+  with PHP 7 `Throwable` instances.
 
 ## 3.0.2 - 2016-06-30
 

diff --git a/src/DispatchListener.php b/src/DispatchListener.php
@@ -176,15 +176,15 @@ protected function complete($return, MvcEvent $event)
      * @param  string $controllerName
      * @param  MvcEvent $event
      * @param  Application $application
-     * @param  \Exception $exception
+     * @param  \Throwable|\Exception $exception
      * @return mixed
      */
     protected function marshalControllerNotFoundEvent(
         $type,
         $controllerName,
         MvcEvent $event,
         Application $application,
-        \Exception $exception = null
+        $exception = null
     ) {
         $event->setName(MvcEvent::EVENT_DISPATCH_ERROR);
         $event->setError($type);