From 10ea2817a3dad297f533fd50ba06122c2eee818b Mon Sep 17 00:00:00 2001 From: Ignace Nyamagana Butera Date: Thu, 11 Dec 2014 09:14:16 +0100 Subject: [PATCH] prepare for 6.2 release --- CHANGELOG.md | 22 ++++------------------ composer.json | 2 +- src/Config/StreamFilter.php | 2 +- src/Iterator/MapIterator.php | 2 +- src/Iterator/Query.php | 2 +- src/Reader.php | 2 +- 6 files changed, 9 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2be3dd8a..ce7e91c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,34 +1,20 @@ #Changelog All Notable changes to `League\Csv` will be documented in this file +## 6.2.0 - XXXX-XX-XX + +### Added +- `Writer::setNewline` , `Writer::getNewline` control the newline character added at the end of each CSV row. ## 6.1.0 - 2014-12-08 ### Added - `Reader::fetchAssoc` now also accepts an integer as first argument representing a row index. -### Deprecated -- Nothing - -### Fixed -- Nothing - ## 6.0.1 - 2014-11-12 -### Added -- Nothing - -### Deprecated -- Nothing - ### Fixed - Bug Fixed `detectDelimiterList` -### Remove -- Nothing - -### Security -- Nothing - ## 6.0.0 - 2014-08-28 ### Added diff --git a/composer.json b/composer.json index cf5aafeb..54c17353 100644 --- a/composer.json +++ b/composer.json @@ -36,7 +36,7 @@ }, "extra": { "branch-alias": { - "dev-master": "6.1-dev" + "dev-master": "6.2-dev" } } } diff --git a/src/Config/StreamFilter.php b/src/Config/StreamFilter.php index bf9bb84b..23d28adc 100644 --- a/src/Config/StreamFilter.php +++ b/src/Config/StreamFilter.php @@ -4,7 +4,7 @@ * * @license http://opensource.org/licenses/MIT * @link https://github.com/thephpleague/csv/ -* @version 6.1.0 +* @version 6.2.0 * @package League.csv * * For the full copyright and license information, please view the LICENSE diff --git a/src/Iterator/MapIterator.php b/src/Iterator/MapIterator.php index 1a6a82c9..e6b08161 100644 --- a/src/Iterator/MapIterator.php +++ b/src/Iterator/MapIterator.php @@ -4,7 +4,7 @@ * * @license http://opensource.org/licenses/MIT * @link https://github.com/thephpleague/csv/ -* @version 6.1.0 +* @version 6.2.0 * @package League.csv * * For the full copyright and license information, please view the LICENSE diff --git a/src/Iterator/Query.php b/src/Iterator/Query.php index 6db93e97..b3382525 100644 --- a/src/Iterator/Query.php +++ b/src/Iterator/Query.php @@ -4,7 +4,7 @@ * * @license http://opensource.org/licenses/MIT * @link https://github.com/thephpleague/csv/ -* @version 6.1.0 +* @version 6.2.0 * @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 f5aa016e..00a368d0 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 6.1.0 +* @version 6.2.0 * @package League.csv * * For the full copyright and license information, please view the LICENSE