[8.x] Make multiple_of validation rule handle non-integer values (#…

…34971) * Fix #34960 * Add multiple_of tests where fmod fails * Update ValidatesAttributes.php Co-authored-by: Taylor Otwell <taylor@laravel.com>
laravel · Oct 26, 2020 · c5ab5f7 · c5ab5f7
1 parent c393ca2
commit c5ab5f7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/Illuminate/Validation/Concerns/ValidatesAttributes.php b/src/Illuminate/Validation/Concerns/ValidatesAttributes.php
@@ -1267,7 +1267,11 @@ public function validateMultipleOf($attribute, $value, $parameters)
             return false;
         }
 
-        return fmod($value, $parameters[0]) === 0.0;
+        if ((float) $parameters[0] === 0.0) {
+            return false;
+        }
+
+        return bcmod($value, $parameters[0], 16) === '0.0000000000000000';
     }
 
     /**

diff --git a/tests/Validation/ValidationValidatorTest.php b/tests/Validation/ValidationValidatorTest.php
@@ -1912,18 +1912,21 @@ public function multipleOfDataProvider()
             [5.0, -10, false],
             [10.5, 10.5, true], // float (same)
             [10.5, 0.5, true], // float + float
-            [10.5, 0.3, false],
+            [10.5, 0.3, true], // 10.5/.3 = 35, tricky for floating point division
             [31.5, 10.5, true],
             [31.6, 10.5, false],
             [10.5, -0.5, true], // float + -float
-            [10.5, -0.3, false],
+            [10.5, -0.3, true], // 10.5/.3 = 35, tricky for floating point division
             [-31.5, 10.5, true],
             [-31.6, 10.5, false],
             [-10.5, -10.5, true], // -float (same)
             [-10.5, -0.5, true], // -float + -float
-            [-10.5, -0.3, false],
+            [-10.5, -0.3, true], // 10.5/.3 = 35, tricky for floating point division
             [-31.5, -10.5, true],
             [-31.6, -10.5, false],
+            [2, .1, true], // fmod does this "wrong", it should be 0, but fmod(2, .1) = .1
+            [.75, .05, true], // fmod does this "wrong", it should be 0, but fmod(.75, .05) = .05
+            [.9, .3, true], // .9/.3 = 3, tricky for floating point division
             ['foo', 1, false], // invalid values
             [1, 'foo', false],
             ['foo', 'foo', false],