Fix failing unit tests

- Addition of zendframework#3893 into develop broke test assumptions in zendframework#3879 Basically, an empty string indicates a value was passed; one input, while it was marked as not required, was not marked as allow empty, and thus a validator that checked for string length failed. Changing the input to allow empty made the tests pass again. - The question is: if a value is not marked as required, but has an empty string passed, should we pass it to the validator?
davidwindell · Mar 25, 2013 · e6801de · e6801de
1 parent fcae124
commit e6801de
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 51 deletions.
diff --git a/library/Zend/InputFilter/BaseInputFilter.php b/library/Zend/InputFilter/BaseInputFilter.php
@@ -170,6 +170,7 @@ protected function validateInputs(array $inputs)
 
         foreach ($inputs as $name) {
             $input = $this->inputs[$name];
+            // Check for missing data on non-required input
             if ((!array_key_exists($name, $this->data)
                     || (null === $this->data[$name]))
                 && $input instanceof InputInterface

diff --git a/library/Zend/InputFilter/CollectionInputFilter.php b/library/Zend/InputFilter/CollectionInputFilter.php
@@ -131,7 +131,7 @@ public function isValid()
             return $valid;
         }
 
-        $inputCollection = array_fill(0, $this->getCount() , $this->validationGroup ?: array_keys($this->inputs));
+        $inputCollection = array_fill(0, $this->getCount(), $this->validationGroup ?: array_keys($this->inputs));
 
         foreach ($inputCollection as $key => $inputs) {
             $this->data = array();

diff --git a/tests/ZendTest/InputFilter/BaseInputFilterTest.php b/tests/ZendTest/InputFilter/BaseInputFilterTest.php
@@ -123,62 +123,73 @@ public function getChildInputFilter()
         return $filter;
     }
 
-    public function testCanValidateEntireDataset()
+    public function dataSets()
     {
-        $filter = $this->getInputFilter();
-        $validData = array(
-            'foo' => ' bazbat ',
-            'bar' => '12345',
-            'baz' => null,
-            'qux' => '',
-            'nest' => array(
-                'foo' => ' bazbat ',
-                'bar' => '12345',
-                'baz' => null,
+        return array(
+            'valid-with-empty-and-null' => array(
+                array(
+                    'foo' => ' bazbat ',
+                    'bar' => '12345',
+                    'baz' => null,
+                    'qux' => '',
+                    'nest' => array(
+                        'foo' => ' bazbat ',
+                        'bar' => '12345',
+                        'baz' => null,
+                    ),
+                ),
+                true,
             ),
-        );
-        $filter->setData($validData);
-        $this->assertTrue($filter->isValid());
-
-        $filter = $this->getInputFilter();
-        $validData = array(
-            'foo' => ' bazbat ',
-            'bar' => '12345',
-            'qux' => '',
-            'nest' => array(
-                'foo' => ' bazbat ',
-                'bar' => '12345',
+            'valid-with-empty' => array(
+                array(
+                    'foo' => ' bazbat ',
+                    'bar' => '12345',
+                    'qux' => '',
+                    'nest' => array(
+                        'foo' => ' bazbat ',
+                        'bar' => '12345',
+                    ),
+                ),
+                true,
             ),
-        );
-        $filter->setData($validData);
-        $this->assertTrue($filter->isValid());
-
-        $invalidData = array(
-            'foo' => ' bazbat ',
-            'bar' => '12345',
-            'baz' => '',
-            'nest' => array(
-                'foo' => ' bazbat ',
-                'bar' => '12345',
-                'baz' => '',
+            'invalid-with-empty-and-missing' => array(
+                array(
+                    'foo' => ' bazbat ',
+                    'bar' => '12345',
+                    'baz' => '',
+                    'nest' => array(
+                        'foo' => ' bazbat ',
+                        'bar' => '12345',
+                        'baz' => '',
+                    ),
+                ),
+                false,
             ),
-        );
-        $filter->setData($invalidData);
-        $this->assertFalse($filter->isValid());
-
-        $invalidData = array(
-            'foo' => ' baz bat ',
-            'bar' => 'abc45',
-            'baz' => ' ',
-            'qux' => ' ',
-            'nest' => array(
-                'foo' => ' baz bat ',
-                'bar' => '123ab',
-                'baz' => ' ',
+            'invalid-with-empty' => array(
+                array(
+                    'foo' => ' baz bat ',
+                    'bar' => 'abc45',
+                    'baz' => ' ',
+                    'qux' => ' ',
+                    'nest' => array(
+                        'foo' => ' baz bat ',
+                        'bar' => '123ab',
+                        'baz' => ' ',
+                    ),
+                ),
+                false,
             ),
         );
-        $filter->setData($invalidData);
-        $this->assertFalse($filter->isValid());
+    }
+
+    /**
+     * @dataProvider dataSets
+     */
+    public function testCanValidateEntireDataset($dataset, $expected)
+    {
+        $filter = $this->getInputFilter();
+        $filter->setData($dataset);
+        $this->assertSame($expected, $filter->isValid());
     }
 
     public function testCanValidatePartialDataset()

diff --git a/tests/ZendTest/InputFilter/CollectionInputFilterTest.php b/tests/ZendTest/InputFilter/CollectionInputFilterTest.php
@@ -42,6 +42,7 @@ public function getBaseInputFilter()
 
         $baz = new Input();
         $baz->setRequired(false);
+        $baz->setAllowEmpty(true);
         $baz->getFilterChain()->attachByName('stringtrim');
         $baz->getValidatorChain()->attach(new Validator\StringLength(1, 6));
 
@@ -68,6 +69,7 @@ public function getChildInputFilter()
 
         $baz = new Input();
         $baz->setRequired(false);
+        $baz->setAllowEmpty(true);
         $baz->getFilterChain()->attachByName('stringtrim');
         $baz->getValidatorChain()->attach(new Validator\StringLength(1, 6));