Allow form element filter to convert a string to array

library/Zend/Form/Form.php

@@ -321,7 +321,7 @@ protected function prepareBindData(array $values, array $match)
                 continue;
             }
 
-            if (is_array($value)) {
+            if (is_array($value) && is_array($match[$name])) {
                 $data[$name] = $this->prepareBindData($value, $match[$name]);
             } else {
                 $data[$name] = $value;

tests/ZendTest/Form/FormTest.php

@@ -1292,4 +1292,25 @@ public function testCorrectlyHydrateBaseFieldsetWhenHydratorThatDoesNotIgnoreInv
         // Make sure the object was not hydrated at the "form level"
         $this->assertFalse(isset($object->submit));
     }
+
+    public function testPrepareBindDataAllowsFilterToConvertStringToArray()
+    {
+        $data = array(
+            'foo' => '1,2',
+        );
+
+        $filteredData = array(
+            'foo' => array(1, 2)
+        );
+
+        $element = new TestAsset\ElementWithStringToArrayFilter('foo');
+        $hydrator = $this->getMock('Zend\Stdlib\Hydrator\ArraySerializable');
+        $hydrator->expects($this->any())->method('hydrate')->with($filteredData, $this->anything());
+
+        $this->form->add($element);
+        $this->form->setHydrator($hydrator);
+        $this->form->setObject(new stdClass());
+        $this->form->setData($data);
+        $this->form->bindValues($data);
+    }
 }

tests/ZendTest/Form/TestAsset/ElementWithStringToArrayFilter.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace ZendTest\Form\TestAsset;
+
+use Zend\Form\Element;
+use Zend\InputFilter\InputProviderInterface;
+
+class ElementWithStringToArrayFilter extends Element implements InputProviderInterface
+{
+    public function getInputSpecification()
+    {
+        return array(
+            'name' => $this->getName(),
+            'required' => true,
+            'filters' => array(
+                array('name' => 'ZendTest\Form\TestAsset\StringToArrayFilter'),
+            ),
+        );
+    }
+}

tests/ZendTest/Form/TestAsset/StringToArrayFilter.php

@@ -0,0 +1,23 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace ZendTest\Form\TestAsset;
+
+use Zend\Filter\AbstractFilter;
+
+class StringToArrayFilter extends AbstractFilter
+{
+    public function filter($value)
+    {
+        if (!is_array($value)) {
+            return explode(',', $value);
+        }
+        return $value;
+    }
+}