Merge branch 'hotfix/15'

Close #15

Author: weierophinney

CHANGELOG.md

@@ -2,6 +2,26 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 2.5.4 - 2015-08-11
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#15](https://github.com/zendframework/zend-inputfilter/pull/15) ensures that
+  `ArrayAccess` data provided to an input filter using `setData()` can be
+  validated, a scenario that broke with [#7](https://github.com/zendframework/zend-inputfilter/pull/7).
+
 ## 2.5.3 - 2015-08-03
 
 ### Added
@@ -49,6 +69,26 @@ All notable changes to this project will be documented in this file, in reverse
   (previously, it would consider the data set valid, and auto-initialize the
   missing input to `null`).
 
+## 2.4.7 - 2015-08-11
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#15](https://github.com/zendframework/zend-inputfilter/pull/15) ensures that
+  `ArrayAccess` data provided to an input filter using `setData()` can be
+  validated, a scenario that broke with [#7](https://github.com/zendframework/zend-inputfilter/pull/7).
+
 ## 2.4.6 - 2015-08-03
 
 ### Added

src/BaseInputFilter.php

@@ -224,12 +224,12 @@ public function isValid($context = null)
     /**
      * Validate a set of inputs against the current data
      *
-     * @param  array      $inputs
-     * @param  array      $data
+     * @param  array $inputs
+     * @param  array|ArrayAccess $data
      * @param  mixed|null $context
      * @return bool
      */
-    protected function validateInputs(array $inputs, array $data = [], $context = null)
+    protected function validateInputs(array $inputs, $data = [], $context = null)
     {
         // backwards compatibility
         if (empty($data)) {

test/BaseInputFilterTest.php

@@ -9,6 +9,7 @@
 
 namespace ZendTest\InputFilter;
 
+use ArrayObject;
 use PHPUnit_Framework_TestCase as TestCase;
 use stdClass;
 use Zend\InputFilter\Input;
@@ -1096,4 +1097,21 @@ public function testEmptyRequiredValueWithFallbackShouldMarkInputValid()
         $this->assertArrayHasKey('bar', $data);
         $this->assertEquals($bar->getFallbackValue(), $data['bar']);
     }
+
+    /**
+     * @group 15
+     */
+    public function testAllowsValidatingArrayAccessData()
+    {
+        $filter = new InputFilter();
+        $foo = new Input();
+        $foo->getFilterChain()->attachByName('stringtrim')
+                              ->attachByName('alpha');
+        $foo->getValidatorChain()->attach(new Validator\StringLength(3, 6));
+        $filter->add($foo, 'foo');
+
+        $data = new ArrayObject(['foo' => ' valid ']);
+        $filter->setData($data);
+        $this->assertTrue($filter->isValid());
+    }
 }