setCharset / getCharset() added

jeroendesloovere · Jul 23, 2015 · cb40209 · cb40209
1 parent a48dfe5
commit cb40209
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+1.2.1 (2015-07-23)
+--
+Improvements:
+* You can now set the charset by using $vcard->setCharset('ISO-8859-1');
+
 1.2.0 (2015-06-01)
 --
 Improvements:

diff --git a/src/VCard.php b/src/VCard.php
@@ -477,6 +477,16 @@ public function get()
         return $this->getOutput();
     }
 
+    /**
+     * Get charset
+     *
+     * @return string
+     */
+    public function getCharset()
+    {
+        return $this->charset;
+    }
+
     /**
      * Get content type
      *
@@ -517,7 +527,7 @@ public function getFileExtension()
      */
     public function getHeaders($asAssociative)
     {
-        $contentType        = $this->getContentType() . '; charset=' . $this->charset;
+        $contentType        = $this->getContentType() . '; charset=' . $this->getCharset();
         $contentDisposition = 'attachment; filename=' . $this->getFilename() . '.' . $this->getFileExtension();
         $contentLength      = strlen($this->getOutput());
         $connection         = 'close';
@@ -619,6 +629,17 @@ public function save()
         );
     }
 
+    /**
+     * Set charset
+     *
+     * @param  mixed  $charset
+     * @return void
+     */
+    public function setCharset($charset)
+    {
+        $this->charset = $charset;
+    }
+
     /**
      * Set filename
      *

diff --git a/tests/VCardTest.php b/tests/VCardTest.php
@@ -154,6 +154,16 @@ public function testAddPhotoWithNoPhoto()
         $this->vcard->addPhoto(__DIR__ . '/wrongfile', true);
     }
 
+    /**
+     * Test charset
+     */
+    public function testCharset()
+    {
+        $charset = 'ISO-8859-1';
+        $this->vcard->setCharset($charset);
+        $this->assertEquals($charset, $this->vcard->getCharset());
+    }
+
     /**
      * Test Email
      *