Fixed FormAnnotationBuilderFactory::injectFactory() for zend-servicemanager v2

The patch introduced for 2.7.11 was incorrect in that it was passing the
`$container` argument, and not the `$formElementManager` argument, to
`$formElementManager->injectFactory()`. This patch updates it to use the
correct value, and fixes the related test expectation as well.

Author: weierophinney

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);