From 0953616c22f2a45135db7ee66d81187132f6f2f6 Mon Sep 17 00:00:00 2001 From: Sergei Predvoditelev Date: Thu, 27 Jul 2023 13:28:56 +0300 Subject: [PATCH 1/3] Fix incorrect split UTF-8 strings (#105) --- CHANGELOG.md | 2 +- src/StringHelper.php | 2 +- tests/StringHelperTest.php | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 671e77b..15b0c84 100644 --- 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 index 46681ad..6f297ee 100644 --- 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 index a2b15da..4f16c46 100644 --- a/tests/StringHelperTest.php +++ b/tests/StringHelperTest.php @@ -407,6 +407,10 @@ public function dataSplit(): array "\0\nA\nB", ["\0", 'A', 'B'], ], + [ + "технический\nдолг", + ['технический', 'долг'], + ], ]; } From eecd1874fe92933de1da2d6a0f7d6d1c4855450a Mon Sep 17 00:00:00 2001 From: Sergei Predvoditelev Date: Thu, 27 Jul 2023 10:35:49 +0000 Subject: [PATCH 2/3] Release version 2.1.2 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 15b0c84..d1bd619 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Yii Strings Change Log -## 2.1.2 under development +## 2.1.2 July 27, 2023 - Bug #105: Fix incorrect split UTF-8 strings in `StringHelper::split()` method (@vjik) From 574a80296e193572ed8d3f7bedf99748e73ee627 Mon Sep 17 00:00:00 2001 From: Sergei Predvoditelev Date: Thu, 27 Jul 2023 10:35:52 +0000 Subject: [PATCH 3/3] Prepare for next release --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d1bd619..0929f92 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Yii Strings Change Log +## 2.1.3 under development + +- no changes in this release. + ## 2.1.2 July 27, 2023 - Bug #105: Fix incorrect split UTF-8 strings in `StringHelper::split()` method (@vjik)