Require ext-iconv (#248)

ddeboer · Oct 17, 2017 · 58b1c7b · 58b1c7b
1 parent ac05f4a
commit 58b1c7b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 34 deletions.
diff --git a/README.md b/README.md
@@ -8,7 +8,9 @@
 
 A PHP 7.0+ library to read and process e-mails over IMAP.
 
-This library requires both [IMAP](https://secure.php.net/manual/en/book.imap.php) and [Multibyte String](https://secure.php.net/manual/en/book.mbstring.php) extensions installed.
+This library requires [IMAP](https://secure.php.net/manual/en/book.imap.php),
+[iconv](https://secure.php.net/manual/en/book.iconv.php) and
+[Multibyte String](https://secure.php.net/manual/en/book.mbstring.php) extensions installed.
 
 ## Table of Contents
 

diff --git a/composer.json b/composer.json
@@ -19,6 +19,7 @@
     ],
     "require": {
         "php": "^7.0",
+        "ext-iconv": "*",
         "ext-imap": "*",
         "ext-mbstring": "*"
     },

diff --git a/src/Message/Transcoder.php b/src/Message/Transcoder.php
@@ -247,7 +247,15 @@ public static function decode(string $text, string $fromCharset): string
             $fromCharset = self::$charsetAliases[$lowercaseFromCharset];
         }
 
-        $iconvDecodedText = self::iconvDecode($text, $originalFromCharset, $fromCharset);
+        \set_error_handler(function () {});
+
+        $iconvDecodedText = \iconv($fromCharset, 'UTF-8', $text);
+        if (false === $iconvDecodedText) {
+            $iconvDecodedText = \iconv($originalFromCharset, 'UTF-8', $text);
+        }
+
+        \restore_error_handler();
+
         if (false !== $iconvDecodedText) {
             return $iconvDecodedText;
         }
@@ -274,36 +282,4 @@ public static function decode(string $text, string $fromCharset): string
 
         return $decodedText;
     }
-
-    /**
-     * Decode text to UTF-8 with iconv.
-     *
-     * @param string $text                Text to decode
-     * @param string $originalFromCharset Original charset
-     * @param string $fromCharset         Aliased charset
-     *
-     * @return bool|string
-     */
-    private static function iconvDecode($text, $originalFromCharset, $fromCharset)
-    {
-        static $iconvLoaded;
-        if (null === $iconvLoaded) {
-            $iconvLoaded = \function_exists('iconv');
-        }
-
-        if (false === $iconvLoaded) {
-            return false;
-        }
-
-        \set_error_handler(function () {});
-
-        $iconvDecodedText = \iconv($fromCharset, 'UTF-8', $text);
-        if (false === $iconvDecodedText) {
-            $iconvDecodedText = \iconv($originalFromCharset, 'UTF-8', $text);
-        }
-
-        \restore_error_handler();
-
-        return $iconvDecodedText;
-    }
 }