[String] Fix camel() method with unicode string

nicolas-grekas · nicolas-grekas · commit 4364734e39cb · 2024-07-01T14:40:20.000+02:00
diff --git a/src/Symfony/Component/String/AbstractUnicodeString.php b/src/Symfony/Component/String/AbstractUnicodeString.php
@@ -162,7 +162,7 @@ public function ascii(array $rules = []): self
     public function camel(): parent
     {
         $str = clone $this;
-        $str->string = str_replace(' ', '', preg_replace_callback('/\b.(?![A-Z]{2,})/u', static function ($m) use (&$i) {
+        $str->string = str_replace(' ', '', preg_replace_callback('/\b.(?!\p{Lu})/u', static function ($m) use (&$i) {
             return 1 === ++$i ? ('İ' === $m[0] ? 'i̇' : mb_strtolower($m[0], 'UTF-8')) : mb_convert_case($m[0], \MB_CASE_TITLE, 'UTF-8');
         }, preg_replace('/[^\pL0-9]++/u', ' ', $this->string)));
 
diff --git a/src/Symfony/Component/String/Tests/AbstractAsciiTestCase.php b/src/Symfony/Component/String/Tests/AbstractAsciiTestCase.php
@@ -1046,6 +1046,7 @@ public static function provideCamel()
             ['symfonyIsGreat', 'symfony_is_great'],
             ['symfony5IsGreat', 'symfony_5_is_great'],
             ['symfonyIsGreat', 'Symfony is great'],
+            ['SYMFONYISGREAT', 'SYMFONY_IS_GREAT'],
             ['symfonyIsAGreatFramework', 'Symfony is a great framework'],
             ['symfonyIsGREAT', '*Symfony* is GREAT!!'],
             ['SYMFONY', 'SYMFONY'],
@@ -1077,12 +1078,12 @@ public static function provideSnake()
             ['symfony_is_great', 'symfonyIsGREAT'],
             ['symfony_is_really_great', 'symfonyIsREALLYGreat'],
             ['symfony', 'SYMFONY'],
-            ['symfony_is_great', 'SYMFONY IS GREAT'],
-            ['symfony_is_great', 'SYMFONY_IS_GREAT'],
+            ['symfonyisgreat', 'SYMFONY IS GREAT'],
+            ['symfonyisgreat', 'SYMFONY_IS_GREAT'],
             ['symfony_is_great', 'symfony    is     great'],
-            ['symfony_is_great', 'SYMFONY    IS     GREAT'],
-            ['symfony_is_great', 'SYMFONY _ IS _ GREAT'],
-            ['symfony_is_great', 'Symfony IS GREAT!'],
+            ['symfonyisgreat', 'SYMFONY    IS     GREAT'],
+            ['symfonyisgreat', 'SYMFONY _ IS _ GREAT'],
+            ['symfony_isgreat', 'Symfony IS GREAT!'],
         ];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ public function ascii(array $rules = []): self`
`162`	`162`	`public function camel(): parent`
`163`	`163`	`{`
`164`	`164`	`$str = clone $this;`
`165`		`- $str->string = str_replace(' ', '', preg_replace_callback('/\b.(?![A-Z]{2,})/u', static function ($m) use (&$i) {`
	`165`	`+ $str->string = str_replace(' ', '', preg_replace_callback('/\b.(?!\p{Lu})/u', static function ($m) use (&$i) {`
`166`	`166`	`return 1 === ++$i ? ('İ' === $m[0] ? 'i̇' : mb_strtolower($m[0], 'UTF-8')) : mb_convert_case($m[0], \MB_CASE_TITLE, 'UTF-8');`
`167`	`167`	`}, preg_replace('/[^\pL0-9]++/u', ' ', $this->string)));`
`168`	`168`