Cell formats with escaped spaces were causing incorrect date formatting

Fix issue where escaped spaces in cell format would cause incorrect
date format leading to incorrect time conversions

Fixes PHPOffice#557
Closes PHPOffice#558

CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+- Cell formats with escaped spaces were causing incorrect date formatting - [#557](https://github.com/PHPOffice/PhpSpreadsheet/issues/557)
+
 ### Fixed
 
 - Xlsx reader crashed when reading a file with workbook protection - [#553](https://github.com/PHPOffice/PhpSpreadsheet/pull/553)

src/PhpSpreadsheet/Style/NumberFormat.php

@@ -589,7 +589,7 @@ public static function toFormattedString($value, $format, $callBack = null)
         }
 
         // Convert any other escaped characters to quoted strings, e.g. (\T to "T")
-        $format = preg_replace('/(\\\(.))(?=(?:[^"]|"[^"]*")*$)/u', '"${2}"', $format);
+        $format = preg_replace('/(\\\([^ ]))(?=(?:[^"]|"[^"]*")*$)/u', '"${2}"', $format);
 
         // Get the sections, there can be up to four sections, separated with a semi-colon (but only if not a quoted literal)
         $sections = preg_split('/(;)(?=(?:[^"]|"[^"]*")*$)/u', $format);

tests/data/Style/NumberFormatDates.php

@@ -52,4 +52,14 @@
         22269.0625,
         '[DBNum1][$-804]m"月"d"日";@',
     ],
+    [
+        '07:35:00 AM',
+        43270.315972222,
+        'hh:mm:ss\ AM/PM',
+    ],
+    [
+        '02:29:00 PM',
+        43270.603472222,
+        'hh:mm:ss\ AM/PM',
+    ],
 ];