diff --git a/library/Zend/Mvc/DispatchListener.php b/library/Zend/Mvc/DispatchListener.php index f0bd63a61de..0e441597ef2 100644 --- a/library/Zend/Mvc/DispatchListener.php +++ b/library/Zend/Mvc/DispatchListener.php @@ -89,17 +89,17 @@ public function onDispatch(MvcEvent $e) $controllerLoader = $application->getServiceManager()->get('ControllerLoader'); if (!$controllerLoader->has($controllerName)) { - $return = $this->marshallControllerNotFoundEvent($application::ERROR_CONTROLLER_NOT_FOUND, $controllerName, $e, $application); + $return = $this->marshalControllerNotFoundEvent($application::ERROR_CONTROLLER_NOT_FOUND, $controllerName, $e, $application); return $this->complete($return, $e); } try { $controller = $controllerLoader->get($controllerName); } catch (InvalidControllerException $exception) { - $return = $this->marshallControllerNotFoundEvent($application::ERROR_CONTROLLER_INVALID, $controllerName, $e, $application, $exception); + $return = $this->marshalControllerNotFoundEvent($application::ERROR_CONTROLLER_INVALID, $controllerName, $e, $application, $exception); return $this->complete($return, $e); } catch (\Exception $exception) { - $return = $this->marshallBadControllerEvent($controllerName, $e, $application, $exception); + $return = $this->marshalBadControllerEvent($controllerName, $e, $application, $exception); return $this->complete($return, $e); } @@ -158,7 +158,7 @@ protected function complete($return, MvcEvent $event) } /** - * Marshall a controller not found exception event + * Marshal a controller not found exception event * * @param string $type * @param string $controllerName @@ -167,7 +167,7 @@ protected function complete($return, MvcEvent $event) * @param \Exception $exception * @return mixed */ - protected function marshallControllerNotFoundEvent( + protected function marshalControllerNotFoundEvent( $type, $controllerName, MvcEvent $event, @@ -191,7 +191,7 @@ protected function marshallControllerNotFoundEvent( } /** - * Marshall a bad controller exception event + * Marshal a bad controller exception event * * @param string $controllerName * @param MvcEvent $event @@ -199,7 +199,7 @@ protected function marshallControllerNotFoundEvent( * @param \Exception $exception * @return mixed */ - protected function marshallBadControllerEvent( + protected function marshalBadControllerEvent( $controllerName, MvcEvent $event, Application $application,