Merge branch 'master' into feature/math-biginteger

zendframework · Jun 13, 2012 · 956acc6 · 956acc6
commit 956acc6
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/src/BaseInputFilter.php b/src/BaseInputFilter.php
@@ -152,7 +152,7 @@ public function isValid()
         foreach ($inputs as $name) {
             $input = $this->inputs[$name];
 
-            if (!isset($this->data[$name])) {
+            if (!array_key_exists($name, $this->data)) {
                 // Not sure how to handle input filters in this case
                 if ($input instanceof InputFilterInterface) {
                     if (!$input->isValid()) {

diff --git a/test/BaseInputFilterTest.php b/test/BaseInputFilterTest.php
@@ -458,4 +458,23 @@ public function testCanRetrieveUnvalidatedButFilteredInputValue()
         $test = $filter->getValue('foo');
         $this->assertSame('bazbat', $test);
     }
+
+    public function testGetRequiredNotEmptyValidationMessages()
+    {
+        $filter = new InputFilter();
+
+        $foo   = new Input();
+        $foo->setRequired(true);
+        $foo->setAllowEmpty(false);
+
+        $filter->add($foo, 'foo');
+
+        $data = array('foo' => null);
+        $filter->setData($data);
+
+        $this->assertFalse($filter->isValid());
+        $messages = $filter->getMessages();
+        $this->assertArrayHasKey('foo', $messages);
+        $this->assertNotEmpty($messages['foo']);
+    }
 }