From 48a04ade1dabd020dec1c8afa72da8077fd21fd5 Mon Sep 17 00:00:00 2001 From: KoKsPfLaNzE Date: Fri, 3 Jun 2016 20:31:58 +0200 Subject: [PATCH] `Zend\Mvc\DispatchListener::marshalBadControllerEvent` error with PHP-7 (`Throwable`) --- src/DispatchListener.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/DispatchListener.php b/src/DispatchListener.php index d091351f3..62ebe519c 100644 --- a/src/DispatchListener.php +++ b/src/DispatchListener.php @@ -235,14 +235,14 @@ protected function marshallControllerNotFoundEvent( * @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 + $exception // @TODO clean up once PHP 7 requirement is enforced ) { $event->setName(MvcEvent::EVENT_DISPATCH_ERROR); $event->setError($application::ERROR_EXCEPTION);