Add unsupported encoding test for iconv

Author: ddeboer

src/Exception/UnsupportedEncodingException.php

@@ -4,8 +4,13 @@
 
 class UnsupportedEncodingException extends \RuntimeException
 {
-    public function __construct($encoding)
+    public function __construct($encoding, $message = null)
     {
-        parent::__construct(sprintf('Encoding %s is unsupported on this platform', $encoding));
+        $error = sprintf('Encoding %s is unsupported on this platform', $encoding);
+        if ($message) {
+            $error .= ': ' . $message;
+        }
+        
+        return parent::__construct($error);
     }
 }

src/IconvTranscoder.php

@@ -4,6 +4,7 @@
 
 use Ddeboer\Transcoder\Exception\ExtensionMissingException;
 use Ddeboer\Transcoder\Exception\IllegalCharacterException;
+use Ddeboer\Transcoder\Exception\UnsupportedEncodingException;
 
 class IconvTranscoder implements TranscoderInterface
 {
@@ -25,7 +26,11 @@ public function transcode($string, $from = null, $to = null)
     {
         set_error_handler(
             function ($no, $message) use ($string) {
-                throw new IllegalCharacterException($string, $message);
+                if (1 === preg_match('/Wrong charset, conversion (.+) is/', $message, $matches)) {
+                    throw new UnsupportedEncodingException($matches[1], $message);
+                } else {
+                    throw new IllegalCharacterException($string, $message);
+                }
             },
             E_NOTICE | E_USER_NOTICE
         );

src/Transcoder.php

@@ -2,6 +2,7 @@
 
 namespace Ddeboer\Transcoder;
 
+use Ddeboer\Transcoder\Exception\ExtensionMissingException;
 use Ddeboer\Transcoder\Exception\UnsupportedEncodingException;
 
 class Transcoder implements TranscoderInterface
@@ -18,13 +19,16 @@ public function __construct(array $transcoders)
         $this->transcoders = $transcoders;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function transcode($string, $from = null, $to = null)
     {
         foreach ($this->transcoders as $transcoder) {
             try {
                 return $transcoder->transcode($string, $from, $to);
             } catch (UnsupportedEncodingException $e) {
-                
+                // Ignore as long as the fallback transcoder is all right
             }
         }
 
@@ -51,12 +55,13 @@ public static function create($defaultEncoding = 'UTF-8')
         try {
             $transcoders[] = new MbTranscoder($defaultEncoding);
         } catch (ExtensionMissingException $mb) {
-            // Ignore missing mbstring extension; fallback to iconv
+            // Ignore missing mbstring extension; fall back to iconv
         }
 
         try {
             $transcoders[] = new IconvTranscoder($defaultEncoding);
         } catch (ExtensionMissingException $iconv) {
+            // Neither mbstring nor iconv
             throw $iconv;
         }
 

tests/IconvTranscoderTest.php

@@ -15,10 +15,19 @@ protected function setUp()
     {
         $this->transcoder = new IconvTranscoder();
     }
-
+    
+    /**
+     * @expectedException \Ddeboer\Transcoder\Exception\UnsupportedEncodingException
+     * @expectedExceptionMessage bad-encoding
+     */
+    public function testTranscodeUnsupportedFromEncoding()
+    {
+        $this->transcoder->transcode('bla', 'bad-encoding');
+    }
+    
     public function testDetectEncoding()
     {
-        $this->transcoder->transcode('España', "UTF-8", 'iso-8859-1');
+        $this->transcoder->transcode('España', null, 'iso-8859-1');
     }
 
     /**