Apply defaults to collection fieldsets too

zendframework · Apr 15, 2013 · 7ee6bf3 · 7ee6bf3
1 parent 2d0f6d0
commit 7ee6bf3
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/library/Zend/Form/Element/Collection.php b/library/Zend/Form/Element/Collection.php
@@ -329,6 +329,19 @@ public function getTargetElement()
         return $this->targetElement;
     }
 
+    /**
+     * {@inheritdoc}
+     *
+     * If the target element is a FieldsetInterface, return it's attached elements
+     */
+    public function getElements()
+    {
+        if ($this->getTargetElement() instanceof FieldsetInterface) {
+            return $this->getTargetElement()->getElements();
+        }
+        return parent::getElements();
+    }
+
     /**
      * Get allow add
      *

diff --git a/tests/ZendTest/Form/Element/CollectionTest.php b/tests/ZendTest/Form/Element/CollectionTest.php
@@ -413,4 +413,10 @@ protected function prepareForExtract($collection)
             'obj3' => $obj3,
         ));
     }
+
+    public function testGetElementsForFieldsetCollectionReturnsFieldsetElements()
+    {
+        $collection = $this->form->get('fieldsets');
+        $this->assertCount(1, $collection->getElements());
+    }
 }
diff --git a/tests/ZendTest/Form/FormTest.php b/tests/ZendTest/Form/FormTest.php
@@ -1145,7 +1145,7 @@ public function testDonNotApplyEmptyInputFiltersToSubFieldsetOfCollectionElement
         $this->form->setInputFilter($inputFilter);
 
         $this->assertInstanceOf('Zend\InputFilter\CollectionInputFilter', $this->form->getInputFilter()->get('items'));
-        $this->assertCount(0, $this->form->getInputFilter()->get('items')->getInputs());
+        $this->assertCount(1, $this->form->getInputFilter()->get('items')->getInputs());
     }
 
     public function testFormValidationCanHandleNonConsecutiveKeysOfCollectionInData()