[Validator] Improve FileValidator sizes factorization edge case

Author: fancyweb

Constraints/FileValidator.php

@@ -225,6 +225,13 @@ private function factorizeSizes(int $size, int|float $limit, bool $binaryFormat)
             $coefFactor = self::KB_BYTES;
         }
 
+        // If $limit < $coef, $limitAsString could be < 1 with less than 3 decimals.
+        // In this case, we would end up displaying an allowed size < 1 (eg: 0.1 MB).
+        // It looks better to keep on factorizing (to display 100 kB for example).
+        while ($limit < $coef) {
+            $coef /= $coefFactor;
+        }
+
         $limitAsString = (string) ($limit / $coef);
 
         // Restrict the limit to 2 decimals (without rounding! we

Tests/Constraints/FileValidatorTest.php

@@ -153,6 +153,11 @@ public function provideMaxSizeExceededTests()
             [1048577, '1Mi', '1048577', '1048576', 'bytes'],
             [1053818, '1Mi', '1029.12', '1024', 'KiB'],
             [1053819, '1Mi', '1.01', '1', 'MiB'],
+
+            // $limit < $coef, @see FileValidator::factorizeSizes()
+            [169632, '100k', '169.63', '100', 'kB'],
+            [1000001, '990k', '1000', '990', 'kB'],
+            [123, '80', '123', '80', 'bytes'],
         ];
     }
 
@@ -508,8 +513,8 @@ public function uploadedFileErrorProvider()
             ], '1000G'];
 
             $tests[] = [(string) \UPLOAD_ERR_INI_SIZE, 'uploadIniSizeErrorMessage', [
-                '{{ limit }}' => '0.1',
-                '{{ suffix }}' => 'MB',
+                '{{ limit }}' => '100',
+                '{{ suffix }}' => 'kB',
             ], '100K'];
         }