From d2aab1e7bde802582c3879acf03d92716577c76d Mon Sep 17 00:00:00 2001 From: Ignace Nyamagana Butera Date: Tue, 6 Feb 2018 09:22:54 +0100 Subject: [PATCH] prepare 8.2.3 release --- CHANGELOG.md | 20 +++++++++++++++++++- src/AbstractCsv.php | 2 +- src/Config/Controls.php | 2 +- src/Config/Output.php | 2 +- src/Exception/InvalidRowException.php | 2 +- src/Modifier/MapIterator.php | 2 +- src/Modifier/QueryFilter.php | 2 +- src/Modifier/RowFilter.php | 2 +- src/Modifier/StreamFilter.php | 2 +- src/Modifier/StreamIterator.php | 2 +- src/Plugin/ColumnConsistencyValidator.php | 2 +- src/Plugin/ForbiddenNullValuesValidator.php | 2 +- src/Plugin/SkipNullValuesFormatter.php | 2 +- src/Reader.php | 3 ++- src/Writer.php | 2 +- 15 files changed, 34 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e013d47a..7bdd71a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,25 @@ -#Changelog +# Changelog All Notable changes to `Csv` will be documented in this file +## 8.2.3 - 2018-02-06 + +### Added + +- None + +### Deprecated + +- None + +### Fixed + +- `Reader::fetchAssoc` no longer throws exception because of a bug in PHP7.2+ [issue #279](https://github.com/thephpleague/csv/issues/279) + +### Removed + +- None + ## 8.2.2 - 2017-07-12 ### Added diff --git a/src/AbstractCsv.php b/src/AbstractCsv.php index 62c68650..ea61cd74 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 8.2.2 +* @version 8.2.3 * @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 1bc84632..c5de9604 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 8.2.2 +* @version 8.2.3 * @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 d621e216..e478ca87 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 8.2.2 +* @version 8.2.3 * @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 dd499cc3..2055bba0 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 8.2.2 +* @version 8.2.3 * @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 2657cf3c..e2757337 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 8.2.2 +* @version 8.2.3 * @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 4905bad0..b664be06 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 8.2.2 +* @version 8.2.3 * @package League.csv * * For the full copyright and license information, please view the LICENSE diff --git a/src/Modifier/RowFilter.php b/src/Modifier/RowFilter.php index b4b5ad15..7b850cc8 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 8.2.2 +* @version 8.2.3 * @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 d4d7fc72..03fb729a 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 8.2.2 +* @version 8.2.3 * @package League.csv * * For the full copyright and license information, please view the LICENSE diff --git a/src/Modifier/StreamIterator.php b/src/Modifier/StreamIterator.php index 877dc18d..eacb109a 100644 --- a/src/Modifier/StreamIterator.php +++ b/src/Modifier/StreamIterator.php @@ -4,7 +4,7 @@ * * @license http://opensource.org/licenses/MIT * @link https://github.com/thephpleague/csv/ -* @version 8.2.2 +* @version 8.2.3 * @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 eb4d8931..6d8004a7 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 8.2.2 +* @version 8.2.3 * @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 3f97f2ff..bc10b1d0 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 8.2.2 +* @version 8.2.3 * @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 111b33fc..fa628c58 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 8.2.2 +* @version 8.2.3 * @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 6f85f8cc..55603b4f 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 8.2.2 +* @version 8.2.3 * @package League.csv * * For the full copyright and license information, please view the LICENSE @@ -344,6 +344,7 @@ protected function getRow($offset) protected function seekRow($offset) { $stream = $this->getIterator(); + $stream->rewind(); //Workaround for SplFileObject::seek bug in PHP7.2+ see https://bugs.php.net/bug.php?id=75917 if (PHP_VERSION_ID > 70200 && !$stream instanceof StreamIterator) { while ($offset !== $stream->key() && $stream->valid()) { diff --git a/src/Writer.php b/src/Writer.php index 57f229ea..a004a465 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 8.2.2 +* @version 8.2.3 * @package League.csv * * For the full copyright and license information, please view the LICENSE