diff options
author | Ignace Nyamagana Butera <nyamsprod@gmail.com> | 2015-04-21 09:38:45 +0200 |
---|---|---|
committer | Ignace Nyamagana Butera <nyamsprod@gmail.com> | 2015-04-22 11:30:56 +0200 |
commit | 11a2d555d2c1e28f51a8aa20c9c2544a5b2f131f (patch) | |
tree | 538910f5cd8f8da601dcf79f852a330645585d1b /src | |
parent | 23b43fc9386bf007ca28d6e361e8d265647b35c9 (diff) | |
download | csv-11a2d555d2c1e28f51a8aa20c9c2544a5b2f131f.zip csv-11a2d555d2c1e28f51a8aa20c9c2544a5b2f131f.tar.gz csv-11a2d555d2c1e28f51a8aa20c9c2544a5b2f131f.tar.bz2 |
Bug fix getConversionIterator
Diffstat (limited to 'src')
-rw-r--r-- | src/AbstractCsv.php | 5 | ||||
-rw-r--r-- | src/Reader.php | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/AbstractCsv.php b/src/AbstractCsv.php index 50e1226..78b408f 100644 --- a/src/AbstractCsv.php +++ b/src/AbstractCsv.php @@ -153,7 +153,10 @@ abstract class AbstractCsv implements JsonSerializable, IteratorAggregate */ protected function getConversionIterator() { - return $this->getIterator(); + $iterator = $this->getIterator(); + $iterator->setFlags(SplFileObject::READ_CSV|SplFileObject::READ_AHEAD|SplFileObject::SKIP_EMPTY); + + return $iterator; } /** diff --git a/src/Reader.php b/src/Reader.php index 4e764b5..16d233e 100644 --- a/src/Reader.php +++ b/src/Reader.php @@ -66,7 +66,7 @@ class Reader extends AbstractCsv */ protected function getConversionIterator() { - $iterator = $this->getIterator(); + $iterator = parent::getConversionIterator(); $iterator = $this->applyBomStripping($iterator); $iterator = $this->applyIteratorFilter($iterator); $iterator = $this->applyIteratorSortBy($iterator); @@ -242,8 +242,7 @@ class Reader extends AbstractCsv } if (0 == $offset && $this->isBomStrippable()) { - $bom = $this->getInputBom(); - $res[0] = mb_substr($res[0], mb_strlen($bom)); + $res[0] = mb_substr($res[0], mb_strlen($this->getInputBom())); } return $res; |