Merge dad31e9 into a2c828e

CHANGELOG.md

@@ -22,7 +22,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#230](https://github.com/zendframework/zend-form/pull/230) fixes the "__clone method called on non-object" error that happens when the targetElement is null.
 
 ## 2.14.0 - 2019-01-07
 

src/Element/Collection.php

@@ -225,20 +225,23 @@ public function populateValues($data)
         }
 
         foreach ($data as $key => $value) {
+            $elementOrFieldset = null;
             if ($this->has($key)) {
                 $elementOrFieldset = $this->get($key);
-            } else {
+            } elseif ($this->targetElement) {
                 $elementOrFieldset = $this->addNewTargetElementInstance($key);
 
                 if ($key > $this->lastChildIndex) {
                     $this->lastChildIndex = $key;
                 }
             }
 
-            if ($elementOrFieldset instanceof FieldsetInterface) {
-                $elementOrFieldset->populateValues($value);
-            } else {
-                $elementOrFieldset->setAttribute('value', $value);
+            if ($elementOrFieldset !== null) {
+                if ($elementOrFieldset instanceof FieldsetInterface) {
+                    $elementOrFieldset->populateValues($value);
+                } else {
+                    $elementOrFieldset->setAttribute('value', $value);
+                }
             }
         }
 

test/Element/CollectionTest.php

@@ -1398,4 +1398,39 @@ public function testGetErrorMessagesForInvalidCollectionElements()
             $this->form->getMessages()
         );
     }
+
+    public function testTargetElementBeingNullNotCausingAnError()
+    {
+        $form = new Form();
+
+        $form->add(
+            [
+                'type' => \Zend\Form\Element\Collection::class,
+                'name' => 'fieldsets',
+                'options' => [
+                    'count' => 2
+                ]
+            ]
+        );
+
+        $collection = $form->get('fieldsets');
+        $data = [
+            'fieldsets' => [
+                'red',
+                'green',
+                'blue'
+            ]
+        ];
+
+        $form->setData($data);
+        $form->isValid();
+
+        // expect the fieldsets key to be an empty array since there's no valid targetElement
+        $this->assertEquals(
+            [
+                'fieldsets' => []
+            ],
+            $form->getData()
+        );
+    }
 }