Not set default required error message always

Skip if a previous one was set
zendframework · Sep 3, 2015 · 76ef192 · 76ef192
1 parent 26da9df
commit 76ef192
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/src/ArrayInput.php b/src/ArrayInput.php
@@ -70,7 +70,9 @@ public function isValid($context = null)
         }
 
         if (! $hasValue && $required) {
-            $this->setErrorMessage('Value is required');
+            if ($this->errorMessage === null) {
+                $this->setErrorMessage('Value is required');
+            }
             return false;
         }
 

diff --git a/src/FileInput.php b/src/FileInput.php
@@ -124,7 +124,9 @@ public function isValid($context = null)
         }
 
         if (! $hasValue && $required && ! $this->hasFallback()) {
-            $this->setErrorMessage('Value is required');
+            if ($this->errorMessage === null) {
+                $this->setErrorMessage('Value is required');
+            }
             return false;
         }
 

diff --git a/src/Input.php b/src/Input.php
@@ -403,7 +403,9 @@ public function isValid($context = null)
         }
 
         if (! $hasValue && $required) {
-            $this->setErrorMessage('Value is required');
+            if ($this->errorMessage === null) {
+                $this->setErrorMessage('Value is required');
+            }
             return false;
         }
 

diff --git a/test/InputTest.php b/test/InputTest.php
@@ -175,6 +175,19 @@ public function testRequiredWithoutFallbackAndValueNotSetThenFail()
         $this->assertEquals(['Value is required'], $input->getMessages(), 'getMessages() value not match');
     }
 
+    public function testRequiredWithoutFallbackAndValueNotSetThenFailWithCustomErrorMessage()
+    {
+        $input = $this->input;
+        $input->setRequired(true);
+        $input->setErrorMessage('fooErrorMessage');
+
+        $this->assertFalse(
+            $input->isValid(),
+            'isValid() should be return always false when no fallback value, is required, and not data is set.'
+        );
+        $this->assertEquals(['fooErrorMessage'], $input->getMessages(), 'getMessages() value not match');
+    }
+
     public function testNotRequiredWithoutFallbackAndValueNotSetThenIsValid()
     {
         $input = $this->input;