Merge branch 'hotfix/73' into develop

Forward port #73

Author: weierophinney

CHANGELOG.md

@@ -41,7 +41,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- [#67](https://github.com/zendframework/zend-inputfilter/pull/67) fixes
+- [#67](https://github.com/zendframework/zend-inputfilter/pull/67) and
+  [#73](https://github.com/zendframework/zend-inputfilter/pull/73) fix
   localization of the `NotEmpty` validation error message (created for any
   required input for which a value was not provided).
 

src/Input.php

@@ -491,7 +491,16 @@ protected function injectNotEmptyValidator()
      */
     protected function prepareRequiredValidationFailureMessage()
     {
-        $notEmpty   = $this->getValidatorChain()->plugin(NotEmpty::class);
+        $chain      = $this->getValidatorChain();
+        $notEmpty   = $chain->plugin(NotEmpty::class);
+
+        foreach ($chain->getValidators() as $validator) {
+            if ($validator['instance'] instanceof NotEmpty) {
+                $notEmpty = $validator['instance'];
+                break;
+            }
+        }
+
         $templates  = $notEmpty->getOption('messageTemplates');
         $message    = $templates[NotEmpty::IS_EMPTY];
         $translator = $notEmpty->getTranslator();

test/InputTest.php

@@ -227,6 +227,39 @@ public function testRequiredWithoutFallbackAndValueNotSetProvidesNotEmptyValidat
         $this->assertRequiredValidationErrorMessage($input);
     }
 
+    /**
+     * @group 28
+     * @group 69
+     */
+    public function testRequiredWithoutFallbackAndValueNotSetProvidesAttachedNotEmptyValidatorIsEmptyErrorMessage()
+    {
+        $input = new Input();
+        $input->setRequired(true);
+
+        $customMessage = [
+            NotEmptyValidator::IS_EMPTY => "Custom message",
+        ];
+
+        $notEmpty = $this->getMockBuilder(NotEmptyValidator::class)
+            ->setMethods(['getOption'])
+            ->getMock();
+
+        $notEmpty->expects($this->once())
+            ->method('getOption')
+            ->with('messageTemplates')
+            ->willReturn($customMessage);
+
+        $input->getValidatorChain()
+            ->attach($notEmpty);
+
+        $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->assertEquals($customMessage, $input->getMessages());
+    }
+
     /**
      * @group 28
      * @group 60