Merge branch 'hotfix/zendframework/zendframework#6046-input-from-inpu…

…t-filter-manager' Close zendframework/zendframework#6046
zendframework · Apr 2, 2014 · ba3710b · ba3710b
3 parents ea38fcc + bbb9b80 + 88872e2
commit ba3710b
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/src/InputFilterPluginManager.php b/src/InputFilterPluginManager.php
@@ -16,6 +16,8 @@
 
 /**
  * Plugin manager implementation for input filters.
+ *
+ * @method InputFilterInterface|InputInterface get($name)
  */
 class InputFilterPluginManager extends AbstractPluginManager
 {
@@ -70,7 +72,7 @@ public function populateFactory($inputfilter)
      */
     public function validatePlugin($plugin)
     {
-        if ($plugin instanceof InputFilterInterface) {
+        if ($plugin instanceof InputFilterInterface || $plugin instanceof InputInterface) {
             // Hook to perform various initialization, when the inputfilter is not created through the factory
             if ($plugin instanceof InitializableInterface) {
                 $plugin->init();

diff --git a/test/InputFilterManagerTest.php b/test/InputFilterManagerTest.php
@@ -38,4 +38,24 @@ public function testLoadingInvalidElementRaisesException()
         $this->setExpectedException('Zend\InputFilter\Exception\RuntimeException');
         $this->manager->get('test');
     }
+
+    /**
+     * @covers Zend\InputFilter\InputFilterPluginManager::validatePlugin
+     */
+    public function testAllowLoadingInstancesOfInputFilterInterface()
+    {
+        $inputFilter = $this->getMock('Zend\InputFilter\InputFilterInterface');
+
+        $this->assertNull($this->manager->validatePlugin($inputFilter));
+    }
+
+    /**
+     * @covers Zend\InputFilter\InputFilterPluginManager::validatePlugin
+     */
+    public function testAllowLoadingInstancesOfInputInterface()
+    {
+        $input = $this->getMock('Zend\InputFilter\InputInterface');
+
+        $this->assertNull($this->manager->validatePlugin($input));
+    }
 }