bug fix Writer applying CSV controls #244

thephpleague · Aug 21, 2017 · 5dc305e · 5dc305e
1 parent 60ea563
commit 5dc305e
Show file tree

Hide file tree

Showing 18 changed files with 37 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,24 @@
 
 All Notable changes to `Csv` will be documented in this file
 
+## 9.0.1 - 2017-08-21
+
+### Added
+
+- Nothing
+
+### Deprecated
+
+- Nothing
+
+### Fixed
+
+- CSV controls not applied when calling Writer::insertOne
+
+### Removed
+
+- Nothing
+
 ## 9.0.0 - 2017-08-18
 
 ### Added

diff --git 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 9.0.0
+* @version 9.0.1
 * @package League.csv
 *
 * For the full copyright and license information, please view the LICENSE

diff --git a/src/ByteSequence.php b/src/ByteSequence.php
@@ -4,7 +4,7 @@
 *
 * @license http://opensource.org/licenses/MIT
 * @link https://github.com/thephpleague/csv/
-* @version 9.0.0
+* @version 9.0.1
 * @package League.csv
 *
 * For the full copyright and license information, please view the LICENSE

diff --git a/src/CannotInsertRecord.php b/src/CannotInsertRecord.php
@@ -4,7 +4,7 @@
 *
 * @license http://opensource.org/licenses/MIT
 * @link https://github.com/thephpleague/csv/
-* @version 9.0.0
+* @version 9.0.1
 * @package League.csv
 *
 * For the full copyright and license information, please view the LICENSE

diff --git a/src/CharsetConverter.php b/src/CharsetConverter.php
@@ -4,7 +4,7 @@
 *
 * @license http://opensource.org/licenses/MIT
 * @link https://github.com/thephpleague/csv/
-* @version 9.0.0
+* @version 9.0.1
 * @package League.csv
 *
 * For the full copyright and license information, please view the LICENSE

diff --git a/src/ColumnConsistency.php b/src/ColumnConsistency.php
@@ -4,7 +4,7 @@
 *
 * @license http://opensource.org/licenses/MIT
 * @link https://github.com/thephpleague/csv/
-* @version 9.0.0
+* @version 9.0.1
 * @package League.csv
 *
 * For the full copyright and license information, please view the LICENSE

diff --git a/src/Exception.php b/src/Exception.php
@@ -4,7 +4,7 @@
 *
 * @license http://opensource.org/licenses/MIT
 * @link https://github.com/thephpleague/csv/
-* @version 9.0.0
+* @version 9.0.1
 * @package League.csv
 *
 * For the full copyright and license information, please view the LICENSE

diff --git a/src/HTMLConverter.php b/src/HTMLConverter.php
@@ -4,7 +4,7 @@
 *
 * @license http://opensource.org/licenses/MIT
 * @link https://github.com/thephpleague/csv/
-* @version 9.0.0
+* @version 9.0.1
 * @package League.csv
 *
 * For the full copyright and license information, please view the LICENSE

diff --git a/src/MapIterator.php b/src/MapIterator.php
@@ -4,7 +4,7 @@
 *
 * @license http://opensource.org/licenses/MIT
 * @link https://github.com/thephpleague/csv/
-* @version 9.0.0
+* @version 9.0.1
 * @package League.csv
 *
 * For the full copyright and license information, please view the LICENSE

diff --git a/src/RFC4180Field.php b/src/RFC4180Field.php
@@ -4,7 +4,7 @@
 *
 * @license http://opensource.org/licenses/MIT
 * @link https://github.com/thephpleague/csv/
-* @version 9.0.0
+* @version 9.0.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
@@ -4,7 +4,7 @@
 *
 * @license http://opensource.org/licenses/MIT
 * @link https://github.com/thephpleague/csv/
-* @version 9.0.0
+* @version 9.0.1
 * @package League.csv
 *
 * For the full copyright and license information, please view the LICENSE

diff --git a/src/ResultSet.php b/src/ResultSet.php
@@ -4,7 +4,7 @@
 *
 * @license http://opensource.org/licenses/MIT
 * @link https://github.com/thephpleague/csv/
-* @version 9.0.0
+* @version 9.0.1
 * @package League.csv
 *
 * For the full copyright and license information, please view the LICENSE

diff --git a/src/Statement.php b/src/Statement.php
@@ -4,7 +4,7 @@
 *
 * @license http://opensource.org/licenses/MIT
 * @link https://github.com/thephpleague/csv/
-* @version 9.0.0
+* @version 9.0.1
 * @package League.csv
 *
 * For the full copyright and license information, please view the LICENSE

diff --git a/src/Stream.php b/src/Stream.php
@@ -4,7 +4,7 @@
 *
 * @license http://opensource.org/licenses/MIT
 * @link https://github.com/thephpleague/csv/
-* @version 9.0.0
+* @version 9.0.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
@@ -4,7 +4,7 @@
 *
 * @license http://opensource.org/licenses/MIT
 * @link https://github.com/thephpleague/csv/
-* @version 9.0.0
+* @version 9.0.1
 * @package League.csv
 *
 * For the full copyright and license information, please view the LICENSE
@@ -125,7 +125,7 @@ public function insertOne(array $record): int
     {
         $record = array_reduce($this->formatters, [$this, 'formatRecord'], $record);
         $this->validateRecord($record);
-        $bytes = $this->document->fputcsv($record, ...$this->document->getCsvControl());
+        $bytes = $this->document->fputcsv($record, $this->delimiter, $this->enclosure, $this->escape);
         if (!$bytes) {
             throw CannotInsertRecord::triggerOnInsertion($record);
         }

diff --git a/src/XMLConverter.php b/src/XMLConverter.php
@@ -4,7 +4,7 @@
 *
 * @license http://opensource.org/licenses/MIT
 * @link https://github.com/thephpleague/csv/
-* @version 9.0.0
+* @version 9.0.1
 * @package League.csv
 *
 * For the full copyright and license information, please view the LICENSE

diff --git a/src/functions.php b/src/functions.php
@@ -4,7 +4,7 @@
 *
 * @license http://opensource.org/licenses/MIT
 * @link https://github.com/thephpleague/csv/
-* @version 9.0.0
+* @version 9.0.1
 * @package League.csv
 *
 * For the full copyright and license information, please view the LICENSE

diff --git a/tests/WriterTest.php b/tests/WriterTest.php
@@ -152,6 +152,7 @@ public function testToString()
     {
         $fp = fopen('php://temp', 'r+');
         $csv = Writer::createFromStream($fp);
+        $csv->setDelimiter('|');
 
         $expected = [
             ['john', 'doe', '[email protected]'],
@@ -162,7 +163,7 @@ public function testToString()
             $csv->insertOne($row);
         }
 
-        $expected = "john,doe,[email protected]\njane,doe,[email protected]\n";
+        $expected = "john|doe|[email protected]\njane|doe|[email protected]\n";
         $this->assertSame($expected, $csv->__toString());
         $csv = null;
         fclose($fp);