Skip to content

Commit 175fce1

Browse files
Merge branch '3.0'
* 3.0: [DI] Fix internal caching in AutowirePass [PropertyInfo] Remove useless return statement [Console] use ANSI escape sequences in ProgressBar overwrite method [HttpKernel] Fix wrong number of arguments in call of ExceptionListener::logException() Replace iconv_*() uses by mb_*(), add mbstring polyfill when required [DependencyInjection] Remove YAML check in CrossCheckTest [Process] Consistently use getProcess() in tests [LDAP] Free the search result after a search to free memory [DependencyInjection] fix phpDoc Conflicts: src/Symfony/Component/Ldap/LdapClient.php
2 parents a369c42 + 7510163 commit 175fce1

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

Logger/DbalLogger.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ private function normalizeParams(array $params)
9595
}
9696

9797
// 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').' [...]';
100100
continue;
101101
}
102102
}

composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,13 @@
1717
],
1818
"require": {
1919
"php": ">=5.5.9",
20-
"doctrine/common": "~2.4"
20+
"doctrine/common": "~2.4",
21+
"symfony/polyfill-mbstring": "~1.0"
2122
},
2223
"require-dev": {
2324
"symfony/stopwatch": "~2.8|~3.0",
2425
"symfony/dependency-injection": "~2.8|~3.0",
25-
"symfony/form": "~3.0,>3.0-BETA1",
26+
"symfony/form": "~3.0",
2627
"symfony/http-kernel": "~2.8|~3.0",
2728
"symfony/property-access": "~2.8|~3.0",
2829
"symfony/property-info": "~2.8|3.0",

0 commit comments

Comments
 (0)