Fix shared strings XML Entities auto decode (#411)

When converting an XMLReader node to a SimpleXMLElement, the conversion would automatically decode the XML entities. This resulted in a double decode.
For example: """ was converted to """ when imported into a SimpleXMLElement and was again converted into " (quote).

This commit changes the way the XLSX Shared Strings file is processed. It also changes the unescaping logic for both XLSX and ODS.

Finally, it removes any usage of the SimpleXML library (yay!).
This commit is contained in:
Adrien Loison authored and GitHub committed 2017-04-28 02:27:33 +02:00
1 parent 1eb01a3d2a
commit 048105461c
17 files changed
+120 -405

No files matched your search

+1 -1
View File
@@ -16,7 +16,7 @@ class ODSTest extends \PHPUnit_Framework_TestCase
{
return [
['test', 'test'],
['carl\'s "pokemon"', 'carl's "pokemon"'],
['carl\'s "pokemon"', 'carl\'s "pokemon"'],
["\n", "\n"],
["\r", "\r"],
["\t", "\t"],
+4 -4
View File
@@ -16,7 +16,7 @@ class XLSXTest extends \PHPUnit_Framework_TestCase
{
return [
['test', 'test'],
['adam\'s "car"', 'adam's "car"'],
['adam\'s "car"', 'adam\'s "car"'],
["\n", "\n"],
["\r", "\r"],
["\t", "\t"],
@@ -25,7 +25,7 @@ class XLSXTest extends \PHPUnit_Framework_TestCase
['_x0000_', '_x005F_x0000_'],
[chr(21), '_x0015_'],
['control '.chr(21).' character', 'control _x0015_ character'],
['control\'s '.chr(21).' "character"', 'control's _x0015_ "character"'],
['control\'s '.chr(21).' "character"', 'control\'s _x0015_ "character"'],
];
}
@@ -52,7 +52,7 @@ class XLSXTest extends \PHPUnit_Framework_TestCase
{
return [
['test', 'test'],
['adam's "car"', 'adam\'s "car"'],
['adam's "car"', 'adam's "car"'],
["\n", "\n"],
["\r", "\r"],
["\t", "\t"],
@@ -61,7 +61,7 @@ class XLSXTest extends \PHPUnit_Framework_TestCase
['_x005F_x0000_', '_x0000_'],
['_x0015_', chr(21)],
['control _x0015_ character', 'control '.chr(21).' character'],
['control's _x0015_ "character"', 'control\'s '.chr(21).' "character"'],
['control's _x0015_ "character"', 'control's '.chr(21).' "character"'],
];
}