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

Pass second argument to injectFactory() #74

Merged
merged 1 commit into from
Feb 23, 2016

Conversation

weierophinney
Copy link
Member

Zend\Form\FormElementManager::injectFactory() is intended as an initializer, and, as such, should expect two arguments. zend-form in v2.7 corrects this, making both arguments required, which exposed the fact that the zend-mvc FormAnnotationBuilderFactory was calling it incorrectly (discovered when running tests against zend-form 2.7).

This patch updates the call from within FormAnnotationBuilderFactory to also pass the $serviceLocator instance to the method.

Fixes #72.

- `injectFactory()` is intended as an initializer, and, as such, should
  expect two arguments. zend-form in v2.7 corrects this, making both
  arguments required, which exposed the fact that the zend-mvc
  `FormAnnotationBuilderFactory` was calling it incorrectly.
@weierophinney weierophinney added this to the 2.6.3 milestone Feb 23, 2016
@weierophinney weierophinney self-assigned this Feb 23, 2016
weierophinney added a commit that referenced this pull request Feb 23, 2016
weierophinney added a commit that referenced this pull request Feb 23, 2016
@weierophinney weierophinney merged commit dd8524c into zendframework:master Feb 23, 2016
weierophinney added a commit that referenced this pull request Feb 23, 2016
@weierophinney weierophinney deleted the hotfix/72 branch February 23, 2016 15:26
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant