Merge remote-tracking branch 'origin/master' into develop_3.0

This commit is contained in:
Adrien Loison committed 2017-11-11 12:20:28 +01:00
commit 5a470188a9
6 files changed
+42 -3

No files matched your search

+8
View File
@@ -160,4 +160,12 @@ class XMLReader extends \XMLReader
return ($this->nodeType === $nodeType && $currentNodeName === $nodeName);
}
/**
* @return string The name of the current node, un-prefixed
*/
public function getCurrentNodeName()
{
return $this->localName;
}
}
@@ -114,7 +114,7 @@ class SharedStringsManager
$xmlReader->readUntilNodeFound(self::XML_NODE_SI);
while ($xmlReader->name === self::XML_NODE_SI) {
while ($xmlReader->getCurrentNodeName() === self::XML_NODE_SI) {
$this->processSharedStringsItem($xmlReader, $sharedStringIndex);
$sharedStringIndex++;
@@ -142,7 +142,7 @@ class SharedStringsManager
$xmlReader->next(self::XML_NODE_SST);
// Iterate over the "sst" elements to get the actual "sst ELEMENT" (skips any DOCTYPE)
while ($xmlReader->name === self::XML_NODE_SST && $xmlReader->nodeType !== XMLReader::ELEMENT) {
while ($xmlReader->getCurrentNodeName() === self::XML_NODE_SST && $xmlReader->nodeType !== XMLReader::ELEMENT) {
$xmlReader->read();
}
+1 -1
View File
@@ -340,7 +340,7 @@ class RowIterator implements IteratorInterface
*/
protected function isEmptyRow($rowData)
{
return (count($rowData) === 1 && $rowData[0] === '');
return (count($rowData) === 1 && key($rowData) === '');
}
/**