Merge pull request #72 branch 'hotfix/72'

Author: Maks3w

CHANGELOG.md

@@ -18,7 +18,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#72](https://github.com/zendframework/zend-inputfilter/pull/72) `ArrayInput`
+  value is properly reset after `BaseInputFilter::setData()`
 
 ## 2.5.5 - 2015-09-03
 

src/BaseInputFilter.php

@@ -512,11 +512,6 @@ protected function populate()
                     continue;
                 }
 
-                if ($input instanceof ArrayInput) {
-                    $input->setValue([]);
-                    continue;
-                }
-
                 if ($input instanceof Input) {
                     $input->resetValue();
                     continue;

test/BaseInputFilterTest.php

@@ -15,7 +15,6 @@
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 use PHPUnit_Framework_TestCase as TestCase;
 use stdClass;
-use Zend\InputFilter\ArrayInput;
 use Zend\InputFilter\BaseInputFilter;
 use Zend\InputFilter\Exception\InvalidArgumentException;
 use Zend\InputFilter\Exception\RuntimeException;
@@ -556,23 +555,6 @@ public function testAddingExistingInputWillMergeIntoExisting()
         $this->assertFalse($filter->get('foo')->isRequired());
     }
 
-    /**
-     * @group 5638
-     */
-    public function testPopulateSupportsArrayInputEvenIfDataMissing()
-    {
-        /** @var ArrayInput|MockObject $arrayInput */
-        $arrayInput = $this->getMock(ArrayInput::class);
-        $arrayInput
-            ->expects($this->once())
-            ->method('setValue')
-            ->with([]);
-
-        $filter = $this->inputFilter;
-        $filter->add($arrayInput, 'arrayInput');
-        $filter->setData(['foo' => 'bar']);
-    }
-
     /**
      * @group 6431
      */