Merge branch 'hotfix/163' into develop

Forward port #163

CHANGELOG.md

@@ -44,6 +44,12 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
+- [#163](https://github.com/zendframework/zend-inputfilter/pull/163) adds code to `BaseInputFilter::populate()` to detect non-iterable,
+  non-null values passed as a value for a composed input filter. Previously, these would trigger
+  an exception; they now instead result in an empty array being used to populate the
+  input filter, which will generally result in invalidation without causing an
+  exception.
+
 - [#162](https://github.com/zendframework/zend-inputfilter/pull/162) fixes incorrect abstract service factory registration in `ConfigProvider`as per
   the [latest documentation](https://docs.zendframework.com/zend-inputfilter/specs/#setup).  In particular, it ensures that the `InputFilterAbstractFactory`
   is registered under the `input_filters` configuration instead of the

src/BaseInputFilter.php

@@ -523,6 +523,11 @@ protected function populate()
             $value = $this->data[$name];
 
             if ($input instanceof InputFilterInterface) {
+                // Fixes #159
+                if (! is_array($value) && ! $value instanceof Traversable) {
+                    $value = [];
+                }
+
                 $input->setData($value);
                 continue;
             }

test/BaseInputFilterTest.php

@@ -585,6 +585,24 @@ public function testMerge()
         );
     }
 
+    public function testNestedInputFilterShouldAllowNonArrayValueForData()
+    {
+        $filter1 = new BaseInputFilter();
+        $nestedFilter = new BaseInputFilter();
+        $nestedFilter->add(new Input('nestedField1'));
+        $filter1->add($nestedFilter, 'nested');
+
+        // non scalar and non null value
+        $filter1->setData(['nested' => false]);
+        self::assertNull($filter1->getValues()['nested']['nestedField1']);
+
+        $filter1->setData(['nested' => 123]);
+        self::assertNull($filter1->getValues()['nested']['nestedField1']);
+
+        $filter1->setData(['nested' => new stdClass()]);
+        self::assertNull($filter1->getValues()['nested']['nestedField1']);
+    }
+
     public function addMethodArgumentsProvider()
     {
         $inputTypes = $this->inputProvider();

test/InputFilterTest.php

@@ -11,6 +11,7 @@
 
 use ArrayIterator;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use stdClass;
 use Zend\InputFilter\Factory;
 use Zend\InputFilter\Input;
 use Zend\InputFilter\InputFilter;