bug #45733 [Validator] fix #43345 @Assert\DivisibleBy (CharlyPoppins)

fabpot · fabpot · commit 1d1dcf85b372 · 2022-03-26T18:26:15.000+01:00
This PR was squashed before being merged into the 5.4 branch. Discussion ---------- [Validator] fix #43345 @Assert\DivisibleBy | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #43345| License | MIT `@Assert\DivisibleBy` was not working with 0.01 and smaller divider. Commits ------- d774fe3 [Validator] fix #43345 @Assert\DivisibleBy
diff --git a/src/Symfony/Component/Validator/Constraints/DivisibleByValidator.php b/src/Symfony/Component/Validator/Constraints/DivisibleByValidator.php
@@ -42,6 +42,12 @@ protected function compareValues($value1, $value2)
         if (!$remainder = fmod($value1, $value2)) {
             return true;
         }
+        if (\is_float($value2) && \INF !== $value2) {
+            $quotient = $value1 / $value2;
+            $rounded = round($quotient);
+
+            return sprintf('%.12e', $quotient) === sprintf('%.12e', $rounded);
+        }
 
         return sprintf('%.12e', $value2) === sprintf('%.12e', $remainder);
     }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/DivisibleByValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/DivisibleByValidatorTest.php
@@ -46,6 +46,18 @@ public function provideValidComparisons(): array
             [0, 3.1415],
             [42, 42],
             [42, 21],
+            [10.12, 0.01],
+            [10.12, 0.001],
+            [1.133, 0.001],
+            [1.1331, 0.0001],
+            [1.13331, 0.00001],
+            [1.13331, 0.000001],
+            [1, 0.1],
+            [1, 0.01],
+            [1, 0.001],
+            [1, 0.0001],
+            [1, 0.00001],
+            [1, 0.000001],
             [3.25, 0.25],
             ['100', '10'],
             [4.1, 0.1],
@@ -74,6 +86,7 @@ public function provideInvalidComparisons(): array
             [10, '10', 0, '0', 'int'],
             [42, '42', \INF, 'INF', 'float'],
             [4.15, '4.15', 0.1, '0.1', 'float'],
+            [10.123, '10.123', 0.01, '0.01', 'float'],
             ['22', '"22"', '10', '"10"', 'string'],
         ];
     }

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,12 @@ protected function compareValues($value1, $value2)`
`42`	`42`	`if (!$remainder = fmod($value1, $value2)) {`
`43`	`43`	`return true;`
`44`	`44`	`}`
	`45`	`+ if (\is_float($value2) && \INF !== $value2) {`
	`46`	`+ $quotient = $value1 / $value2;`
	`47`	`+ $rounded = round($quotient);`
	`48`	`+`
	`49`	`+ return sprintf('%.12e', $quotient) === sprintf('%.12e', $rounded);`
	`50`	`+ }`
`45`	`51`
`46`	`52`	`return sprintf('%.12e', $value2) === sprintf('%.12e', $remainder);`
`47`	`53`	`}`