diff options
| -rw-r--r-- | src/Reader.php | 3 | ||||
| -rw-r--r-- | test/ReaderTest.php | 5 | ||||
| -rw-r--r-- | test/StreamFilterTest.php | 2 |
3 files changed, 1 insertions, 9 deletions
diff --git a/src/Reader.php b/src/Reader.php index 174a616..7523c9f 100644 --- a/src/Reader.php +++ b/src/Reader.php @@ -190,7 +190,6 @@ class Reader extends AbstractCsv }; $this->addFilter($filterOutOffset); } - $iterator = $this->fetch($callable); $combineArray = function (array $row) use ($keys) { $keys_count = count($keys); if ($keys_count != count($row)) { @@ -200,7 +199,7 @@ class Reader extends AbstractCsv return array_combine($keys, $row); }; - return iterator_to_array(new MapIterator($iterator, $combineArray), false); + return iterator_to_array(new MapIterator($this->fetch($callable), $combineArray), false); } /** diff --git a/test/ReaderTest.php b/test/ReaderTest.php index 1be57d6..1eef2ca 100644 --- a/test/ReaderTest.php +++ b/test/ReaderTest.php @@ -4,7 +4,6 @@ namespace League\Csv\test; use League\Csv\Reader; use PHPUnit_Framework_TestCase; -use SplFileObject; use SplTempFileObject; /** @@ -275,7 +274,6 @@ class ReaderTest extends PHPUnit_Framework_TestCase $source = Reader::BOM_UTF8.'"parent name","child name","title" "parentA","childA","titleA"'; $csv = Reader::createFromString($source); - $csv->setFlags(SplFileObject::READ_AHEAD | SplFileObject::SKIP_EMPTY); $csv->stripBom(true); $expected = [ ['parent name' => 'parentA', 'child name' => 'childA', 'title' => 'titleA'], @@ -288,7 +286,6 @@ class ReaderTest extends PHPUnit_Framework_TestCase $source = Reader::BOM_UTF8.'"parent name","child name","title" "parentA","childA","titleA"'; $csv = Reader::createFromString($source); - $csv->setFlags(SplFileObject::READ_AHEAD | SplFileObject::SKIP_EMPTY); $csv->stripBom(true); $this->assertContains('parent name', $csv->fetchColumn()); } @@ -298,7 +295,6 @@ class ReaderTest extends PHPUnit_Framework_TestCase $source = Reader::BOM_UTF8.'"parent name","child name","title" "parentA","childA","titleA"'; $csv = Reader::createFromString($source); - $csv->setFlags(SplFileObject::READ_AHEAD | SplFileObject::SKIP_EMPTY); $csv->stripBom(true); $this->assertContains(['parent name', 'child name', 'title'], $csv->fetchAll()); } @@ -308,7 +304,6 @@ class ReaderTest extends PHPUnit_Framework_TestCase $source = Reader::BOM_UTF8.'"parent name","child name","title" "parentA","childA","titleA"'; $csv = Reader::createFromString($source); - $csv->setFlags(SplFileObject::READ_AHEAD | SplFileObject::SKIP_EMPTY); $csv->stripBom(true); $this->assertSame(Reader::BOM_UTF8, $csv->getInputBom()); $expected = ['parent name', 'child name', 'title']; diff --git a/test/StreamFilterTest.php b/test/StreamFilterTest.php index 7af1c54..ea74eba 100644 --- a/test/StreamFilterTest.php +++ b/test/StreamFilterTest.php @@ -50,7 +50,6 @@ class StreamFilterTest extends PHPUnit_Framework_TestCase { $csv = Reader::createFromPath(__DIR__.'/foo.csv'); $csv->appendStreamFilter('string.toupper'); - $csv->setFlags(SplFileObject::READ_AHEAD | SplFileObject::SKIP_EMPTY); foreach ($csv->getIterator() as $row) { $this->assertSame($row, ['JOHN', 'DOE', 'JOHN.DOE@EXAMPLE.COM']); } @@ -82,7 +81,6 @@ class StreamFilterTest extends PHPUnit_Framework_TestCase public function testaddMultipleStreamFilter() { $csv = Reader::createFromPath(__DIR__.'/foo.csv'); - $csv->setFlags(SplFileObject::READ_AHEAD | SplFileObject::SKIP_EMPTY); $csv->appendStreamFilter('string.tolower'); $csv->prependStreamFilter('string.rot13'); $csv->appendStreamFilter('string.toupper'); |