Merge 0812223 into 4901fc6

zendframework · Jul 12, 2018 · 89de915 · 89de915
2 parents 4901fc6 + 0812223
commit 89de915
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/src/ArrayInput.php b/src/ArrayInput.php
@@ -83,6 +83,14 @@ public function isValid($context = null)
         $validator = $this->getValidatorChain();
         $values    = $this->getValue();
         $result    = true;
+
+        if ($required && empty($values)) {
+            if ($this->errorMessage === null) {
+                $this->errorMessage = $this->prepareRequiredValidationFailureMessage();
+            }
+            return false;
+        }
+
         foreach ($values as $value) {
             $empty = ($value === null || $value === '' || $value === []);
             if ($empty && ! $this->isRequired() && ! $this->continueIfEmpty()) {

diff --git a/test/ArrayInputTest.php b/test/ArrayInputTest.php
@@ -27,6 +27,18 @@ public function testDefaultGetValue()
         $this->assertCount(0, $this->input->getValue());
     }
 
+    public function testRequiredWithoutFallbackAndValueIsEmptyArrayThenFail()
+    {
+        $input = $this->input;
+        $input->setRequired(true);
+        $input->setValue([]);
+        $this->assertFalse(
+            $input->isValid(),
+            'isValid() should be return always false when no fallback value, is required, and value is empty array.'
+        );
+        $this->assertRequiredValidationErrorMessage($input);
+    }
+
     public function testSetValueWithInvalidInputTypeThrowsInvalidArgumentException()
     {
         $this->expectException(InvalidArgumentException::class);