Fix strlen for fullwidth characters (webmozarts#78)

Affected assertions: - length - minLength - maxLength - lengthBetween Closes webmozarts#55
tomaszhanc · Jun 24, 2019 · 2bff8aa · 2bff8aa
1 parent 08ed54d
commit 2bff8aa
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/Assert.php b/src/Assert.php
@@ -1194,7 +1194,7 @@ protected static function strlen($value)
             return strlen($value);
         }
 
-        return mb_strwidth($value, $encoding);
+        return mb_strlen($value, $encoding);
     }
 
     protected static function reportInvalidArgument($message)

diff --git a/tests/AssertTest.php b/tests/AssertTest.php
@@ -263,18 +263,27 @@ public function getTests()
             array('length', array('äbcd', 4), true, true),
             array('length', array('äbc', 4), false, true),
             array('length', array('äbcde', 4), false, true),
+            array('length', array('あbcd', 4), true, true), // 'HIRAGANA LETTER A' (U+3042)
+            array('length', array('あbc', 4), false, true),
+            array('length', array('あbcde', 4), false, true),
             array('minLength', array('abcd', 4), true),
             array('minLength', array('abcde', 4), true),
             array('minLength', array('abc', 4), false),
             array('minLength', array('äbcd', 4), true, true),
             array('minLength', array('äbcde', 4), true, true),
             array('minLength', array('äbc', 4), false, true),
+            array('minLength', array('あbcd', 4), true, true),
+            array('minLength', array('あbcde', 4), true, true),
+            array('minLength', array('あbc', 4), false, true),
             array('maxLength', array('abcd', 4), true),
             array('maxLength', array('abc', 4), true),
             array('maxLength', array('abcde', 4), false),
             array('maxLength', array('äbcd', 4), true, true),
             array('maxLength', array('äbc', 4), true, true),
             array('maxLength', array('äbcde', 4), false, true),
+            array('maxLength', array('あbcd', 4), true, true),
+            array('maxLength', array('あbc', 4), true, true),
+            array('maxLength', array('あbcde', 4), false, true),
             array('lengthBetween', array('abcd', 3, 5), true),
             array('lengthBetween', array('abc', 3, 5), true),
             array('lengthBetween', array('abcde', 3, 5), true),
@@ -285,6 +294,11 @@ public function getTests()
             array('lengthBetween', array('äbcde', 3, 5), true, true),
             array('lengthBetween', array('äb', 3, 5), false, true),
             array('lengthBetween', array('äbcdef', 3, 5), false, true),
+            array('lengthBetween', array('あbcd', 3, 5), true, true),
+            array('lengthBetween', array('あbc', 3, 5), true, true),
+            array('lengthBetween', array('あbcde', 3, 5), true, true),
+            array('lengthBetween', array('あb', 3, 5), false, true),
+            array('lengthBetween', array('あbcdef', 3, 5), false, true),
             array('fileExists', array(__FILE__), true),
             array('fileExists', array(__DIR__), true),
             array('fileExists', array(__DIR__.'/foobar'), false),