[Mbstring] The first arg of mb_convert_encoding can be an array

Author: alanpoulain

src/Mbstring/Mbstring.php

@@ -82,6 +82,21 @@ final class Mbstring
 
     public static function mb_convert_encoding($s, $toEncoding, $fromEncoding = null)
     {
+        if (\is_array($s)) {
+            if (PHP_VERSION_ID < 70200) {
+                trigger_error('mb_convert_encoding() expects parameter 1 to be string, array given', \E_USER_WARNING);
+
+                return null;
+            }
+
+            $r = [];
+            foreach ($s as $str) {
+                $r[] = self::mb_convert_encoding($str, $toEncoding, $fromEncoding);
+            }
+
+            return $r;
+        }
+
         if (\is_array($fromEncoding) || (null !== $fromEncoding && false !== strpos($fromEncoding, ','))) {
             $fromEncoding = self::mb_detect_encoding($s, $fromEncoding);
         } else {

tests/Mbstring/MbstringTest.php

@@ -75,6 +75,21 @@ public function testConvertEncoding()
         $this->assertSame('déjà', mb_convert_encoding('déjà', 'Utf-8', 'Html-entities'));
         $this->assertSame('déjà', mb_convert_encoding(utf8_decode('déjà'), 'Utf-8', 'ASCII,ISO-2022-JP,UTF-8,ISO-8859-1'));
         $this->assertSame('déjà', mb_convert_encoding(utf8_decode('déjà'), 'Utf-8', ['ASCII', 'ISO-2022-JP', 'UTF-8', 'ISO-8859-1']));
+        $this->assertSame(['déjà', 'là'], mb_convert_encoding(['déjà', 'là'], 'Utf-8', 'Html-entities'));
+    }
+
+    /**
+     * @covers \Symfony\Polyfill\Mbstring\Mbstring::mb_convert_encoding
+     *
+     * @requires PHP < 7.2
+     */
+    public function testConvertEncodingWithArrayValueForPhpLessThan72()
+    {
+        $errorMessage = null;
+        set_error_handler(function ($type, $msg, $file, $line) use (&$errorMessage) { $errorMessage = \E_USER_WARNING === $type || \E_WARNING === $type ? $msg : null; });
+        $this->assertNull(mb_convert_encoding(['d&eacute;j&#224;', 'l&#224;'], 'Utf-8', 'Html-entities'));
+        restore_error_handler();
+        $this->assertSame('mb_convert_encoding() expects parameter 1 to be string, array given', $errorMessage);
     }
 
     /**