Merge branch 'master' into hotfix/translator-caching

src/BaseInputFilter.php

@@ -78,6 +78,7 @@ public function add($input, $name = null)
      * Retrieve a named input
      *
      * @param  string $name
+     * @throws Exception\InvalidArgumentException
      * @return InputInterface|InputFilterInterface
      */
     public function get($name)
@@ -119,6 +120,7 @@ public function remove($name)
      * Set data to use when validating and filtering
      *
      * @param  array|Traversable $data
+     * @throws Exception\InvalidArgumentException
      * @return InputFilterInterface
      */
     public function setData($data)
@@ -141,6 +143,7 @@ public function setData($data)
     /**
      * Is the data set valid?
      *
+     * @throws Exception\RuntimeException
      * @return bool
      */
     public function isValid()
@@ -286,6 +289,7 @@ public function getValidInput()
      * Retrieve a value from a named input
      *
      * @param  string $name
+     * @throws Exception\InvalidArgumentException
      * @return mixed
      */
     public function getValue($name)
@@ -329,6 +333,7 @@ public function getValues()
      * Retrieve a raw (unfiltered) value from a named input
      *
      * @param  string $name
+     * @throws Exception\InvalidArgumentException
      * @return mixed
      */
     public function getRawValue($name)

src/Factory.php

@@ -93,6 +93,8 @@ public function clearDefaultValidatorChain()
      * Factory for input objects
      *
      * @param  array|Traversable $inputSpecification
+     * @throws Exception\InvalidArgumentException
+     * @throws Exception\RuntimeException
      * @return InputInterface|InputFilterInterface
      */
     public function createInput($inputSpecification)
@@ -197,6 +199,8 @@ public function createInput($inputSpecification)
      * Factory for input filters
      *
      * @param  array|Traversable $inputFilterSpecification
+     * @throws Exception\InvalidArgumentException
+     * @throws Exception\RuntimeException
      * @return InputFilterInterface
      */
     public function createInputFilter($inputFilterSpecification)
@@ -228,13 +232,19 @@ public function createInputFilter($inputFilterSpecification)
         if (!$inputFilter instanceof InputFilterInterface) {
             throw new Exception\RuntimeException(sprintf(
                 'InputFilter factory expects the "type" to be a class implementing %s; received "%s"',
-                'Zend\InputFilter\InputFilterInterface',
-                $class
-            ));
+                'Zend\InputFilter\InputFilterInterface', $class));
         }
 
         foreach ($inputFilterSpecification as $key => $value) {
-            $input = $this->createInput($value);
+
+            if (($value instanceof InputInterface)
+                || ($value instanceof InputFilterInterface)
+            ) {
+                $input = $value;
+            } else {
+                $input = $this->createInput($value);
+            }
+
             $inputFilter->add($input, $key);
         }
 

src/InputFilterInterface.php

@@ -11,6 +11,7 @@
 namespace Zend\InputFilter;
 
 use Countable;
+use Traversable;
 
 /**
  * @category   Zend
@@ -23,7 +24,7 @@ interface InputFilterInterface extends Countable
     /**
      * Add an input to the input filter
      *
-     * @param  InputInterface|InputFilterInterface $input
+     * @param  InputInterface|InputFilterInterface|array $input
      * @param  null|string $name Name used to retrieve this input
      * @return InputFilterInterface
      */

test/FactoryTest.php

@@ -240,6 +240,34 @@ public function testFactoryWillCreateInputWithSuggestedName()
         $this->assertEquals('foo', $input->getName());
     }
 
+    public function testFactoryAcceptsInputInterface()
+    {
+        $factory = new Factory();
+        $input = new Input();
+
+        $inputFilter = $factory->createInputFilter(array(
+            'foo' => $input
+        ));
+
+        $this->assertInstanceOf('Zend\InputFilter\InputFilterInterface', $inputFilter);
+        $this->assertTrue($inputFilter->has('foo'));
+        $this->assertTrue($inputFilter->get('foo') === $input);
+    }
+
+    public function testFactoryAcceptsInputFilterInterface()
+    {
+        $factory = new Factory();
+        $input = new InputFilter();
+
+        $inputFilter = $factory->createInputFilter(array(
+            'foo' => $input
+        ));
+
+        $this->assertInstanceOf('Zend\InputFilter\InputFilterInterface', $inputFilter);
+        $this->assertTrue($inputFilter->has('foo'));
+        $this->assertTrue($inputFilter->get('foo') === $input);
+    }
+
     public function testFactoryWillCreateInputFilterAndAllInputObjectsFromGivenConfiguration()
     {
         $factory     = new Factory();