Replace iconv_*() uses by mb_*(), add mbstring polyfill when required

nicolas-grekas · nicolas-grekas · commit 02d2e2bd4b06 · 2016-04-14T09:48:17.000+02:00
diff --git a/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php b/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php
@@ -95,8 +95,8 @@ private function normalizeParams(array $params)
             }
 
             // detect if the too long string must be shorten
-            if (self::MAX_STRING_LENGTH < iconv_strlen($params[$index], 'UTF-8')) {
-                $params[$index] = iconv_substr($params[$index], 0, self::MAX_STRING_LENGTH - 6, 'UTF-8').' [...]';
+            if (self::MAX_STRING_LENGTH < mb_strlen($params[$index], 'UTF-8')) {
+                $params[$index] = mb_substr($params[$index], 0, self::MAX_STRING_LENGTH - 6, 'UTF-8').' [...]';
                 continue;
             }
         }
diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
@@ -17,7 +17,8 @@
     ],
     "require": {
         "php": ">=5.3.9",
-        "doctrine/common": "~2.4"
+        "doctrine/common": "~2.4",
+        "symfony/polyfill-mbstring": "~1.0"
     },
     "require-dev": {
         "symfony/stopwatch": "~2.2|~3.0.0",
diff --git a/src/Symfony/Component/Validator/Constraints/LengthValidator.php b/src/Symfony/Component/Validator/Constraints/LengthValidator.php
@@ -39,12 +39,7 @@ public function validate($value, Constraint $constraint)
         }
 
         $stringValue = (string) $value;
-
-        if ('UTF8' === $charset = strtoupper($constraint->charset)) {
-            $charset = 'UTF-8'; // iconv on Windows requires "UTF-8" instead of "UTF8"
-        }
-
-        $length = @iconv_strlen($stringValue, $charset);
+        $length = @mb_strlen($stringValue, $charset);
         $invalidCharset = false === $length;
 
         if ($invalidCharset) {
diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json
@@ -17,6 +17,7 @@
     ],
     "require": {
         "php": ">=5.3.9",
+        "symfony/polyfill-mbstring": "~1.0",
         "symfony/translation": "~2.4|~3.0.0"
     },
     "require-dev": {
diff --git a/src/Symfony/Component/VarDumper/Cloner/VarCloner.php b/src/Symfony/Component/VarDumper/Cloner/VarCloner.php
@@ -102,12 +102,12 @@ protected function doClone($var)
                             } else {
                                 $stub->value = $v;
                             }
-                        } elseif (0 <= $maxString && isset($v[1 + ($maxString >> 2)]) && 0 < $cut = iconv_strlen($v, 'UTF-8') - $maxString) {
+                        } elseif (0 <= $maxString && isset($v[1 + ($maxString >> 2)]) && 0 < $cut = mb_strlen($v, 'UTF-8') - $maxString) {
                             $stub = new Stub();
                             $stub->type = Stub::TYPE_STRING;
                             $stub->class = Stub::STRING_UTF8;
                             $stub->cut = $cut;
-                            $stub->value = iconv_substr($v, 0, $maxString, 'UTF-8');
+                            $stub->value = mb_substr($v, 0, $maxString, 'UTF-8');
                         }
                         break;
 
diff --git a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
@@ -169,7 +169,7 @@ public function dumpString(Cursor $cursor, $str, $bin, $cut)
             $this->dumpLine($cursor->depth, true);
         } else {
             $attr = array(
-                'length' => 0 <= $cut ? iconv_strlen($str, 'UTF-8') + $cut : 0,
+                'length' => 0 <= $cut ? mb_strlen($str, 'UTF-8') + $cut : 0,
                 'binary' => $bin,
             );
             $str = explode("\n", $str);
@@ -195,8 +195,8 @@ public function dumpString(Cursor $cursor, $str, $bin, $cut)
                 if ($i < $m) {
                     $str .= "\n";
                 }
-                if (0 < $this->maxStringWidth && $this->maxStringWidth < $len = iconv_strlen($str, 'UTF-8')) {
-                    $str = iconv_substr($str, 0, $this->maxStringWidth, 'UTF-8');
+                if (0 < $this->maxStringWidth && $this->maxStringWidth < $len = mb_strlen($str, 'UTF-8')) {
+                    $str = mb_substr($str, 0, $this->maxStringWidth, 'UTF-8');
                     $lineCut = $len - $this->maxStringWidth;
                 }
                 if ($m && 0 < $cursor->depth) {

Original file line number	Diff line number	Diff line change
`@@ -95,8 +95,8 @@ private function normalizeParams(array $params)`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`// detect if the too long string must be shorten`
`98`		`- if (self::MAX_STRING_LENGTH < iconv_strlen($params[$index], 'UTF-8')) {`
`99`		`- $params[$index] = iconv_substr($params[$index], 0, self::MAX_STRING_LENGTH - 6, 'UTF-8').' [...]';`
	`98`	`+ if (self::MAX_STRING_LENGTH < mb_strlen($params[$index], 'UTF-8')) {`
	`99`	`+ $params[$index] = mb_substr($params[$index], 0, self::MAX_STRING_LENGTH - 6, 'UTF-8').' [...]';`
`100`	`100`	`continue;`
`101`	`101`	`}`
`102`	`102`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,12 +102,12 @@ protected function doClone($var)`
`102`	`102`	`} else {`
`103`	`103`	`$stub->value = $v;`
`104`	`104`	`}`
`105`		`- } elseif (0 <= $maxString && isset($v[1 + ($maxString >> 2)]) && 0 < $cut = iconv_strlen($v, 'UTF-8') - $maxString) {`
	`105`	`+ } elseif (0 <= $maxString && isset($v[1 + ($maxString >> 2)]) && 0 < $cut = mb_strlen($v, 'UTF-8') - $maxString) {`
`106`	`106`	`$stub = new Stub();`
`107`	`107`	`$stub->type = Stub::TYPE_STRING;`
`108`	`108`	`$stub->class = Stub::STRING_UTF8;`
`109`	`109`	`$stub->cut = $cut;`
`110`		`- $stub->value = iconv_substr($v, 0, $maxString, 'UTF-8');`
	`110`	`+ $stub->value = mb_substr($v, 0, $maxString, 'UTF-8');`
`111`	`111`	`}`
`112`	`112`	`break;`
`113`	`113`