Merge branch 'hotfix/zendframework/zendframework#6472-always-clear-in…

…puts-before-populating-inputfilter' into develop Forward port zendframework/zendframework#6472
zendframework · Aug 6, 2014 · 2bffeca · 2bffeca
3 parents 7431896 + 04fac49 + 816c8d3
commit 2bffeca
Show file tree

Hide file tree

Showing 2 changed files with 70 additions and 4 deletions.
diff --git a/src/BaseInputFilter.php b/src/BaseInputFilter.php
@@ -588,14 +588,15 @@ protected function populate()
         foreach (array_keys($this->inputs) as $name) {
             $input = $this->inputs[$name];
 
+            if ($input instanceof CollectionInputFilter) {
+                $input->clearValues();
+                $input->clearRawValues();
+            }
+
             if (!isset($this->data[$name])) {
                 // No value; clear value in this input
                 if ($input instanceof InputFilterInterface) {
                     $input->setData(array());
-                    if ($input instanceof CollectionInputFilter) {
-                        $input->clearValues();
-                        $input->clearRawValues();
-                    }
                     continue;
                 }
 

diff --git a/test/CollectionInputFilterTest.php b/test/CollectionInputFilterTest.php
@@ -612,4 +612,69 @@ public function testNestedCollectionWithEmptyData()
         $values = $inputFilter->getValues();
         $this->assertEquals($data, $values);
     }
+
+    /**
+     * @group 6472
+     */
+    public function testNestedCollectionWhereChildDataIsNotOverwritten()
+    {
+        $items_inputfilter = new BaseInputFilter();
+        $items_inputfilter->add(new Input(), 'id')
+                          ->add(new Input(), 'type');
+        $items = new CollectionInputFilter();
+        $items->setInputFilter($items_inputfilter);
+
+        $groups_inputfilter = new BaseInputFilter();
+        $groups_inputfilter->add(new Input(), 'group_class')
+                           ->add($items, 'items');
+        $groups = new CollectionInputFilter();
+        $groups->setInputFilter($groups_inputfilter);
+
+        $inputFilter = new BaseInputFilter();
+        $inputFilter->add($groups, 'groups');
+
+        $data = array(
+            'groups' => array(
+                array(
+                    'group_class' => 'bar',
+                    'items' => array(
+                        array(
+                            'id' => 100,
+                            'type' => 'item-100',
+                        ),
+                        array(
+                            'id' => 101,
+                            'type' => 'item-101',
+                        ),
+                        array(
+                            'id' => 102,
+                            'type' => 'item-102',
+                        ),
+                        array(
+                            'id' => 103,
+                            'type' => 'item-103',
+                        ),
+                    ),
+                ),
+                array(
+                    'group_class' => 'foo',
+                    'items' => array(
+                        array(
+                            'id' => 200,
+                            'type' => 'item-200',
+                        ),
+                        array(
+                            'id' => 201,
+                            'type' => 'item-201',
+                        ),
+                    ),
+                ),
+            ),
+        );
+
+        $inputFilter->setData($data);
+        $inputFilter->isValid();
+        $values = $inputFilter->getValues();
+        $this->assertEquals($data, $values);
+    }
 }