Revert to previous isRequired behavior for file uploads (fix BC break)

muhd7rosli · Apr 3, 2013 · 54ea3ba · 54ea3ba
1 parent ac9c3f9
commit 54ea3ba
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/library/Zend/InputFilter/BaseInputFilter.php b/library/Zend/InputFilter/BaseInputFilter.php
@@ -159,14 +159,6 @@ public function isValid()
         $inputs = $this->validationGroup ?: array_keys($this->inputs);
         foreach ($inputs as $name) {
             $input = $this->inputs[$name];
-            if ((!array_key_exists($name, $this->data)
-                    || (null === $this->data[$name]))
-                && $input instanceof InputInterface
-                && !$input->isRequired()
-            ) {
-                $this->validInputs[$name] = $input;
-                continue;
-            }
             if (!array_key_exists($name, $this->data)
                 || (null === $this->data[$name])
                 || (is_string($this->data[$name]) && strlen($this->data[$name]) === 0)
@@ -178,6 +170,14 @@ public function isValid()
                     && isset($this->data[$name][0]['error']) && $this->data[$name][0]['error'] === UPLOAD_ERR_NO_FILE)
             ) {
                 if ($input instanceof InputInterface) {
+                    // - test if input is required
+                    if (!$input->isRequired()
+                        // Do not mark valid for isRequired setting if value exists and is empty string
+                        && !(array_key_exists($name, $this->data) && is_string($this->data[$name]) && strlen($this->data[$name]) === 0)
+                    ) {
+                        $this->validInputs[$name] = $input;
+                        continue;
+                    }
                     // - test if input allows empty
                     if ($input->allowEmpty()) {
                         $this->validInputs[$name] = $input;

diff --git a/tests/ZendTest/InputFilter/BaseInputFilterTest.php b/tests/ZendTest/InputFilter/BaseInputFilterTest.php
@@ -450,13 +450,13 @@ public function testValidationSkipsFieldsMarkedNotRequiredWhenNoDataPresent()
         $this->assertTrue($filter->isValid());
     }
 
-    public function testValidationSkipsFileInputsMarkedAllowEmptyWhenNoFileDataIsPresent()
+    public function testValidationSkipsFileInputsMarkedNotRequiredWhenNoFileDataIsPresent()
     {
         $filter = new InputFilter();
 
         $foo   = new FileInput();
         $foo->getValidatorChain()->attach(new Validator\File\UploadFile());
-        $foo->setAllowEmpty(true);
+        $foo->setRequired(false);
 
         $filter->add($foo, 'foo');
 
@@ -473,16 +473,16 @@ public function testValidationSkipsFileInputsMarkedAllowEmptyWhenNoFileDataIsPre
         $this->assertTrue($filter->isValid());
 
         // Negative test
-        $foo->setAllowEmpty(false);
+        $foo->setRequired(true);
         $filter->setData($data);
         $this->assertFalse($filter->isValid());
     }
 
-    public function testValidationSkipsFileInputsMarkedAllowEmptyWhenNoMultiFileDataIsPresent()
+    public function testValidationSkipsFileInputsMarkedNotRequiredWhenNoMultiFileDataIsPresent()
     {
         $filter = new InputFilter();
         $foo    = new FileInput();
-        $foo->setAllowEmpty(true);
+        $foo->setRequired(false);
         $filter->add($foo, 'foo');
 
         $data = array(
@@ -498,7 +498,7 @@ public function testValidationSkipsFileInputsMarkedAllowEmptyWhenNoMultiFileData
         $this->assertTrue($filter->isValid());
 
         // Negative test
-        $foo->setAllowEmpty(false);
+        $foo->setRequired(true);
         $filter->setData($data);
         $this->assertFalse($filter->isValid());
     }