Merge pull request #102 from mRoca/master

Add UTF-8 encoding to CsvWriter
ddeboer · Apr 21, 2015 · cbae2f5 · cbae2f5
2 parents c84f6cc + bb09dfc
commit cbae2f5
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/src/Ddeboer/DataImport/Writer/CsvWriter.php b/src/Ddeboer/DataImport/Writer/CsvWriter.php
@@ -9,20 +9,35 @@ class CsvWriter extends AbstractStreamWriter
 {
     private $delimiter = ';';
     private $enclosure = '"';
+    private $utf8Encoding = false;
 
     /**
      * Constructor
      *
      * @param string   $delimiter The delimiter
      * @param string   $enclosure The enclosure
      * @param resource $stream
+     * @param bool     $utf8Encoding
      */
-    public function __construct($delimiter = ';', $enclosure = '"', $stream = null)
+    public function __construct($delimiter = ';', $enclosure = '"', $stream = null, $utf8Encoding = false)
     {
         parent::__construct($stream);
 
         $this->delimiter = $delimiter;
         $this->enclosure = $enclosure;
+        $this->utf8Encoding = $utf8Encoding;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function prepare()
+    {
+        if ($this->utf8Encoding) {
+            fprintf($this->getStream(), chr(0xEF) . chr(0xBB) . chr(0xBF));
+        }
+
+        return $this;
     }
 
     /**

diff --git a/tests/Ddeboer/DataImport/Tests/Writer/CsvWriterTest.php b/tests/Ddeboer/DataImport/Tests/Writer/CsvWriterTest.php
@@ -10,6 +10,7 @@ public function testWriteItem()
     {
         $writer = new CsvWriter(';', '"', $this->getStream());
 
+        $writer->prepare();
         $writer->writeItem(array('first', 'last'));
 
         $writer
@@ -29,6 +30,21 @@ public function testWriteItem()
         $writer->finish();
     }
 
+    public function testWriteUtf8Item()
+    {
+        $writer = new CsvWriter(';', '"', $this->getStream(), true);
+
+        $writer->prepare();
+        $writer->writeItem(array('Précédent', 'Suivant'));
+
+        $this->assertContentsEquals(
+            chr(0xEF) . chr(0xBB) . chr(0xBF) . "Précédent;Suivant\n",
+            $writer
+        );
+
+        $writer->finish();
+    }
+
     public function testFluentInterface()
     {
         $writer = new CsvWriter(';', '"', $this->getStream());