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

always write rows even with no cells #492

Browse Source
This commit is contained in:
madflow 2017-11-10 10:33:44 +01:00 committed by Adrien Loison
parent 8aec9ea992
commit 7367b89384
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Spout/Writer/WriterAbstract.php
View File

@ -178,18 +178,15 @@ abstract class WriterAbstract implements WriterInterface
public function addRow(Row $row) public function addRow(Row $row)
{ {
if ($this->isWriterOpened) { if ($this->isWriterOpened) {
// empty $dataRow should not add an empty line try {
if ($row->hasCells()) { $this->addRowToWriter($row);
try { } catch (SpoutException $e) {
$this->addRowToWriter($row); // if an exception occurs while writing data,
} catch (SpoutException $e) { // close the writer and remove all files created so far.
// if an exception occurs while writing data, $this->closeAndAttemptToCleanupAllFiles();
// close the writer and remove all files created so far.
$this->closeAndAttemptToCleanupAllFiles();
// re-throw the exception to alert developers of the error // re-throw the exception to alert developers of the error
throw $e; throw $e;
}
} }
} else { } else {
throw new WriterNotOpenedException('The writer needs to be opened before adding row.'); throw new WriterNotOpenedException('The writer needs to be opened before adding row.');

4
tests/Spout/Writer/CSV/WriterTest.php
View File

@ -133,7 +133,7 @@ class WriterTest extends \PHPUnit_Framework_TestCase
/** /**
* @return void * @return void
*/ */
public function testWriteShouldSkipEmptyRows() public function testWriteShouldNotSkipEmptyRows()
{ {
$allRows = $this->createRowsFromValues([ $allRows = $this->createRowsFromValues([
['csv--11', 'csv--12'], ['csv--11', 'csv--12'],
@ -143,7 +143,7 @@ class WriterTest extends \PHPUnit_Framework_TestCase
$writtenContent = $this->writeToCsvFileAndReturnWrittenContent($allRows, 'csv_with_empty_rows.csv'); $writtenContent = $this->writeToCsvFileAndReturnWrittenContent($allRows, 'csv_with_empty_rows.csv');
$writtenContent = $this->trimWrittenContent($writtenContent); $writtenContent = $this->trimWrittenContent($writtenContent);
$this->assertEquals("csv--11,csv--12\ncsv--31,csv--32", $writtenContent, 'Empty rows should be skipped'); $this->assertEquals("csv--11,csv--12\n\ncsv--31,csv--32", $writtenContent, 'Empty rows should be skipped');
} }
/** /**