Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Fix spelling of "marshall" #4912

Merged
merged 1 commit into from

2 participants

Dan Horrigan Matthew Weier O'Phinney
Dan Horrigan

"Marshall" is a proper noun. The verb you were going for is "marshal" (one "L").

Dan Horrigan dhrrgn Fix spelling of "marshall"
"Marshall" is a proper noun.  The verb you were going for is "marshal" (one "L").
024ddc5
Dan Horrigan

Opps, this should be against master, not develop.

Matthew Weier O'Phinney

You're correct. However, changing the method name is a BC break. I'll merge, but I'm going to do the following:

  • create a new method, "marshalControllerNotFoundEvent"
  • modify "marshallControllerNotFoundEvent" to proxy to the above

That way, if anybody was extending the class previously, their code will continue to work. I'll have it raise an E_USER_DEPRECATED warning, however.

As such, I'll also target this for 2.3.0, and merge only to the develop branch for now.

Matthew Weier O'Phinney weierophinney referenced this pull request from a commit
Matthew Weier O'Phinney weierophinney [#4912] Re-add removed method
- and have it proxy to the renamed version, while raising an E_USER_DEPRECATED
  error.
99ce669
Matthew Weier O'Phinney weierophinney merged commit 024ddc5 into from
Bas Kamer basz referenced this pull request from a commit
Bas Kamer basz Merge branch 'develop' of git://github.com/zendframework/zf2
# By Matthew Weier O'Phinney (7) and others
# Via Matthew Weier O'Phinney (63) and others
* 'develop' of git://github.com/zendframework/zf2: (40 commits)
  Fix tests for php <5.4
  Find traits with TokenArrayScanner
  Added test for issue #4989
  Fixed failing tests
  Renamed interface and extract HydrationInterface
  [#4979] CS fixes
  [#4969] CS fixes
  [#4931] CS fixes
  [#4912] Re-add removed method
  CS fixes
  Revert "Revert "Merge branch 'superdweebie-rand-bugfix'""
  Fix CS
  Correction for inverted version checks
  change of version checks to use PHP_VERSION_ID constant.
  Aligned method naming to zf style
  Fixed method names
  Zend\Navigation currently uses only one text domain for translating page labels. This commit adds the new option key "textdomain" to Navigation and its (translatable) view helpers. If the option is present, it is used during translation. If the key is not present, the old behavior is applied.
  Added unit test for should not convert to array recursively if model is traversable
  PartialLoop helper: prevent convert traversable model to array recursively
  Add test
  ...
35d0648
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jul 30, 2013
  1. Dan Horrigan

    Fix spelling of "marshall"

    dhrrgn authored
    "Marshall" is a proper noun.  The verb you were going for is "marshal" (one "L").
This page is out of date. Refresh to see the latest.
Showing with 7 additions and 7 deletions.
  1. +7 −7 library/Zend/Mvc/DispatchListener.php
14 library/Zend/Mvc/DispatchListener.php
View
@@ -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,
Something went wrong with that request. Please try again.