Merge pull request #61

Author: Maks3w

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->errorMessage = $this->prepareRequiredValidationFailureMessage();
+            }
             return false;
         }
 

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->errorMessage = $this->prepareRequiredValidationFailureMessage();
+            }
             return false;
         }
 

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->errorMessage = $this->prepareRequiredValidationFailureMessage();
+            }
             return false;
         }
 
@@ -481,4 +483,18 @@ protected function injectNotEmptyValidator()
 
         $chain->prependValidator(new NotEmpty(), true);
     }
+
+    /**
+     * Create and return the validation failure message for required input.
+     *
+     * @return string[]
+     */
+    protected function prepareRequiredValidationFailureMessage()
+    {
+        $notEmpty = new NotEmpty();
+        $templates = $notEmpty->getOption('messageTemplates');
+        return [
+            NotEmpty::IS_EMPTY => $templates[NotEmpty::IS_EMPTY],
+        ];
+    }
 }

test/InputTest.php

@@ -17,6 +17,7 @@
 use Zend\InputFilter\Input;
 use Zend\InputFilter\InputInterface;
 use Zend\Validator;
+use Zend\Validator\NotEmpty;
 use Zend\Validator\ValidatorChain;
 
 /**
@@ -34,6 +35,21 @@ public function setUp()
         $this->input = new Input('foo');
     }
 
+    public function assertRequiredValidationErrorMessage($input, $message = '')
+    {
+        $message  = $message ?: 'Expected failure message for required input';
+        $message .= ';';
+
+        $messages = $input->getMessages();
+        $this->assertInternalType('array', $messages, $message . ' non-array messages array');
+
+        $notEmpty         = new NotEmpty();
+        $messageTemplates = $notEmpty->getOption('messageTemplates');
+        $this->assertSame([
+            NotEmpty::IS_EMPTY => $messageTemplates[NotEmpty::IS_EMPTY],
+        ], $messages, $message . ' missing NotEmpty::IS_EMPTY key and/or contains additional messages');
+    }
+
     public function testConstructorRequiresAName()
     {
         $this->assertEquals('foo', $this->input->getName());
@@ -172,7 +188,24 @@ public function testRequiredWithoutFallbackAndValueNotSetThenFail()
             $input->isValid(),
             'isValid() should be return always false when no fallback value, is required, and not data is set.'
         );
-        $this->assertEquals(['Value is required'], $input->getMessages(), 'getMessages() value not match');
+        $this->assertRequiredValidationErrorMessage($input);
+    }
+
+    /**
+     * @group 28
+     * @group 60
+     */
+    public function testRequiredWithoutFallbackAndValueNotSetProvidesNotEmptyValidatorIsEmptyErrorMessage()
+    {
+        $input = $this->input;
+        $input->setRequired(true);
+
+        $this->assertFalse(
+            $input->isValid(),
+            'isValid() should always return false when no fallback value is present, '
+            . 'the input is required, and no data is set.'
+        );
+        $this->assertRequiredValidationErrorMessage($input);
     }
 
     public function testNotRequiredWithoutFallbackAndValueNotSetThenIsValid()