Fix spelling of "marshall" #4912

Merged
merged 1 commit into from Aug 19, 2013

2 participants

@dhrrgn

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

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

Opps, this should be against master, not develop.

@weierophinney
Zend Framework member

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.

@weierophinney weierophinney added a commit that referenced this pull request Aug 19, 2013
@weierophinney weierophinney [#4912] Re-add removed method
- and have it proxy to the renamed version, while raising an E_USER_DEPRECATED
  error.
99ce669
@weierophinney weierophinney added a commit that referenced this pull request Aug 19, 2013
@weierophinney weierophinney Merge branch 'hotfix/4912' into develop
Close #4912
cb05df3
@weierophinney weierophinney merged commit 024ddc5 into zendframework:develop Aug 19, 2013

1 check failed

Details default The Travis CI build failed
@basz basz added a commit that referenced this pull request Aug 27, 2013
@basz 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