Merge branch 'hotfix/4567'

Close #4567
zendframework · Jun 28, 2013 · eb6f0ef · eb6f0ef
2 parents 6be1059 + 5f21c56
commit eb6f0ef
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/library/Zend/InputFilter/BaseInputFilter.php b/library/Zend/InputFilter/BaseInputFilter.php
@@ -236,6 +236,7 @@ protected function validateInputs(array $inputs)
                 && '' === $this->data[$name]
                 && $input instanceof InputInterface
                 && !$input->isRequired()
+                && $input->allowEmpty()
             ) {
                 $this->validInputs[$name] = $input;
                 continue;

diff --git a/library/Zend/InputFilter/Factory.php b/library/Zend/InputFilter/Factory.php
@@ -197,8 +197,8 @@ public function createInput($inputSpecification)
                     break;
                 case 'required':
                     $input->setRequired($value);
-                    if (!isset($inputSpecification['allow_empty'])) {
-                        $input->setAllowEmpty(!$value);
+                    if (isset($inputSpecification['allow_empty'])) {
+                        $input->setAllowEmpty($inputSpecification['allow_empty']);
                     }
                     break;
                 case 'allow_empty':

diff --git a/library/Zend/InputFilter/Input.php b/library/Zend/InputFilter/Input.php
@@ -142,6 +142,7 @@ public function setName($name)
     public function setRequired($required)
     {
         $this->required = (bool) $required;
+        $this->setAllowEmpty(!$required);
         return $this;
     }
 

diff --git a/tests/ZendTest/InputFilter/BaseInputFilterTest.php b/tests/ZendTest/InputFilter/BaseInputFilterTest.php
@@ -564,6 +564,22 @@ public function testValidationMarksInputInvalidWhenRequiredAndAllowEmptyFlagIsFa
         $this->assertFalse($filter->isValid());
     }
 
+    public function testValidationMarksInputInvalidWhenNotRequiredAndAllowEmptyFlagIsFalse()
+    {
+        $filter = new InputFilter();
+
+        $foo   = new Input();
+        $foo->setRequired(false);
+        $foo->setAllowEmpty(false);
+
+        $filter->add($foo, 'foo');
+
+        $data = array('foo' => '');
+        $filter->setData($data);
+
+        $this->assertFalse($filter->isValid());
+    }
+
     public static function contextDataProvider()
     {
         return array(