Merge branch '7.4' into 8.0

nicolas-grekas · nicolas-grekas · commit 89098b74655f · 2025-06-26T09:49:56.000+02:00
* 7.4: fix package name in deprecation message [Intl] Fix locale validator when canonicalize is true Update GitHub PR template [FrameworkBundle] also deprecate the internal rate limiter factory alias also deprecate the internal rate limiter factory alias [FrameworkBundle] Allow using their name without added suffix when using #[Target] for custom services [String] Leverage grapheme_str_split() [Notifier] Update fake SMS transports to use contracts event dispatcher. [Console] Cleanup test [Security] Document `FirewallListenerInterface` as a firewall listener type [VarDumper] Remove duplicate default caster for Socket WS fix Remove unused and non-existent Factory attribute use Move property accessor phpdoc to interface fix: twigphp/Twig/issues/4647
diff --git a/AbstractUnicodeString.php b/AbstractUnicodeString.php
@@ -360,7 +360,7 @@ public function replaceMatches(string $fromRegexp, string|callable $to): static
     public function reverse(): static
     {
         $str = clone $this;
-        $str->string = implode('', array_reverse(preg_split('/(\X)/u', $str->string, -1, \PREG_SPLIT_DELIM_CAPTURE | \PREG_SPLIT_NO_EMPTY)));
+        $str->string = implode('', array_reverse(grapheme_str_split($str->string)));
 
         return $str;
     }
diff --git a/Tests/AbstractUnicodeTestCase.php b/Tests/AbstractUnicodeTestCase.php
@@ -751,7 +751,7 @@ public static function provideReverse()
             [
                 ['äuß⭐erst', 'tsre⭐ßuä'],
                 ['漢字ーユニコードéèΣσς', 'ςσΣèéドーコニユー字漢'],
-                ['नमस्ते', 'तेस्मन'],
+                // ['नमस्ते', 'तेस्मन'], this case requires a version of intl that supports Unicode 15.1
             ]
         );
     }
diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": ">=8.4",
         "symfony/polyfill-ctype": "^1.8",
-        "symfony/polyfill-intl-grapheme": "^1.0",
+        "symfony/polyfill-intl-grapheme": "^1.33",
         "symfony/polyfill-intl-normalizer": "^1.0",
         "symfony/polyfill-mbstring": "^1.0"
     },

Original file line number	Diff line number	Diff line change
`@@ -360,7 +360,7 @@ public function replaceMatches(string $fromRegexp, string\|callable $to): static`
`360`	`360`	`public function reverse(): static`
`361`	`361`	`{`
`362`	`362`	`$str = clone $this;`
`363`		`- $str->string = implode('', array_reverse(preg_split('/(\X)/u', $str->string, -1, \PREG_SPLIT_DELIM_CAPTURE \| \PREG_SPLIT_NO_EMPTY)));`
	`363`	`+ $str->string = implode('', array_reverse(grapheme_str_split($str->string)));`
`364`	`364`
`365`	`365`	`return $str;`
`366`	`366`	`}`
Original file line number	Diff line number	Diff line change
`@@ -751,7 +751,7 @@ public static function provideReverse()`
`751`	`751`	`[`
`752`	`752`	`['äuß⭐erst', 'tsre⭐ßuä'],`
`753`	`753`	`['漢字ーユニコードéèΣσς', 'ςσΣèéドーコニユー字漢'],`
`754`		`- ['नमस्ते', 'तेस्मन'],`
	`754`	`+ // ['नमस्ते', 'तेस्मन'], this case requires a version of intl that supports Unicode 15.1`
`755`	`755`	`]`
`756`	`756`	`);`
`757`	`757`	`}`