Merge pull request #7098 from kenjis/fix-validation-strict-greater_than

fix: handling float in Validation Strcit Rules (greater_than, greater_than_equal_to, less_than, less_than_equal_to)

Author: kenjis

system/Validation/StrictRules/Rules.php

@@ -75,7 +75,7 @@ public function exact_length($str, string $val): bool
      */
     public function greater_than($str, string $min): bool
     {
-        if (is_int($str)) {
+        if (is_int($str) || is_float($str)) {
             $str = (string) $str;
         }
 
@@ -93,7 +93,7 @@ public function greater_than($str, string $min): bool
      */
     public function greater_than_equal_to($str, string $min): bool
     {
-        if (is_int($str)) {
+        if (is_int($str) || is_float($str)) {
             $str = (string) $str;
         }
 
@@ -213,7 +213,7 @@ public function is_unique($str, string $field, array $data): bool
      */
     public function less_than($str, string $max): bool
     {
-        if (is_int($str)) {
+        if (is_int($str) || is_float($str)) {
             $str = (string) $str;
         }
 
@@ -231,7 +231,7 @@ public function less_than($str, string $max): bool
      */
     public function less_than_equal_to($str, string $max): bool
     {
-        if (is_int($str)) {
+        if (is_int($str) || is_float($str)) {
             $str = (string) $str;
         }
 

tests/system/Validation/RulesTest.php

@@ -427,6 +427,9 @@ public function greaterThanProvider(): Generator
             ['-10', '-11', true],
             ['10', '9', true],
             ['10', '10', false],
+            ['10.1', '10', true],
+            ['10.0', '10', false],
+            ['9.9', '10', false],
             ['10', 'a', false],
             ['10a', '10', false],
             [null, null, false],
@@ -449,6 +452,9 @@ public function greaterThanEqualProvider(): Generator
             ['0', '0', true],
             ['1', '0', true],
             ['-1', '0', false],
+            ['1.0', '1', true],
+            ['1.1', '1', true],
+            ['0.9', '1', false],
             ['10a', '0', false],
             [null, null, false],
             ['1', null, true],
@@ -473,6 +479,9 @@ public function lessThanProvider(): Generator
             ['9', '10', true],
             ['10', '9', false],
             ['10', '10', false],
+            ['9.9', '10', true],
+            ['10.1', '10', false],
+            ['10.0', '10', false],
             ['10', 'a', true],
             ['10a', '10', false],
             [null, null, false],
@@ -482,7 +491,7 @@ public function lessThanProvider(): Generator
     /**
      * @dataProvider lessThanEqualProvider
      */
-    public function testLessEqualThan(?string $first, ?string $second, bool $expected): void
+    public function testLessThanEqual(?string $first, ?string $second, bool $expected): void
     {
         $data = ['foo' => $first];
         $this->validation->setRules(['foo' => "less_than_equal_to[{$second}]"]);
@@ -495,6 +504,9 @@ public function lessThanEqualProvider(): Generator
             ['0', '0', true],
             ['1', '0', false],
             ['-1', '0', true],
+            ['1.0', '1', true],
+            ['0.9', '1', true],
+            ['1.1', '1', false],
             ['10a', '0', false],
             [null, null, false],
             ['1', null, false],

tests/system/Validation/StrictRules/RulesTest.php

@@ -106,6 +106,9 @@ public function provideGreaterThanEqualStrict(): Generator
             [0, '0', true],
             [1, '0', true],
             [-1, '0', false],
+            [1.0, '1', true],
+            [1.1, '1', true],
+            [0.9, '1', false],
             [true, '0', false],
         ];
     }
@@ -129,6 +132,9 @@ public function provideGreaterThanStrict(): Generator
             [-10, '-11', true],
             [10, '9', true],
             [10, '10', false],
+            [10.1, '10', true],
+            [10.0, '10', false],
+            [9.9, '10', false],
             [10, 'a', false],
             [true, '0', false],
         ];
@@ -154,6 +160,9 @@ public function provideLessThanStrict(): Generator
             [9, '10', true],
             [10, '9', false],
             [10, '10', false],
+            [9.9, '10', true],
+            [10.1, '10', false],
+            [10.0, '10', false],
             [10, 'a', true],
             [true, '0', false],
         ];
@@ -178,6 +187,9 @@ public function provideLessThanEqualStrict(): Generator
             [0, '0', true],
             [1, '0', false],
             [-1, '0', true],
+            [1.0, '1', true],
+            [0.9, '1', true],
+            [1.1, '1', false],
             [true, '0', false],
         ];
     }