Merge branch 'master' of git://github.com/zendframework/zf2

src/Factory.php

@@ -157,19 +157,27 @@ public function createInput($inputSpecification)
                     }
                     break;
                 case 'filters':
+                    if ($value instanceof FilterChain) {
+                        $input->setFilterChain($value);
+                        break;
+                    }
                     if (!is_array($value) && !$value instanceof Traversable) {
                         throw new Exception\RuntimeException(sprintf(
-                            '%s expects the value associated with "filters" to be an array/Traversable of filters or filter specifications; received "%s"',
+                            '%s expects the value associated with "filters" to be an array/Traversable of filters or filter specifications, or a FilterChain; received "%s"',
                             __METHOD__,
                             (is_object($value) ? get_class($value) : gettype($value))
                         ));
                     }
                     $this->populateFilters($input->getFilterChain(), $value);
                     break;
                 case 'validators':
+                    if ($value instanceof ValidatorChain) {
+                        $input->setValidatorChain($value);
+                        break;
+                    }
                     if (!is_array($value) && !$value instanceof Traversable) {
                         throw new Exception\RuntimeException(sprintf(
-                            '%s expects the value associated with "validators" to be an array/Traversable of validators or validator specifications; received "%s"',
+                            '%s expects the value associated with "validators" to be an array/Traversable of validators or validator specifications, or a ValidatorChain; received "%s"',
                             __METHOD__,
                             (is_object($value) ? get_class($value) : gettype($value))
                         ));

test/FactoryTest.php

@@ -359,4 +359,30 @@ public function testFactoryWillCreateInputFilterMatchingInputNameWhenNotSpecifie
         $this->assertTrue($inputFilter->has('foo'));
         $this->assertInstanceOf('Zend\InputFilter\Input', $inputFilter->get('foo'));
     }
+
+    public function testFactoryAllowsPassingValidatorChainsInInputSpec()
+    {
+        $factory = new Factory();
+        $chain   = new Validator\ValidatorChain();
+        $input   = $factory->createInput(array(
+            'name'       => 'foo',
+            'validators' => $chain,
+        ));
+        $this->assertInstanceOf('Zend\InputFilter\InputInterface', $input);
+        $test = $input->getValidatorChain();
+        $this->assertSame($chain, $test);
+    }
+
+    public function testFactoryAllowsPassingFilterChainsInInputSpec()
+    {
+        $factory = new Factory();
+        $chain   = new Filter\FilterChain();
+        $input   = $factory->createInput(array(
+            'name'    => 'foo',
+            'filters' => $chain,
+        ));
+        $this->assertInstanceOf('Zend\InputFilter\InputInterface', $input);
+        $test = $input->getFilterChain();
+        $this->assertSame($chain, $test);
+    }
 }