Merge branch 'hotfix/annotation-builder' into release-2.7

Close #235

Author: weierophinney

CHANGELOG.md

@@ -2,6 +2,27 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 2.7.12 - 2017-04-27
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#235](https://github.com/zendframework/zend-mvc/pull/235) fixes
+  `FormAnnotationBuilderFactory::injectFactory()` to pass the correct
+  arguments to the plugin manager's `injectFactory()` initializer when running
+  under zend-servicemanager v2.
+
 ## 2.7.11 - 2017-04-27
 
 ### Added

src/Service/FormAnnotationBuilderFactory.php

@@ -96,7 +96,7 @@ private function injectFactory(
         AnnotationBuilder $annotationBuilder
     ) {
         if ($formElementManager instanceof FormElementManagerV2Polyfill) {
-            $formElementManager->injectFactory($annotationBuilder, $container);
+            $formElementManager->injectFactory($annotationBuilder, $formElementManager);
             return;
         }
 

test/Service/FormAnnotationBuilderFactoryTest.php

@@ -62,7 +62,7 @@ public function testInjectFactoryInCorrectOrderV2()
             ->method('injectFactory')
             ->with($this->callback(function ($annotationBuilder) {
                 return $annotationBuilder instanceof AnnotationBuilder;
-            }), $serviceLocator);
+            }), $mockElementManager);
 
         $sut = new FormAnnotationBuilderFactory();
         $sut->createService($serviceLocator);