Provides validation error messages for Between validator type mismatch

Adds two new validation error messages, one for when a numeric value is
validated against non-numeric min/max values, and one for when a string
value is validated against numeric min/max values.

Author: weierophinney

src/Between.php

@@ -16,6 +16,8 @@ class Between extends AbstractValidator
 {
     const NOT_BETWEEN        = 'notBetween';
     const NOT_BETWEEN_STRICT = 'notBetweenStrict';
+    const VALUE_NOT_NUMERIC  = 'valueNotNumeric';
+    const VALUE_NOT_STRING   = 'valueNotString';
 
     /**
      * Retain if min and max are numeric values. Allow to not compare string and numeric types
@@ -31,7 +33,10 @@ class Between extends AbstractValidator
      */
     protected $messageTemplates = [
         self::NOT_BETWEEN        => "The input is not between '%min%' and '%max%', inclusively",
-        self::NOT_BETWEEN_STRICT => "The input is not strictly between '%min%' and '%max%'"
+        self::NOT_BETWEEN_STRICT => "The input is not strictly between '%min%' and '%max%'",
+        self::VALUE_NOT_NUMERIC  => "The min ('%min%') and max ('%max%') values are numeric, but the input is not",
+        self::VALUE_NOT_STRING   => "The min ('%min%') and max ('%max%') values are non-numeric strings, "
+        .    "but the input is not a string",
     ];
 
     /**
@@ -88,7 +93,7 @@ public function __construct($options = null)
         if (count($options) !== 2
             && (! array_key_exists('min', $options) || ! array_key_exists('max', $options))
         ) {
-            throw new Exception\InvalidArgumentException("Missing option : 'min' and 'max' have to be given");
+            throw new Exception\InvalidArgumentException("Missing option: 'min' and 'max' have to be given");
         }
 
         if (is_numeric($options['min']) && is_numeric($options['max'])) {
@@ -97,7 +102,7 @@ public function __construct($options = null)
             $this->numeric = false;
         } else {
             throw new Exception\InvalidArgumentException(
-                "Invalid options : 'min' and 'max' should be of the same scalar type"
+                "Invalid options: 'min' and 'max' should be of the same scalar type"
             );
         }
 
@@ -179,15 +184,17 @@ public function setInclusive($inclusive)
      */
     public function isValid($value)
     {
+        $this->setValue($value);
+
         if ($this->numeric && ! is_numeric($value)) {
+            $this->error(self::VALUE_NOT_NUMERIC);
             return false;
         }
         if (! $this->numeric && ! is_string($value)) {
+            $this->error(self::VALUE_NOT_STRING);
             return false;
         }
 
-        $this->setValue($value);
-
         if ($this->getInclusive()) {
             if ($this->getMin() > $value || $value > $this->getMax()) {
                 $this->error(self::NOT_BETWEEN);

test/BetweenTest.php

@@ -257,7 +257,7 @@ public function testEqualsMessageVariables()
     public function testMissingMinOrMax(array $args)
     {
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage("Missing option : 'min' and 'max' have to be given");
+        $this->expectExceptionMessage("Missing option: 'min' and 'max' have to be given");
 
         new Between($args);
     }
@@ -280,12 +280,34 @@ public function testConstructorCanAcceptInclusiveParameter()
         $this->assertFalse($validator->getInclusive());
     }
 
-    public function testConstructWithTravesableOptions()
+    public function testConstructWithTraversableOptions()
     {
         $options = new \ArrayObject(['min' => 1, 'max' => 10, 'inclusive' => false]);
         $validator = new Between($options);
 
         $this->assertTrue($validator->isValid(5));
         $this->assertFalse($validator->isValid(10));
     }
+
+    public function testStringValidatedAgainstNumericMinAndMaxIsInvalidAndReturnsAFailureMessage()
+    {
+        $validator = new Between(['min' => 1, 'max' => 10]);
+        $this->assertFalse($validator->isValid('a'));
+        $messages = $validator->getMessages();
+        $this->assertContains(
+            'The min (\'1\') and max (\'10\') values are numeric, but the input is not',
+            $messages
+        );
+    }
+
+    public function testNumericValidatedAgainstStringMinAndMaxIsInvalidAndReturnsAFailureMessage()
+    {
+        $validator = new Between(['min' => 'a', 'max' => 'z']);
+        $this->assertFalse($validator->isValid(10));
+        $messages = $validator->getMessages();
+        $this->assertContains(
+            'The min (\'a\') and max (\'z\') values are non-numeric strings, but the input is not a string',
+            $messages
+        );
+    }
 }