summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorIgnace Nyamagana Butera <nyamsprod@gmail.com>2015-05-18 17:38:07 +0200
committerIgnace Nyamagana Butera <nyamsprod@gmail.com>2015-05-20 09:13:03 +0200
commite36bc99a971be408805aa96c933dad1183631a0a (patch)
treef32be415333280179324a671d96380bc317a48e9 /src
parent3a2a199d686bc8b52689b74d5a66cb2e9b9370c9 (diff)
downloadcsv-e36bc99a971be408805aa96c933dad1183631a0a.zip
csv-e36bc99a971be408805aa96c933dad1183631a0a.tar.gz
csv-e36bc99a971be408805aa96c933dad1183631a0a.tar.bz2
bug fix for issue #99
Diffstat (limited to 'src')
-rw-r--r--src/AbstractCsv.php2
-rw-r--r--src/Config/Controls.php2
-rw-r--r--src/Config/Output.php2
-rw-r--r--src/Exception/InvalidRowException.php2
-rw-r--r--src/Modifier/MapIterator.php2
-rw-r--r--src/Modifier/QueryFilter.php6
-rw-r--r--src/Modifier/RowFilter.php2
-rw-r--r--src/Modifier/StreamFilter.php2
-rw-r--r--src/Plugin/ColumnConsistencyValidator.php2
-rw-r--r--src/Plugin/ForbiddenNullValuesValidator.php2
-rw-r--r--src/Plugin/SkipNullValuesFormatter.php2
-rw-r--r--src/Reader.php2
-rw-r--r--src/Writer.php2
13 files changed, 17 insertions, 13 deletions
diff --git a/src/AbstractCsv.php b/src/AbstractCsv.php
index bf967aa..72b1959 100644
--- a/src/AbstractCsv.php
+++ b/src/AbstractCsv.php
@@ -4,7 +4,7 @@
*
* @license http://opensource.org/licenses/MIT
* @link https://github.com/thephpleague/csv/
-* @version 7.1.0
+* @version 7.1.1
* @package League.csv
*
* For the full copyright and license information, please view the LICENSE
diff --git a/src/Config/Controls.php b/src/Config/Controls.php
index ba6c76a..92194a5 100644
--- a/src/Config/Controls.php
+++ b/src/Config/Controls.php
@@ -4,7 +4,7 @@
*
* @license http://opensource.org/licenses/MIT
* @link https://github.com/thephpleague/csv/
-* @version 7.1.0
+* @version 7.1.1
* @package League.csv
*
* For the full copyright and license information, please view the LICENSE
diff --git a/src/Config/Output.php b/src/Config/Output.php
index 3d85a1f..dd6e1ac 100644
--- a/src/Config/Output.php
+++ b/src/Config/Output.php
@@ -4,7 +4,7 @@
*
* @license http://opensource.org/licenses/MIT
* @link https://github.com/thephpleague/csv/
-* @version 7.1.0
+* @version 7.1.1
* @package League.csv
*
* For the full copyright and license information, please view the LICENSE
diff --git a/src/Exception/InvalidRowException.php b/src/Exception/InvalidRowException.php
index 9649cf8..0fb0227 100644
--- a/src/Exception/InvalidRowException.php
+++ b/src/Exception/InvalidRowException.php
@@ -4,7 +4,7 @@
*
* @license http://opensource.org/licenses/MIT
* @link https://github.com/thephpleague/csv/
-* @version 7.1.0
+* @version 7.1.1
* @package League.csv
*
* For the full copyright and license information, please view the LICENSE
diff --git a/src/Modifier/MapIterator.php b/src/Modifier/MapIterator.php
index 504b9b2..2306f1c 100644
--- a/src/Modifier/MapIterator.php
+++ b/src/Modifier/MapIterator.php
@@ -4,7 +4,7 @@
*
* @license http://opensource.org/licenses/MIT
* @link https://github.com/thephpleague/csv/
-* @version 7.1.0
+* @version 7.1.1
* @package League.csv
*
* For the full copyright and license information, please view the LICENSE
diff --git a/src/Modifier/QueryFilter.php b/src/Modifier/QueryFilter.php
index 739028d..03beb52 100644
--- a/src/Modifier/QueryFilter.php
+++ b/src/Modifier/QueryFilter.php
@@ -4,7 +4,7 @@
*
* @license http://opensource.org/licenses/MIT
* @link https://github.com/thephpleague/csv/
-* @version 7.1.0
+* @version 7.1.1
* @package League.csv
*
* For the full copyright and license information, please view the LICENSE
@@ -241,6 +241,10 @@ trait QueryFilter
*/
protected function applyBomStripping(Iterator $iterator)
{
+ if (! $this->strip_bom) {
+ return $iterator;
+ }
+
if (! $this->isBomStrippable()) {
$this->strip_bom = false;
return $iterator;
diff --git a/src/Modifier/RowFilter.php b/src/Modifier/RowFilter.php
index 8f8f796..b340a68 100644
--- a/src/Modifier/RowFilter.php
+++ b/src/Modifier/RowFilter.php
@@ -4,7 +4,7 @@
*
* @license http://opensource.org/licenses/MIT
* @link https://github.com/thephpleague/csv/
-* @version 7.1.0
+* @version 7.1.1
* @package League.csv
*
* For the full copyright and license information, please view the LICENSE
diff --git a/src/Modifier/StreamFilter.php b/src/Modifier/StreamFilter.php
index a948101..76321c4 100644
--- a/src/Modifier/StreamFilter.php
+++ b/src/Modifier/StreamFilter.php
@@ -4,7 +4,7 @@
*
* @license http://opensource.org/licenses/MIT
* @link https://github.com/thephpleague/csv/
-* @version 7.1.0
+* @version 7.1.1
* @package League.csv
*
* For the full copyright and license information, please view the LICENSE
diff --git a/src/Plugin/ColumnConsistencyValidator.php b/src/Plugin/ColumnConsistencyValidator.php
index da8b0fe..aa013b3 100644
--- a/src/Plugin/ColumnConsistencyValidator.php
+++ b/src/Plugin/ColumnConsistencyValidator.php
@@ -4,7 +4,7 @@
*
* @license http://opensource.org/licenses/MIT
* @link https://github.com/thephpleague/csv/
-* @version 7.1.0
+* @version 7.1.1
* @package League.csv
*
* For the full copyright and license information, please view the LICENSE
diff --git a/src/Plugin/ForbiddenNullValuesValidator.php b/src/Plugin/ForbiddenNullValuesValidator.php
index c9f0ca8..c4c36ae 100644
--- a/src/Plugin/ForbiddenNullValuesValidator.php
+++ b/src/Plugin/ForbiddenNullValuesValidator.php
@@ -4,7 +4,7 @@
*
* @license http://opensource.org/licenses/MIT
* @link https://github.com/thephpleague/csv/
-* @version 7.1.0
+* @version 7.1.1
* @package League.csv
*
* For the full copyright and license information, please view the LICENSE
diff --git a/src/Plugin/SkipNullValuesFormatter.php b/src/Plugin/SkipNullValuesFormatter.php
index b00403c..37118e0 100644
--- a/src/Plugin/SkipNullValuesFormatter.php
+++ b/src/Plugin/SkipNullValuesFormatter.php
@@ -4,7 +4,7 @@
*
* @license http://opensource.org/licenses/MIT
* @link https://github.com/thephpleague/csv/
-* @version 7.1.0
+* @version 7.1.1
* @package League.csv
*
* For the full copyright and license information, please view the LICENSE
diff --git a/src/Reader.php b/src/Reader.php
index 64f7238..2955e11 100644
--- a/src/Reader.php
+++ b/src/Reader.php
@@ -4,7 +4,7 @@
*
* @license http://opensource.org/licenses/MIT
* @link https://github.com/thephpleague/csv/
-* @version 7.1.0
+* @version 7.1.1
* @package League.csv
*
* For the full copyright and license information, please view the LICENSE
diff --git a/src/Writer.php b/src/Writer.php
index a25e29f..824203a 100644
--- a/src/Writer.php
+++ b/src/Writer.php
@@ -4,7 +4,7 @@
*
* @license http://opensource.org/licenses/MIT
* @link https://github.com/thephpleague/csv/
-* @version 7.1.0
+* @version 7.1.1
* @package League.csv
*
* For the full copyright and license information, please view the LICENSE