Refactor changes to Form

zendframework · Apr 17, 2013 · 3123818 · 3123818
1 parent 7ee6bf3
commit 3123818
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 20 deletions.
diff --git a/library/Zend/Form/Element/Collection.php b/library/Zend/Form/Element/Collection.php
@@ -329,19 +329,6 @@ 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/library/Zend/Form/Form.php b/library/Zend/Form/Form.php
@@ -697,7 +697,13 @@ public function attachInputFilterDefaults(InputFilterInterface $inputFilter, Fie
             }
         }
 
-        foreach ($fieldset->getElements() as $element) {
+        if ($fieldset instanceof Collection && $fieldset->getTargetElement() instanceof FieldsetInterface) {
+            $elements = $fieldset->getTargetElement()->getElements();
+        } else {
+            $elements = $fieldset->getElements();
+        }
+
+        foreach ($elements as $element) {
             $name = $element->getName();
 
             if ($this->preferFormInputFilter && $inputFilter->has($name)) {

diff --git a/tests/ZendTest/Form/Element/CollectionTest.php b/tests/ZendTest/Form/Element/CollectionTest.php
@@ -413,10 +413,4 @@ protected function prepareForExtract($collection)
             'obj3' => $obj3,
         ));
     }
-
-    public function testGetElementsForFieldsetCollectionReturnsFieldsetElements()
-    {
-        $collection = $this->form->get('fieldsets');
-        $this->assertCount(1, $collection->getElements());
-    }
 }