Improve Conversion method

thephpleague · Jun 5, 2015 · 633aad5 · 633aad5
1 parent 4f23c95
commit 633aad5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/AbstractCsv.php b/src/AbstractCsv.php
@@ -163,7 +163,7 @@ protected function getConversionIterator()
         $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
@@ -54,7 +54,7 @@ public function testToXML()
 
     public function testJsonSerialize()
     {
-        $this->assertContains(['john', 'doe', '[email protected]'], json_decode(json_encode($this->csv), true));
+        $this->assertSame($this->expected, json_decode(json_encode($this->csv), true));
     }
 
     /**