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

Merge 33deb10aa769e9a98653c5bb79640c04c58882d9 into 5a7c2c1262ed683067c4ee074da104af658eddc7

Browse Source
This commit is contained in:
Ilya Pleshakov 2016-05-19 16:40:20 +00:00
commit dbaa57abf5
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -213,6 +213,10 @@ class StyleHelper
$customNumberFormat = $customNumberFormats[$numFmtId]; $customNumberFormat = $customNumberFormats[$numFmtId];
if ($customNumberFormat === 'General') {
return false;
}
// Remove extra formatting (what's between [ ], the brackets should not be preceded by a "\") // Remove extra formatting (what's between [ ], the brackets should not be preceded by a "\")
$pattern = '((?<!\\\)\[.+?(?<!\\\)\])'; $pattern = '((?<!\\\)\[.+?(?<!\\\)\])';
$customNumberFormat = preg_replace($pattern, '', $customNumberFormat); $customNumberFormat = preg_replace($pattern, '', $customNumberFormat);

1
tests/Spout/Reader/XLSX/Helper/StyleHelperTest.php
View File

@ -121,6 +121,7 @@ class StyleHelperTest extends \PHPUnit_Framework_TestCase
['m/d/yyyy;@', true], ['m/d/yyyy;@', true],
['[$-409]m/d/yy\--h:mm;@', true], ['[$-409]m/d/yy\--h:mm;@', true],
['GENERAL', false], ['GENERAL', false],
['General', false],
['\ma\yb\e', false], ['\ma\yb\e', false],
['[Red]foo;', false], ['[Red]foo;', false],
]; ];