Merge branch 'hotfix/4382' into develop

Forward port zendframework/zendframework#4382
zendframework · May 2, 2013 · 75a28c0 · 75a28c0
commit 75a28c0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/Factory.php b/src/Factory.php
@@ -275,7 +275,7 @@ public function createInputFilter($inputFilterSpecification)
 
         $type = 'Zend\InputFilter\InputFilter';
 
-        if (isset($inputFilterSpecification['type'])) {
+        if (isset($inputFilterSpecification['type']) && is_string($inputFilterSpecification['type'])) {
             $type = $inputFilterSpecification['type'];
             unset($inputFilterSpecification['type']);
         }

diff --git a/test/FactoryTest.php b/test/FactoryTest.php
@@ -499,4 +499,20 @@ public function testFactoryWillNotGetPrioritySetting()
             $index++;
         }
     }
+
+    public function testConflictNameWithInputFilterType()
+    {
+        $factory = new Factory();
+
+        $inputFilter = $factory->createInputFilter(
+            array(
+                'type' => array(
+                    'required' => true
+                )
+            )
+        );
+
+        $this->assertInstanceOf('Zend\InputFilter\InputFilter', $inputFilter);
+        $this->assertTrue($inputFilter->has('type'));
+    }
 }