Merge branch 'hotfix/230'

Close #230

Author: weierophinney

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 2.14.1 - TBD
+## 2.14.1 - 2019-02-26
 
 ### Added
 
@@ -22,7 +22,9 @@ 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` within a `Collection` instance. It now properly
+  sets the data to an empty array in such circumstances.
 
 ## 2.14.0 - 2019-01-07
 

docs/book/quick-start.md

@@ -1007,6 +1007,9 @@ behaviors with the shipped annotations in zend-form:
   of validator options for the constructor:
   `@Validator({"name": "StringLength", "options": {"min":3, "max": 25}})`.
   This annotation may be specified multiple times.
+- `ContinueIfEmpty`: indicate whether the element can be submitted when it
+  is empty. A boolean value is expected. If `@Required` is set to `false`, this
+  needs to be set to `true` to allow the field to be empty.
 
 To use annotations, include them in your class and/or property docblocks.
 Annotation names will be resolved according to the import statements in your

src/Element/Collection.php

@@ -225,9 +225,10 @@ 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) {
@@ -237,7 +238,10 @@ public function populateValues($data)
 
             if ($elementOrFieldset instanceof FieldsetInterface) {
                 $elementOrFieldset->populateValues($value);
-            } else {
+                continue;
+            }
+
+            if ($elementOrFieldset !== null) {
                 $elementOrFieldset->setAttribute('value', $value);
             }
         }

test/Element/CollectionTest.php

@@ -1398,4 +1398,40 @@ public function testGetErrorMessagesForInvalidCollectionElements()
             $this->form->getMessages()
         );
     }
+
+    /**
+     * @see https://github.com/zendframework/zend-form/pull/230
+     */
+    public function testNullTargetElementShouldResultInEmptyData()
+    {
+        $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()
+        );
+    }
 }