summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/AbstractCsv.php2
-rw-r--r--test/CsvTest.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/AbstractCsv.php b/src/AbstractCsv.php
index 72b1959..14dcf3c 100644
--- a/src/AbstractCsv.php
+++ b/src/AbstractCsv.php
@@ -163,7 +163,7 @@ abstract class AbstractCsv implements JsonSerializable, IteratorAggregate
$iterator->setFlags($this->flags|SplFileObject::READ_AHEAD|SplFileObject::SKIP_EMPTY);
$iterator = $this->applyBomStripping($iterator);
$iterator = new CallbackFilterIterator($iterator, function ($row) {
- return is_array($row);
+ return is_array($row) && [null] != $row;
});
$iterator = $this->applyIteratorFilter($iterator);
$iterator = $this->applyIteratorSortBy($iterator);
diff --git a/test/CsvTest.php b/test/CsvTest.php
index 68f0ba8..5cd2837 100644
--- a/test/CsvTest.php
+++ b/test/CsvTest.php
@@ -54,7 +54,7 @@ class CsvTest extends PHPUnit_Framework_TestCase
public function testJsonSerialize()
{
- $this->assertContains(['john', 'doe', 'john.doe@example.com'], json_decode(json_encode($this->csv), true));
+ $this->assertSame($this->expected, json_decode(json_encode($this->csv), true));
}
/**