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

Fix reading of 1904 dates option

Browse Source 
Whether the spreadsheet is using 1904 dates or not is controlled by a XML property. Its value can be the string "false" that is not mapped to the boolean "false" but to the boolean "true"... Therefore Spout was previously using the wrong date system when this property was set.
This commit is contained in:
Adrien Loison authored and Adrien Loison committed 2019-06-04 09:36:51 +02:00
1 parent a296f73a98
commit 6c4086cf97
1 file changed
+3 -1
Download Patch File Download Diff File Expand all files Collapse all files
src/Spout/Reader/XLSX/Manager/SheetManager.php
+3 -1
View File
@@ -114,7 +114,9 @@ class SheetManager
*/ */
protected function processWorkbookPropertiesStartingNode($xmlReader) protected function processWorkbookPropertiesStartingNode($xmlReader)
{ {
$shouldUse1904Dates = (bool) $xmlReader->getAttribute(self::XML_ATTRIBUTE_DATE_1904); // Using "filter_var($x, FILTER_VALIDATE_BOOLEAN)" here because the value of the "date1904" attribute
// may be the string "false", that is not mapped to the boolean "false" by default...
$shouldUse1904Dates = filter_var($xmlReader->getAttribute(self::XML_ATTRIBUTE_DATE_1904), FILTER_VALIDATE_BOOLEAN);
$this->optionsManager->setOption(Options::SHOULD_USE_1904_DATES, $shouldUse1904Dates); $this->optionsManager->setOption(Options::SHOULD_USE_1904_DATES, $shouldUse1904Dates);
return XMLProcessor::PROCESSING_CONTINUE; return XMLProcessor::PROCESSING_CONTINUE;