Fix bug #1626 where values of 0 were "rounded" up/down as if they wer…

…e not 0 (#1627) * Fix bug where values of 0 were "rounded" up/down as if they were not 0
PHPOffice · Dec 10, 2020 · 1f2f2c7 · 1f2f2c7
1 parent 9289ab1
commit 1f2f2c7
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -81,7 +81,8 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 ### Fixed
 
-- PrintArea causes exception [#1544](https://github.com/phpoffice/phpspreadsheet/pull/1544) 
+- PrintArea causes exception [#1544](https://github.com/phpoffice/phpspreadsheet/pull/1544)
+- ROUNDUP and ROUNDDOWN return incorrect results for values of 0 [#1627](https://github.com/phpoffice/phpspreadsheet/pull/1627)
 - Calculation/DateTime Failure With PHP8 [#1661](https://github.com/phpoffice/phpspreadsheet/pull/1661)
 - Reader/Gnumeric Failure with PHP8 [#1662](https://github.com/phpoffice/phpspreadsheet/pull/1662)
 - ReverseSort bug, exposed but not caused by PHP8 [#1660](https://github.com/phpoffice/phpspreadsheet/pull/1660)

diff --git a/src/PhpSpreadsheet/Calculation/MathTrig.php b/src/PhpSpreadsheet/Calculation/MathTrig.php
@@ -1108,6 +1108,10 @@ public static function ROUNDUP($number, $digits)
         $digits = Functions::flattenSingleValue($digits);
 
         if ((is_numeric($number)) && (is_numeric($digits))) {
+            if ($number == 0.0) {
+                return 0.0;
+            }
+
             if ($number < 0.0) {
                 return round($number - 0.5 * 0.1 ** $digits, $digits, PHP_ROUND_HALF_DOWN);
             }
@@ -1134,6 +1138,10 @@ public static function ROUNDDOWN($number, $digits)
         $digits = Functions::flattenSingleValue($digits);
 
         if ((is_numeric($number)) && (is_numeric($digits))) {
+            if ($number == 0.0) {
+                return 0.0;
+            }
+
             if ($number < 0.0) {
                 return round($number + 0.5 * 0.1 ** $digits, $digits, PHP_ROUND_HALF_UP);
             }

diff --git a/tests/data/Calculation/MathTrig/ROUNDDOWN.php b/tests/data/Calculation/MathTrig/ROUNDDOWN.php
@@ -1,6 +1,11 @@
 <?php
 
 return [
+    [
+        0,
+        0,
+        2,
+    ],
     [
         662,
         662.78999999999996,

diff --git a/tests/data/Calculation/MathTrig/ROUNDUP.php b/tests/data/Calculation/MathTrig/ROUNDUP.php
@@ -1,6 +1,11 @@
 <?php
 
 return [
+    [
+        0,
+        0,
+        2,
+    ],
     [
         663,
         662.78999999999996,