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

Fix crash when using associative array with empty row

Browse Source
This commit is contained in:
Adrien Loison 2016-11-03 13:30:09 -07:00
parent 9ce77405e0
commit c452fa1f31
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Spout/Writer/XLSX/Internal/Worksheet.php
View File

@ -149,7 +149,8 @@ EOD;
private function isEmptyRow($dataRow) private function isEmptyRow($dataRow)
{ {
$numCells = count($dataRow); $numCells = count($dataRow);
return ($numCells === 1 && CellHelper::isEmpty($dataRow[0])); // using "reset()" instead of "$dataRow[0]" because $dataRow can be an associative array
return ($numCells === 1 && CellHelper::isEmpty(reset($dataRow)));
} }
/** /**

2
tests/Spout/Writer/XLSX/WriterTest.php
View File

@ -294,7 +294,7 @@ class WriterTest extends \PHPUnit_Framework_TestCase
$dataRows = [ $dataRows = [
[''], [''],
['xlsx--21', 'xlsx--22'], ['xlsx--21', 'xlsx--22'],
[''], ['key' => ''],
[''], [''],
['xlsx--51', 'xlsx--52'], ['xlsx--51', 'xlsx--52'],
]; ];