fix(NumberFormatter): round number before format, correct behavior fo…

…r ZeroClear::DECIMALS_EMPTY
h4kuna · Feb 14, 2024 · 96216f3 · 96216f3
1 parent 4bcb723
commit 96216f3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/Number/Formatters/NumberFormatter.php b/src/Number/Formatters/NumberFormatter.php
@@ -43,12 +43,10 @@ public function __construct(
 	}
 
 
-	private function initRoundCallback(null|int|callable $round): ?callable
+	private function initRoundCallback(null|int|callable $round): callable
 	{
-		if ($this->decimals < 0 && $round === null) {
+		if ($round === null || $round === Round::RESET) {
 			return Round::create();
-		} elseif ($round === null || $round === Round::RESET) {
-			return null;
 		} elseif (is_int($round)) {
 			return Round::create($round);
 		}

diff --git a/src/Number/NumberFormat.php b/src/Number/NumberFormat.php
@@ -32,11 +32,12 @@ public static function unit(
 		if ($isZero && ($isNumeric === false || $zeroIsEmpty === true)) {
 			$formatted = $emptyValue === Space::AS_NULL ? '' : $emptyValue;
 		} else {
-			if ($zeroClear === ZeroClear::DECIMALS_EMPTY && $decimals > 0 && ((int) $castNumber) == $castNumber) {
+			$castNumber = ($roundCallback ?? Round::create())($castNumber, $decimals);
+			if (($zeroClear === ZeroClear::DECIMALS_EMPTY && $decimals > 0 && ((int) $castNumber) == $castNumber) || $decimals < 0) {
 				$decimals = 0;
 			}
 
-			$formatted = self::base($castNumber, $decimals, $decimalPoint, $thousandsSeparator, $roundCallback);
+			$formatted = self::base($castNumber, $decimals, $decimalPoint, $thousandsSeparator);
 
 			if ($zeroClear === ZeroClear::DECIMALS && $decimals > 0) {
 				$formatted = self::zeroClear($formatted, $decimalPoint);

diff --git a/tests/src/Number/Formatters/NumberFormatterTest.php b/tests/src/Number/Formatters/NumberFormatterTest.php
@@ -128,6 +128,11 @@ protected function provideFormat(): array
 				'0,10',
 				0.1,
 			],
+			[
+				['zeroClear' => ZeroClear::DECIMALS_EMPTY, 'decimals' => 1],
+				'1',
+				0.99,
+			],
 		];
 	}