Merge branch 'hotfix/4117'

Close #4117
zendframework · Mar 28, 2013 · 9fbd314 · 9fbd314
2 parents 44ca4a4 + 349e3d1
commit 9fbd314
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/library/Zend/InputFilter/Factory.php b/library/Zend/InputFilter/Factory.php
@@ -153,6 +153,9 @@ public function createInput($inputSpecification)
                         $input->setRequired(!$value);
                     }
                     break;
+                case 'error_message':
+                    $input->setErrorMessage($value);
+                    break;
                 case 'fallback_value':
                     $input->setFallbackValue($value);
                     break;

diff --git a/tests/ZendTest/InputFilter/FactoryTest.php b/tests/ZendTest/InputFilter/FactoryTest.php
@@ -413,4 +413,14 @@ public function testFactoryAllowsPassingFilterChainsInInputSpec()
         $test = $input->getFilterChain();
         $this->assertSame($chain, $test);
     }
+
+    public function testFactoryWillCreateInputWithErrorMessage()
+    {
+        $factory = new Factory();
+        $input   = $factory->createInput(array(
+            'name'          => 'foo',
+            'error_message' => 'My custom error message',
+        ));
+        $this->assertEquals('My custom error message', $input->getErrorMessage());
+    }
 }