Updated Zend\Form\Factory, prepareAndInjectElements() continue on nul…

…l element specification
zendframework · Aug 16, 2013 · e32b4c7 · e32b4c7
1 parent 3138073
commit e32b4c7
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 0 deletions.
diff --git a/library/Zend/Form/Factory.php b/library/Zend/Form/Factory.php
@@ -335,6 +335,10 @@ protected function prepareAndInjectElements($elements, FieldsetInterface $fields
         $elements = $this->validateSpecification($elements, $method);
 
         foreach ($elements as $elementSpecification) {
+            if (null === $elementSpecification) {
+                continue;
+            }
+
             $flags = isset($elementSpecification['flags']) ? $elementSpecification['flags'] : array();
             $spec  = isset($elementSpecification['spec'])  ? $elementSpecification['spec']  : array();
 

diff --git a/tests/ZendTest/Form/FactoryTest.php b/tests/ZendTest/Form/FactoryTest.php
@@ -723,4 +723,31 @@ public function testCreatedFieldsetsHaveFactoryAndFormElementManagerInjected()
         $this->assertAttributeInstanceOf('Zend\Form\Factory', 'factory', $fieldset);
         $this->assertSame($fieldset->getFormFactory()->getFormElementManager(), $this->factory->getFormElementManager());
     }
+
+    public function testCanCreateFormWithNullElements()
+    {
+        $form = $this->factory->createForm(array(
+            'name' => 'foo',
+            'elements' => array(
+                'bar' => array(
+                    'spec' => array(
+                        'name' => 'bar',
+                    ),
+                ),
+                'baz' => null,
+                'bat' => array(
+                    'spec' => array(
+                        'name' => 'bat',
+                    ),
+                ),
+            ),
+        ));
+        $this->assertInstanceOf('Zend\Form\FormInterface', $form);
+
+        $elements = $form->getElements();
+        $this->assertEquals(2, count($elements));
+        $this->assertTrue($form->has('bar'));
+        $this->assertFalse($form->has('baz'));
+        $this->assertTrue($form->has('bat'));
+    }
 }