Merge branch 'hotfix/216' into develop

Forward port #216

Author: weierophinney

CHANGELOG.md

@@ -44,6 +44,10 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
+- [#216](https://github.com/zendframework/zend-form/pull/216) fixes an issue when performing data binding and a fieldset has no mapped
+  input elements, casting `null` values to empty arrays to ensure they can be
+  passed to an input filter.
+
 - [#207](https://github.com/zendframework/zend-form/pull/207) fixes the return value annotation for the `Fieldset::get()` method to
   indicate it can also return a `FieldsetInterface` instance.
 

src/Form.php

@@ -361,7 +361,9 @@ public function bindValues(array $values = [], array $validationGroup = null)
 
         // If there is a base fieldset, only hydrate beginning from the base fieldset
         if ($this->baseFieldset !== null) {
-            $data = $data[$this->baseFieldset->getName()];
+            $data = array_key_exists($this->baseFieldset->getName(), $data)
+                ? $data[$this->baseFieldset->getName()]
+                : [];
             $this->object = $this->baseFieldset->bindValues($data, $validationGroup[$this->baseFieldset->getName()]);
         } else {
             $this->object = parent::bindValues($data, $validationGroup);

test/FormTest.php

@@ -15,11 +15,11 @@
 use Zend\Form\Factory;
 use Zend\Form\Fieldset;
 use Zend\Form\Form;
+use Zend\Hydrator;
 use Zend\Hydrator\ObjectProperty as ObjectPropertyHydrator;
 use Zend\InputFilter\BaseInputFilter;
-use Zend\InputFilter\InputFilter;
 use Zend\InputFilter\Factory as InputFilterFactory;
-use Zend\Hydrator;
+use Zend\InputFilter\InputFilter;
 use ZendTest\Form\TestAsset\Entity;
 use ZendTest\Form\TestAsset\HydratorAwareModel;
 
@@ -818,6 +818,28 @@ public function testBindValuesWithWrappingPopulatesBoundObject()
         ], $model->foobar);
     }
 
+    public function testFormBaseFieldsetBindValuesWithoutInputs()
+    {
+        $baseFieldset = new Fieldset('base_fieldset');
+        $baseFieldset->setUseAsBaseFieldset(true);
+
+        $form = new Form();
+        $form->add($baseFieldset);
+        $form->setHydrator(new ObjectPropertyHydrator());
+
+        $model = new stdClass();
+        $form->bind($model);
+
+        $data = [
+            'submit' => 'save',
+        ];
+        $form->setData($data);
+
+        $form->isValid(); // Calls ->bindValues after validation (line: 817)
+
+        $this->assertObjectNotHasAttribute('submit', $model);
+    }
+
     public function testHasFactoryComposedByDefault()
     {
         $factory = $this->form->getFormFactory();