mcndave/spout
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove text suffix in XLSX date formats (#341)

Browse Source 
Some date formats have a text suffix, e.g. "mm/dd/yy;@". We should remove the ";...@" part.
This commit is contained in:
Adrien Loison 2016-10-18 11:55:36 -07:00 committed by GitHub
parent 687c321363
commit 73d5d0ea17
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Spout/Reader/XLSX/Helper/DateFormatHelper.php
View File

@ -62,7 +62,9 @@ class DateFormatHelper
public static function toPHPDateFormat($excelDateFormat) public static function toPHPDateFormat($excelDateFormat)
{ {
// Remove brackets potentially present at the beginning of the format string // Remove brackets potentially present at the beginning of the format string
$dateFormat = preg_replace('/^(\[\$[^\]]+?\])/i', '', $excelDateFormat); // and text portion of the format at the end of it (starting with ";")
// See §18.8.31 of ECMA-376 for more detail.
$dateFormat = preg_replace('/^(?:\[\$[^\]]+?\])?([^;]*).*/', '$1', $excelDateFormat);
// Double quotes are used to escape characters that must not be interpreted. // Double quotes are used to escape characters that must not be interpreted.
// For instance, ["Day " dd] should result in "Day 13" and we should not try to interpret "D", "a", "y" // For instance, ["Day " dd] should result in "Day 13" and we should not try to interpret "D", "a", "y"

2
tests/Spout/Reader/XLSX/Helper/DateFormatHelperTest.php
View File

@ -29,6 +29,8 @@ class DateFormatHelperTest extends \PHPUnit_Framework_TestCase
['[$USD-F480]hh:mm AM/PM', 'h:i A'], ['[$USD-F480]hh:mm AM/PM', 'h:i A'],
['"Day " d', '\\D\\a\\y\\ j'], ['"Day " d', '\\D\\a\\y\\ j'],
['yy "Year" m "Month"', 'y \\Y\\e\\a\\r n \\M\\o\\n\\t\\h'], ['yy "Year" m "Month"', 'y \\Y\\e\\a\\r n \\M\\o\\n\\t\\h'],
['mmm-yy;@', 'M-y'],
['[$-409]hh:mm AM/PM;"foo"@', 'h:i A'],
]; ];
} }