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

Fix sheet name escaping

Browse Source 
Sheet names are stored as attributes of an XML entity. We therefore need a different escaping strategy, escaping quotes.
This commit is contained in:
Adrien Loison authored and Adrien Loison committed 2019-01-26 16:14:15 +01:00
1 parent ee998f7173
commit 71cf0fe339
6 files changed
+12 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tests/Spout/Common/Helper/Escaper/ODSTest.php
+1 -1
View File
@@ -17,7 +17,7 @@ class ODSTest extends TestCase
{
return [
['test', 'test'],
['carl\'s "pokemon"', 'carl\'s "pokemon"'],
['carl\'s "pokemon"', 'carl's "pokemon"'],
["\n", "\n"],
["\r", "\r"],
["\t", "\t"],
tests/Spout/Common/Helper/Escaper/XLSXTest.php
+2 -2
View File
@@ -17,7 +17,7 @@ class XLSXTest extends TestCase
{
return [
['test', 'test'],
['adam\'s "car"', 'adam\'s "car"'],
['adam\'s "car"', 'adam's "car"'],
["\n", "\n"],
["\r", "\r"],
["\t", "\t"],
@@ -26,7 +26,7 @@ class XLSXTest extends 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"'],
];
}
tests/Spout/Writer/ODS/WriterTest.php
+1 -1
View File
@@ -441,7 +441,7 @@ class WriterTest extends TestCase
$this->writeToODSFile($dataRows, $fileName);
$this->assertValueWasWritten($fileName, 'I\'m in "great" mood', 'Quotes should not be escaped');
$this->assertValueWasWritten($fileName, 'I'm in "great" mood', 'Quotes should not be escaped');
$this->assertValueWasWritten($fileName, 'This &lt;must&gt; be escaped &amp; tested', '<, > and & should be escaped');
}
tests/Spout/Writer/XLSX/WriterTest.php
+1 -1
View File
@@ -498,7 +498,7 @@ class WriterTest extends TestCase
$this->writeToXLSXFile($dataRows, $fileName);
$this->assertInlineDataWasWrittenToSheet($fileName, 1, 'I\'m in "great" mood', 'Quotes should not be escaped');
$this->assertInlineDataWasWrittenToSheet($fileName, 1, 'I&#039;m in &quot;great&quot; mood', 'Quotes should not be escaped');
$this->assertInlineDataWasWrittenToSheet($fileName, 1, 'This &lt;must&gt; be escaped &amp; tested', '<, > and & should be escaped');
}