Merge branch 'master' of github.com:Codeception/Codeception

jinglish · Mar 1, 2016 · fd36780 · fd36780
2 parents 9e3818d + 8cfbe9b
commit fd36780
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/Codeception/Step.php b/src/Codeception/Step.php
@@ -100,14 +100,14 @@ public function getArgumentsAsString($maxLength = 200)
         foreach ($arguments as $key => $argument) {
             $stringifiedArgument = $this->stringifyArgument($argument);
             $arguments[$key] = $stringifiedArgument;
-            $totalLength += strlen($stringifiedArgument);
+            $totalLength += mb_strlen($stringifiedArgument, 'utf-8');
         }
 
         if ($totalLength > $maxLength) {
             //sort arguments from shortest to longest
             uasort($arguments, function($arg1, $arg2) {
-                $length1 = strlen($arg1);
-                $length2 = strlen($arg2);
+                $length1 = mb_strlen($arg1, 'utf-8');
+                $length2 = mb_strlen($arg2, 'utf-8');
                 if ($length1 === $length2) {
                     return 0;
                 }

diff --git a/tests/unit/Codeception/StepTest.php b/tests/unit/Codeception/StepTest.php
@@ -82,4 +82,11 @@ public function testSeeUppercaseText()
         $output = $step->toString(200);
         $this->assertEquals('see "UPPER CASE"', $output);
     }
+
+    public function testMultiByteTextLengthIsMeasuredCorrectly()
+    {
+        $step = $this->getStep(['see', ['ŽŽŽŽŽŽŽŽŽŽ', 'AAAAAAAAAAA']]);
+        $output = $step->toString(30);
+        $this->assertEquals('see "ŽŽŽŽŽŽŽŽŽŽ","AAAAAAAAAAA"', $output);
+    }
 }