bug #57497 [String] Fixed u()->snake(), b()->snake() and s()->snake() methods (arczinosek)

nicolas-grekas · nicolas-grekas · commit 6517957b7950 · 2024-06-28T11:20:55.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [String] Fixed u()->snake(), b()->snake() and s()->snake() methods | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #57464 | License | MIT [String] ByteString::snake and AbstractUnitcodeString::snake methods doesn't convert all uppercase words in the right way. For example, string "GREAT SYMFONY" is converted to "greatsymfony" instead of "great_symfony". Commits ------- f93113e [String] Fix *String::snake methods
diff --git a/src/Symfony/Component/String/AbstractUnicodeString.php b/src/Symfony/Component/String/AbstractUnicodeString.php
@@ -366,8 +366,8 @@ public function reverse(): parent
 
     public function snake(): parent
     {
-        $str = $this->camel();
-        $str->string = mb_strtolower(preg_replace(['/(\p{Lu}+)(\p{Lu}\p{Ll})/u', '/([\p{Ll}0-9])(\p{Lu})/u'], '\1_\2', $str->string), 'UTF-8');
+        $str = clone $this;
+        $str->string = str_replace(' ', '_', mb_strtolower(preg_replace(['/(\p{Lu}+)(\p{Lu}\p{Ll})/u', '/([\p{Ll}0-9])(\p{Lu})/u'], '\1 \2', $str->string), 'UTF-8'));
 
         return $str;
     }
diff --git a/src/Symfony/Component/String/ByteString.php b/src/Symfony/Component/String/ByteString.php
@@ -366,8 +366,8 @@ public function slice(int $start = 0, ?int $length = null): parent
 
     public function snake(): parent
     {
-        $str = $this->camel();
-        $str->string = strtolower(preg_replace(['/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'], '\1_\2', $str->string));
+        $str = clone $this;
+        $str->string = str_replace(' ', '_', strtolower(preg_replace(['/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'], '\1 \2', $str->string)));
 
         return $str;
     }
diff --git a/src/Symfony/Component/String/Tests/AbstractAsciiTestCase.php b/src/Symfony/Component/String/Tests/AbstractAsciiTestCase.php
@@ -1077,6 +1077,8 @@ 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'],
         ];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -366,8 +366,8 @@ public function reverse(): parent`
`366`	`366`
`367`	`367`	`public function snake(): parent`
`368`	`368`	`{`
`369`		`- $str = $this->camel();`
`370`		`- $str->string = mb_strtolower(preg_replace(['/(\p{Lu}+)(\p{Lu}\p{Ll})/u', '/([\p{Ll}0-9])(\p{Lu})/u'], '\1_\2', $str->string), 'UTF-8');`
	`369`	`+ $str = clone $this;`
	`370`	`+ $str->string = str_replace(' ', '_', mb_strtolower(preg_replace(['/(\p{Lu}+)(\p{Lu}\p{Ll})/u', '/([\p{Ll}0-9])(\p{Lu})/u'], '\1 \2' 8000 , $str->string), 'UTF-8'));`
`371`	`371`
`372`	`372`	`return $str;`
`373`	`373`	`}`
Original file line number	Diff line number	Diff line change
`@@ -366,8 +366,8 @@ public function slice(int $start = 0, ?int $length = null): parent`
`366`	`366`
`367`	`367`	`public function snake(): parent`
`368`	`368`	`{`
`369`		`- $str = $this->camel();`
`370`		`- $str->string = strtolower(preg_replace(['/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'], '\1_\2', $str->string));`
	`369`	`+ $str = clone $this;`
	`370`	`+ $str->string = str_replace(' ', '_', strtolower(preg_replace(['/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'], '\1 \2', $str->string)));`
`371`	`371`
`372`	`372`	`return $str;`
`373`	`373`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1077,6 +1077,8 @@ public static function provideSnake()`
`1077`	`1077`	`['symfony_is_great', 'symfonyIsGREAT'],`
`1078`	`1078`	`['symfony_is_really_great', 'symfonyIsREALLYGreat'],`
`1079`	`1079`	`['symfony', 'SYMFONY'],`
	`1080`	`+ ['symfony_is_great', 'SYMFONY IS GREAT'],`
	`1081`	`+ ['symfony_is_great', 'SYMFONY_IS_GREAT'],`
`1080`	`1082`	`];`
`1081`	`1083`	`}`
`1082`	`1084`