Merge branch '2.3' into 2.4

* 2.3: Explicitly define the encoding.
symfony · May 14, 2014 · 24f7234 · 24f7234
2 parents af0d8ea + c6c5a35
commit 24f7234
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/Application.php b/Application.php
@@ -1124,7 +1124,7 @@ private function splitStringByWidth($string, $width)
         $line = '';
         foreach (preg_split('//u', $utf8String) as $char) {
             // test if $char could be appended to current line
-            if (mb_strwidth($line.$char) <= $width) {
+            if (mb_strwidth($line.$char, 'utf8') <= $width) {
                 $line .= $char;
                 continue;
             }

diff --git a/Tests/Fixtures/application_renderexception_doublewidth2.txt b/Tests/Fixtures/application_renderexception_doublewidth2.txt
@@ -1,11 +1,10 @@
 
 
-
-  [Exception]                
-  コマンドの実行中に         
-  エラーが発生しまし         
-  た。                       
-
+
+  [Exception]                 
+  コマンドの実行中にエラーが  
+  発生しました。              
+
 
 
 foo