Thanks to visit codestin.com
Credit goes to github.com

Skip to content
This repository was archived by the owner on Jan 8, 2020. It is now read-only.

Fix spelling of "marshall" #4912

Merged
weierophinney merged 1 commit into from
Aug 19, 2013
Merged

Fix spelling of "marshall" #4912

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions library/Zend/Mvc/DispatchListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down Expand Up @@ -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
Expand All @@ -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,
Expand All @@ -191,15 +191,15 @@ protected function marshallControllerNotFoundEvent(
}

/**
* Marshall a bad controller exception event
* Marshal a bad controller exception event
*
* @param string $controllerName
* @param MvcEvent $event
* @param Application $application
* @param \Exception $exception
* @return mixed
*/
protected function marshallBadControllerEvent(
protected function marshalBadControllerEvent(
$controllerName,
MvcEvent $event,
Application $application,
Expand Down