Merge branch 'master' into 3.1-merge

Author: limingxinleo

src/Concerns/ValidatesAttributes.php

@@ -533,6 +533,10 @@ public function validateGt(string $attribute, $value, array $parameters): bool
             return $this->getSize($attribute, $value) > $parameters[0];
         }
 
+        if ($this->hasRule($attribute, $this->numericRules) && is_numeric($value) && is_numeric($comparedToValue)) {
+            return $value > $comparedToValue;
+        }
+
         if (! $this->isSameType($value, $comparedToValue)) {
             return false;
         }
@@ -557,6 +561,10 @@ public function validateLt(string $attribute, $value, array $parameters): bool
             return $this->getSize($attribute, $value) < $parameters[0];
         }
 
+        if ($this->hasRule($attribute, $this->numericRules) && is_numeric($value) && is_numeric($comparedToValue)) {
+            return $value < $comparedToValue;
+        }
+
         if (! $this->isSameType($value, $comparedToValue)) {
             return false;
         }
@@ -581,6 +589,10 @@ public function validateGte(string $attribute, $value, array $parameters): bool
             return $this->getSize($attribute, $value) >= $parameters[0];
         }
 
+        if ($this->hasRule($attribute, $this->numericRules) && is_numeric($value) && is_numeric($comparedToValue)) {
+            return $value >= $comparedToValue;
+        }
+
         if (! $this->isSameType($value, $comparedToValue)) {
             return false;
         }
@@ -605,6 +617,10 @@ public function validateLte(string $attribute, $value, array $parameters): bool
             return $this->getSize($attribute, $value) <= $parameters[0];
         }
 
+        if ($this->hasRule($attribute, $this->numericRules) && is_numeric($value) && is_numeric($comparedToValue)) {
+            return $value <= $comparedToValue;
+        }
+
         if (! $this->isSameType($value, $comparedToValue)) {
             return false;
         }

tests/Cases/ValidationValidatorTest.php

@@ -1694,6 +1694,9 @@ public function testValidateGtPlaceHolderIsReplacedProperly()
         $this->assertFalse($v->passes());
         $this->assertEquals(5, $v->messages()->first('items'));
 
+        $v = new Validator($trans, ['items' => '26', 'more' => 5], ['items' => 'gt:more']);
+        $this->assertTrue($v->passes());
+
         $v = new Validator($trans, ['items' => 'abc', 'more' => 'abcde'], ['items' => 'gt:more']);
         $this->assertFalse($v->passes());
         $this->assertEquals(5, $v->messages()->first('items'));
@@ -1731,6 +1734,9 @@ public function testValidateLtPlaceHolderIsReplacedProperly()
         $this->assertFalse($v->passes());
         $this->assertEquals(2, $v->messages()->first('items'));
 
+        $v = new Validator($trans, ['items' => '5', 'less' => 26], ['items' => 'numeric|lt:less']);
+        $this->assertTrue($v->passes());
+
         $v = new Validator($trans, ['items' => 'abc', 'less' => 'ab'], ['items' => 'lt:less']);
         $this->assertFalse($v->passes());
         $this->assertEquals(2, $v->messages()->first('items'));
@@ -1768,6 +1774,9 @@ public function testValidateGtePlaceHolderIsReplacedProperly()
         $this->assertFalse($v->passes());
         $this->assertEquals(5, $v->messages()->first('items'));
 
+        $v = new Validator($trans, ['items' => '26', 'more' => 26], ['items' => 'numeric|gte:more']);
+        $this->assertTrue($v->passes());
+
         $v = new Validator($trans, ['items' => 'abc', 'more' => 'abcde'], ['items' => 'gte:more']);
         $this->assertFalse($v->passes());
         $this->assertEquals(5, $v->messages()->first('items'));
@@ -1805,6 +1814,9 @@ public function testValidateLtePlaceHolderIsReplacedProperly()
         $this->assertFalse($v->passes());
         $this->assertEquals(2, $v->messages()->first('items'));
 
+        $v = new Validator($trans, ['items' => 5, 'less' => '26'], ['items' => 'numeric|lte:less']);
+        $this->assertTrue($v->passes());
+
         $v = new Validator($trans, ['items' => 'abc', 'less' => 'ab'], ['items' => 'lte:less']);
         $this->assertFalse($v->passes());
         $this->assertEquals(2, $v->messages()->first('items'));