Fix case where mergeComplexNumberFormatMasks would get stuck in endle…

…ss-loop (#1793) * Fix case where mergeComplexNumberFormatMasks would get stuck in endless-loop if $numbers had many decimals
PHPOffice · Feb 8, 2021 · f60f37c · f60f37c
1 parent b068639
commit f60f37c
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/src/PhpSpreadsheet/Style/NumberFormat.php b/src/PhpSpreadsheet/Style/NumberFormat.php
@@ -563,9 +563,11 @@ private static function mergeComplexNumberFormatMasks($numbers, $masks)
 
         do {
             $tempMask = array_pop($masks);
-            $postDecimalMasks[] = $tempMask;
-            $decimalCount -= strlen($tempMask);
-        } while ($decimalCount > 0);
+            if ($tempMask !== null) {
+                $postDecimalMasks[] = $tempMask;
+                $decimalCount -= strlen($tempMask);
+            }
+        } while ($tempMask !== null && $decimalCount > 0);
 
         return [
             implode('.', $masks),

diff --git a/tests/data/Style/NumberFormat.php b/tests/data/Style/NumberFormat.php
@@ -362,4 +362,24 @@
         25,
         '[Green][<>25]"<>25 green";[Red]"else red"',
     ],
+    [
+        'pfx. 25.00',
+        25,
+        '"pfx." 0.00;"pfx." -0.00;"pfx." 0.00;',
+    ],
+    [
+        'pfx. 25.20',
+        25.2,
+        '"pfx." 0.00;"pfx." -0.00;"pfx." 0.00;',
+    ],
+    [
+        'pfx. -25.20',
+        -25.2,
+        '"pfx." 0.00;"pfx." -0.00;"pfx." 0.00;',
+    ],
+    [
+        'pfx. 25.26',
+        25.255555555555555,
+        '"pfx." 0.00;"pfx." -0.00;"pfx." 0.00;',
+    ],
 ];