summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgnace Nyamagana Butera <nyamsprod@gmail.com>2016-10-03 13:55:39 +0200
committerIgnace Nyamagana Butera <nyamsprod@gmail.com>2016-10-03 13:56:38 +0200
commitd1b540ddd33a8b04c2f97083457e056cc6449703 (patch)
tree4389ee0da02ee6f33704849519b39fe0b00c890e
parent3b22a40804aa0bc5224ffb2f5e8248edf0a9a38c (diff)
downloadcsv-d1b540ddd33a8b04c2f97083457e056cc6449703.zip
csv-d1b540ddd33a8b04c2f97083457e056cc6449703.tar.gz
csv-d1b540ddd33a8b04c2f97083457e056cc6449703.tar.bz2
bug fix BOM stripping #184
-rw-r--r--CHANGELOG.md18
-rw-r--r--src/Modifier/QueryFilter.php2
-rw-r--r--test/ReaderTest.php1
3 files changed, 19 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 67b30be..295bbd1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,24 @@
All Notable changes to `Csv` will be documented in this file
+## Next
+
+### Added
+
+- None
+
+### Deprecated
+
+- None
+
+### Fixed
+
+- BOM filtering fix [issue #184](ttps://github.com/thephpleague/csv/issues/184)
+
+### Removed
+
+- None
+
## 8.1.1 - 2016-09-05
### Added
diff --git a/src/Modifier/QueryFilter.php b/src/Modifier/QueryFilter.php
index 532105b..582440c 100644
--- a/src/Modifier/QueryFilter.php
+++ b/src/Modifier/QueryFilter.php
@@ -222,7 +222,7 @@ trait QueryFilter
}
$row[0] = mb_substr($row[0], $bom_length);
- if ($row[0][0] === $enclosure && mb_substr($row[0], -1, 1) === $enclosure) {
+ if (mb_substr($row[0], 0, 1) === $enclosure && mb_substr($row[0], -1, 1) === $enclosure) {
$row[0] = mb_substr($row[0], 1, -1);
}
diff --git a/test/ReaderTest.php b/test/ReaderTest.php
index 1637b2a..27515c5 100644
--- a/test/ReaderTest.php
+++ b/test/ReaderTest.php
@@ -395,7 +395,6 @@ class ReaderTest extends AbstractTestCase
$transform = [];
$this->csv->addFilter(function ($row) {
return $row != [null];
-
});
$res = $this->csv->each(function ($row) use (&$transform) {
$transform[] = array_map('strtoupper', $row);