From 4f2b624b1bf3ef32c81a17b4730901e0a723abfa Mon Sep 17 00:00:00 2001 From: Derek Bonner Date: Sun, 24 Jun 2018 03:35:45 -0700 Subject: [PATCH] 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 #557 Closes #558 --- CHANGELOG.md | 2 ++ src/PhpSpreadsheet/Style/NumberFormat.php | 2 +- tests/data/Style/NumberFormatDates.php | 10 ++++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 82fa47e34c..2cba4f6815 100644 --- a/CHANGELOG.md +++ b/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) diff --git a/src/PhpSpreadsheet/Style/NumberFormat.php b/src/PhpSpreadsheet/Style/NumberFormat.php index 8075af4814..63ef20aeb1 100644 --- a/src/PhpSpreadsheet/Style/NumberFormat.php +++ b/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); diff --git a/tests/data/Style/NumberFormatDates.php b/tests/data/Style/NumberFormatDates.php index 6fb5cce732..5b74fbedca 100644 --- a/tests/data/Style/NumberFormatDates.php +++ b/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', + ], ];