Merge ce463ae into a2c828e

zendframework · Feb 21, 2019 · 475e5a9 · 475e5a9
2 parents a2c828e + ce463ae
commit 475e5a9
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 6 deletions.
diff --git a/CHANGELOG.md b/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
 

diff --git a/src/Element/Collection.php b/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) {
+                if ($elementOrFieldset instanceof FieldsetInterface) {
+                    $elementOrFieldset->populateValues($value);
+                } else {
+                    $elementOrFieldset->setAttribute('value', $value);
+                }
             }
         }
 

diff --git a/test/Element/CollectionTest.php b/test/Element/CollectionTest.php
@@ -1398,4 +1398,25 @@ public function testGetErrorMessagesForInvalidCollectionElements()
             $this->form->getMessages()
         );
     }
+
+    public function testTargetElementBeingNullNotCausingAnError()
+    {
+        $form = new Form();
+
+        $form->add([
+            'type' => 'Zend\Form\Element\Collection',
+            'name' => 'fieldsets',
+            'options' => [
+                'count' => 2
+            ]
+        ]);
+
+        $collection = $form->get('fieldsets');
+        $data = [];
+        $data['fieldsets'] = ['red', 'green', 'blue'];
+
+        $form->populateValues($data);
+
+        $this->addToAssertionCount(1); // expect no exception being thrown
+    }
 }