Fix handling for a # symbol in quotes inside a number format mask

Author: MarkBaker

src/PhpSpreadsheet/Style/NumberFormat/NumberFormatter.php

@@ -205,9 +205,6 @@ public static function format($value, string $format): string
         //    return 'EUR ' . sprintf('%1.2f', $value);
         //}
 
-        // Some non-number strings are quoted, so we'll get rid of the quotes, likewise any positional * symbols
-        $format = self::makeString(str_replace(['"', '*'], '', $format));
-
         // Find out if we need thousands separator
         // This is indicated by a comma enclosed by a digit placeholder:
         //        #,#   or   0,0
@@ -229,20 +226,26 @@ public static function format($value, string $format): string
             $format = self::pregReplace('/0,+/', '0', $format);
             $format = self::pregReplace('/#,+/', '#', $format);
         }
+
         if (preg_match('/#?.*\?\/(\?+|\d+)/', $format)) {
             $value = FractionFormatter::format($value, $format);
         } else {
             // Handle the number itself
 
             // scale number
             $value = $value / $scale;
+
             // Strip #
-            $format = self::pregReplace('/\\#/', '0', $format);
+            $format = self::pregReplace('/\\#(?=(?:[^"]*"[^"]*")*[^"]*\Z)/', '0', $format);
             // Remove locale code [$-###]
             $format = self::pregReplace('/\[\$\-.*\]/', '', $format);
 
             $n = '/\\[[^\\]]+\\]/';
             $m = self::pregReplace($n, '', $format);
+
+            // Some non-number strings are quoted, so we'll get rid of the quotes, likewise any positional * symbols
+            $format = self::makeString(str_replace(['"', '*'], '', $format));
+
             if (preg_match(self::NUMBER_REGEX, $m, $matches)) {
                 // There are placeholders for digits, so inject digits from the value into the mask
                 $value = self::formatStraightNumericValue($value, $format, $matches, $useThousands);

tests/data/Style/NumberFormat.php

@@ -1494,4 +1494,19 @@
         -12345.6789,
         '0.000E+00',
     ],
+    [
+        'Product SKU #12345',
+        12345,
+        '"Product SKU #"0',
+    ],
+    [
+        'Product SKU #12-345',
+        12345,
+        '"Product SKU #"00-000',
+    ],
+    [
+        '€12,345.74 Surplus for Product #12-345',
+        12345.74,
+        '[$€]#,##0.00" Surplus for Product #12-345";$-#,##0.00" Shortage for Product #12-345"',
+    ],
 ];