Merge branch 'hotfix/3735'

Close #3735
zendframework · Feb 19, 2013 · f9f526b · f9f526b
2 parents 40d6ded + 0901c55
commit f9f526b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/library/Zend/Form/FormElementManager.php b/library/Zend/Form/FormElementManager.php
@@ -85,7 +85,7 @@ public function __construct(ConfigInterface $configuration = null)
     public function injectFactory($element)
     {
         if ($element instanceof FormFactoryAwareInterface) {
-            $element->setFormFactory(new Factory($this));
+            $element->getFormFactory()->setFormElementManager($this);
         }
     }
 

diff --git a/tests/ZendTest/Form/FormElementManagerTest.php b/tests/ZendTest/Form/FormElementManagerTest.php
@@ -11,6 +11,8 @@
 namespace ZendTest\Form;
 
 use Zend\ServiceManager\ServiceManager;
+use Zend\Form\Factory;
+use Zend\Form\Form;
 use Zend\Form\FormElementManager;
 
 /**
@@ -37,6 +39,22 @@ public function testInjectToFormFactoryAware()
         $this->assertSame($this->manager, $form->getFormFactory()->getFormElementManager());
     }
 
+    /**
+     * @group 3735
+     */
+    public function testInjectsFormElementManagerToFormComposedByFormFactoryAwareElement()
+    {
+        $factory = new Factory();
+        $this->manager->setFactory('my-form', function ($elements) use ($factory) {
+            $form = new Form();
+            $form->setFormFactory($factory);
+            return $form;
+        });
+        $form = $this->manager->get('my-Form');
+        $this->assertSame($factory, $form->getFormFactory());
+        $this->assertSame($this->manager, $form->getFormFactory()->getFormElementManager());
+    }
+
     public function testRegisteringInvalidElementRaisesException()
     {
         $this->setExpectedException('Zend\Form\Exception\InvalidElementException');