Fix incorrect split UTF-8 strings (#105)

yiisoft · Jul 27, 2023 · 0953616 · 0953616
1 parent 2d206ff
commit 0953616
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## 2.1.2 under development
 
-- no changes in this release.
+- Bug #105: Fix incorrect split UTF-8 strings in `StringHelper::split()` method (@vjik)
 
 ## 2.1.1 April 28, 2023
 

diff --git a/src/StringHelper.php b/src/StringHelper.php
@@ -496,7 +496,7 @@ public static function base64UrlDecode(string $input): string
     public static function split(string $string, string $separator = '\R'): array
     {
         $string = preg_replace('(^\s*|\s*$)', '', $string);
-        return preg_split('~\s*' . $separator . '\s*~', $string, -1, PREG_SPLIT_NO_EMPTY);
+        return preg_split('~\s*' . $separator . '\s*~u', $string, -1, PREG_SPLIT_NO_EMPTY);
     }
 
     /**

diff --git a/tests/StringHelperTest.php b/tests/StringHelperTest.php
@@ -407,6 +407,10 @@ public function dataSplit(): array
                 "\0\nA\nB",
                 ["\0", 'A', 'B'],
             ],
+            [
+                "технический\nдолг",
+                ['технический', 'долг'],
+            ],
         ];
     }