FLOOR() function accept negative number and negative significance

Closes #1245
PHPOffice · Nov 30, 2019 · cc92c66 · cc92c66
1 parent 9fa45f7
commit cc92c66
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,7 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 ### Fixed
 
-- ...
+- FLOOR() function accept negative number and negative significance [#1245](https://github.com/PHPOffice/PhpSpreadsheet/pull/1245)
 
 ## [1.10.0] - 2019-11-18
 

diff --git a/src/PhpSpreadsheet/Calculation/MathTrig.php b/src/PhpSpreadsheet/Calculation/MathTrig.php
@@ -301,7 +301,9 @@ public static function FLOOR($number, $significance = null)
                 return Functions::DIV0();
             } elseif ($number == 0.0) {
                 return 0.0;
-            } elseif (self::SIGN($number) == self::SIGN($significance)) {
+            } elseif (self::SIGN($significance) == 1) {
+                return floor($number / $significance) * $significance;
+            } elseif (self::SIGN($number) == -1 && self::SIGN($significance) == -1) {
                 return floor($number / $significance) * $significance;
             }
 

diff --git a/tests/data/Calculation/MathTrig/FLOOR.php b/tests/data/Calculation/MathTrig/FLOOR.php
@@ -12,7 +12,7 @@
         -2,
     ],
     [
-        '#NUM!',
+        -4,
         -2.5,
         2,
     ],
-Original file line number
+Diff line change
@@ Expand Up @@
     ### Fixed
-    - ...
+    - FLOOR() function accept negative number and negative significance [#1245](https://github.com/PHPOffice/PhpSpreadsheet/pull/1245)
     ## [1.10.0] - 2019-11-18
@@ Expand Down @@