merge #57: fix rounding issues

Author: jrmajor

src/Formatters/Number/NumberFormatter.php

@@ -144,28 +144,29 @@ private function applyMaximumFractionDigits(Options $o, string $int, string $fra
         assert($maximumFractionDigits !== null);
 
         if ($maximumFractionDigits <= 0) {
-            $intWithoutLast = substr($int, 0, strlen($int) - 1);
-            $intLastDigit = (int) substr($int, strlen($int) - 1);
-
             if ((int) substr($frac, 0, 1) >= 5) {
-                $intLastDigit++;
+                $int++;
             }
 
-            return [$intWithoutLast . $intLastDigit, ''];
+            return [(string) $int, ''];
         }
 
         if (strlen($frac) <= $maximumFractionDigits) {
             return [$int, $frac];
         }
 
-        $withoutLast = substr($frac, 0, $maximumFractionDigits - 1);
-        $lastDigit = (int) substr($frac, $maximumFractionDigits - 1, 1);
+        $paddingZeros = substr($frac, 0, strspn($frac, '0'));
+        $trimmed = (int) substr($frac, 0, $maximumFractionDigits);
 
         if ((int) substr($frac, $maximumFractionDigits, 1) >= 5) {
-            $lastDigit++;
+            $trimmed++;
+        }
+
+        if (strlen((string) $trimmed) > $maximumFractionDigits) {
+            return [(string) ++$int, ''];
         }
 
-        return [$int, $withoutLast . $lastDigit];
+        return [$int, rtrim($paddingZeros . $trimmed, '0')];
     }
 
     private function applyMaximumSignificantDigits(Options $o, string $int): string
@@ -177,15 +178,14 @@ private function applyMaximumSignificantDigits(Options $o, string $int): string
             return $int;
         }
 
-        $withoutLast = substr($int, 0, $o->maximumSignificantDigits - 1);
-        $lastDigit = (int) substr($int, $o->maximumSignificantDigits - 1, 1);
-        $padding = str_repeat('0', strlen($int) - $o->maximumSignificantDigits);
+        $trimmed = (int) substr($int, 0, $o->maximumSignificantDigits);
+        $paddingZeros = str_repeat('0', strlen($int) - $o->maximumSignificantDigits);
 
         if ((int) substr($int, $o->maximumSignificantDigits, 1) >= 5) {
-            $lastDigit++;
+            $trimmed++;
         }
 
-        return $withoutLast . $lastDigit . $padding;
+        return $trimmed . $paddingZeros;
     }
 
     private function applyMinimumIntegerDigits(Options $o, string $int): string

tests/Formatters/Number/DecimalFormatterTest.php

@@ -52,6 +52,9 @@ public static function provideDecimalCases(): Generator
             [12.345, ['maximumSignificantDigits' => 4]],
             [12345, ['maximumSignificantDigits' => 4]],
             [45.67, ['maximumSignificantDigits' => 2]],
+            [5962399.87, ['maximumSignificantDigits' => 3]],
+            [46538.069971871, ['maxFractionDigits' => 4]],
+            [46538.999971871, ['maxFractionDigits' => 4]],
         ] as $case) {
             foreach (self::provideLocales() as $locale) {
                 yield [$locale, ...$case];