Merge branch 'feature/zendframework#5691-break_chain_on_failure-input…

…filter' Close zendframework#5691
Ocramius · Mar 4, 2014 · 6a56c29 · 6a56c29
2 parents ef6d51a + 6e3ad52
commit 6a56c29
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/library/Zend/InputFilter/Factory.php b/library/Zend/InputFilter/Factory.php
@@ -225,6 +225,9 @@ public function createInput($inputSpecification)
                 case 'fallback_value':
                     $input->setFallbackValue($value);
                     break;
+                case 'break_on_failure':
+                    $input->setBreakOnFailure($value);
+                    break;
                 case 'filters':
                     if ($value instanceof FilterChain) {
                         $input->setFilterChain($value);

diff --git a/tests/ZendTest/InputFilter/FactoryTest.php b/tests/ZendTest/InputFilter/FactoryTest.php
@@ -567,4 +567,18 @@ public function testSetInputFilterManagerWithoutServiceManager()
         $factory->setInputFilterManager($inputFilterManager);
         $this->assertSame($inputFilterManager, $factory->getInputFilterManager());
     }
+
+    /**
+     * @group 5691
+     *
+     * @covers \Zend\InputFilter\Factory::createInput
+     */
+    public function testSetsBreakChainOnFailure()
+    {
+        $factory = new Factory();
+
+        $this->assertTrue($factory->createInput(array('break_on_failure' => true))->breakOnFailure());
+
+        $this->assertFalse($factory->createInput(array('break_on_failure' => false))->breakOnFailure());
+    }
 }