Merge pull request #2119 from weierophinney/hotfix/zf2-440

Hotfix/zf2 440
zendframework · Aug 6, 2012 · 2a926c8 · 2a926c8
2 parents 8840219 + 2039901
commit 2a926c8
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/library/Zend/InputFilter/BaseInputFilter.php b/library/Zend/InputFilter/BaseInputFilter.php
@@ -157,10 +157,12 @@ public function isValid()
         $valid               = true;
 
         $inputs = $this->validationGroup ?: array_keys($this->inputs);
-        //var_dump($inputs);
         foreach ($inputs as $name) {
             $input = $this->inputs[$name];
-            if (!array_key_exists($name, $this->data) || (is_string($this->data[$name]) && strlen($this->data[$name]) === 0)) {
+            if (!array_key_exists($name, $this->data)
+                || (null === $this->data[$name])
+                || (is_string($this->data[$name]) && strlen($this->data[$name]) === 0)
+            ) {
                 if($input instanceof InputInterface) {
                     // - test if input is required
                     if (!$input->isRequired()) {

diff --git a/tests/ZendTest/Form/FormTest.php b/tests/ZendTest/Form/FormTest.php
@@ -992,4 +992,20 @@ public function testExtractDataHydratorStrategy()
         $this->assertEquals('AAA', $entities[0]->getField2());
         $this->assertEquals('CCC', $entities[1]->getField2());
     }
+
+    public function testSetDataWithNullValues()
+    {
+        $this->populateForm();
+
+        $set = array(
+            'foo' => null,
+            'bar' => 'always valid',
+            'foobar' => array(
+                'foo' => 'abcde',
+                'bar' => 'always valid',
+            ),
+        );
+        $this->form->setData($set);
+        $this->assertTrue($this->form->isValid());
+    }
 }