Merge branch 'hotfix/2'

weierophinney · weierophinney · commit 9e8f20f16b85 · 2015-06-23T16:23:10.000-05:00
Close #2
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,24 @@
+# Changelog
+
+All notable changes to this project will be documented in this file, in reverse chronological order by release.
+
+## 2.5.2 - TBD
+
+### Added
+
+- [#2](https://github.com/zendframework/zend-inputfilter/pull/2) adds support
+  in `Zend\InputFilter\Factory` for using the composed `InputFilterManager` to
+  retrieve an input of a given `type` based on configuration; only if the type
+  is not available in the factory will it attempt to directly instantiate it.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
diff --git a/src/Factory.php b/src/Factory.php
@@ -171,19 +171,20 @@ public function createInput($inputSpecification)
 
         if (isset($inputSpecification['type'])) {
             $class = $inputSpecification['type'];
+        }
 
-            if ($this->getInputFilterManager()->has($class)) {
-                return $this->createInputFilter($inputSpecification);
-            }
-
-            if (!class_exists($class)) {
-                throw new Exception\RuntimeException(sprintf(
-                    'Input factory expects the "type" to be a valid class; received "%s"',
-                    $class
-                ));
-            }
+        $managerInstance = null;
+        if ($this->getInputFilterManager()->has($class)) {
+            $managerInstance = $this->getInputFilterManager()->get($class);
         }
-        $input = new $class();
+        if (!$managerInstance && !class_exists($class)) {
+            throw new Exception\RuntimeException(sprintf(
+                'Input factory expects the "type" to be a valid class or a plugin name; received "%s"',
+                $class
+            ));
+        }
+
+        $input = $managerInstance ?: new $class();
 
         if ($input instanceof InputFilterInterface) {
             return $this->createInputFilter($inputSpecification);
diff --git a/test/FactoryTest.php b/test/FactoryTest.php
@@ -647,4 +647,39 @@ public function testCanCreateInputFilterFromProvider()
 
         $this->assertInstanceOf('Zend\InputFilter\InputFilterInterface', $inputFilter);
     }
+
+    public function testSuggestedTypeMayBePluginNameInInputFilterPluginManager()
+    {
+        $factory = new Factory();
+        $pluginManager = new InputFilterPluginManager();
+        $pluginManager->setService('bar', new Input('bar'));
+        $factory->setInputFilterManager($pluginManager);
+
+        $input = $factory->createInput(array(
+            'type' => 'bar'
+        ));
+        $this->assertSame('bar', $input->getName());
+
+        $this->setExpectedException('Zend\Filter\Exception\RuntimeException');
+        $factory->createInput(array(
+            'type' => 'foo'
+        ));
+    }
+
+    public function testInputFromPluginManagerMayBeFurtherConfiguredWithSpec()
+    {
+        $factory = new Factory();
+        $pluginManager = new InputFilterPluginManager();
+        $pluginManager->setService('bar', $barInput = new Input('bar'));
+        $this->assertTrue($barInput->isRequired());
+        $factory->setInputFilterManager($pluginManager);
+
+        $input = $factory->createInput(array(
+            'type' => 'bar',
+            'required' => false
+        ));
+
+        $this->assertFalse($input->isRequired());
+        $this->assertSame('bar', $input->getName());
+    }
 }
