Skip to content

Commit afd71c5

Browse files
Rely on iconv and symfony/polyfill-*
1 parent 62d6d34 commit afd71c5

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

Command/TranslationDebugCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ private function sanitizeString($string, $length = 40)
240240
{
241241
$string = trim(preg_replace('/\s+/', ' ', $string));
242242

243-
if (function_exists('mb_strlen') && false !== $encoding = mb_detect_encoding($string)) {
243+
if (false !== $encoding = mb_detect_encoding($string, null, true)) {
244244
if (mb_strlen($string, $encoding) > $length) {
245245
return mb_substr($string, 0, $length - 3, $encoding).'...';
246246
}

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"symfony/event-dispatcher": "~2.8|~3.0.0",
2525
"symfony/http-foundation": "~2.4.9|~2.5,>=2.5.4|~3.0.0",
2626
"symfony/http-kernel": "~2.8",
27+
"symfony/polyfill-mbstring": "~1.0",
2728
"symfony/filesystem": "~2.3|~3.0.0",
2829
"symfony/routing": "~2.8|~3.0.0",
2930
"symfony/security-core": "~2.6|~3.0.0",
@@ -40,7 +41,7 @@
4041
"symfony/css-selector": "~2.0,>=2.0.5|~3.0.0",
4142
"symfony/dom-crawler": "~2.0,>=2.0.5|~3.0.0",
4243
"symfony/finder": "~2.0,>=2.0.5|~3.0.0",
43-
"symfony/intl": "~2.3|~3.0.0",
44+
"symfony/polyfill-intl-icu": "~1.0",
4445
"symfony/security": "~2.6|~3.0.0",
4546
"symfony/form": "~2.8",
4647
"symfony/expression-language": "~2.6|~3.0.0",

0 commit comments

Comments
 (0)