Merge branch 'hotfix/4117' into develop

Forward port zendframework/zendframework#4117 Conflicts: tests/ZendTest/InputFilter/FactoryTest.php
zendframework · Mar 28, 2013 · 06503d1 · 06503d1
commit 06503d1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/Factory.php b/src/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/test/FactoryTest.php b/test/FactoryTest.php
@@ -428,4 +428,14 @@ public function testFactoryAcceptsCollectionInputFilter()
         $this->assertInstanceOf('Zend\InputFilter\InputFilter', $inputFilter->getInputFilter());
         $this->assertEquals(3, $inputFilter->getCount());
     }
+
+    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());
+    }
 }