Fix zendframework#69 - Use attached NotEmpty message when required va…

…lidation fails
larsnystrom · Oct 7, 2015 · 4fc84cd · 4fc84cd
1 parent af8837d
commit 4fc84cd
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/src/Input.php b/src/Input.php
@@ -491,7 +491,20 @@ protected function injectNotEmptyValidator()
      */
     protected function prepareRequiredValidationFailureMessage()
     {
-        $notEmpty = new NotEmpty();
+        $chain = $this->getValidatorChain();
+        $validators = $chain->getValidators();
+
+        foreach ($validators as $validator) {
+            if ($validator['instance'] instanceof NotEmpty) {
+                $notEmpty = $validator['instance'];
+                break;
+            }
+        }
+
+        if (!isset($notEmpty)) {
+            $notEmpty = new NotEmpty();
+        }
+
         $templates = $notEmpty->getOption('messageTemplates');
         return [
             NotEmpty::IS_EMPTY => $templates[NotEmpty::IS_EMPTY],