[String] Fix snake conversion

simPod · simPod · commit 1416dbcc7b06 · 2022-08-04T16:15:09.000+02:00
diff --git a/src/Symfony/Component/String/AbstractUnicodeString.php b/src/Symfony/Component/String/AbstractUnicodeString.php
@@ -366,7 +366,7 @@ public function reverse(): parent
 
     public function snake(): parent
     {
-        $str = $this->camel()->title();
+        $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');
 
         return $str;
diff --git a/src/Symfony/Component/String/ByteString.php b/src/Symfony/Component/String/ByteString.php
@@ -363,7 +363,7 @@ public function slice(int $start = 0, int $length = null): parent
 
     public function snake(): parent
     {
-        $str = $this->camel()->title();
+        $str = $this->camel();
         $str->string = 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
@@ -1041,6 +1041,7 @@ public static function provideCamel()
     {
         return [
             ['', ''],
+            ['xY', 'x_y'],
             ['symfonyIsGreat', 'symfony_is_great'],
             ['symfony5IsGreat', 'symfony_5_is_great'],
             ['symfonyIsGreat', 'Symfony is great'],
@@ -1063,6 +1064,8 @@ public static function provideSnake()
     {
         return [
             ['', ''],
+            ['x_y', 'x_y'],
+            ['x_y', 'X_Y'],
             ['symfony_is_great', 'symfonyIsGreat'],
             ['symfony5_is_great', 'symfony5IsGreat'],
             ['symfony5is_great', 'symfony5isGreat'],

Original file line number	Diff line number	Diff line change
`@@ -366,7 +366,7 @@ public function reverse(): parent`
`366`	`366`
`367`	`367`	`public function snake(): parent`
`368`	`368`	`{`
`369`		`- $str = $this->camel()->title();`
	`369`	`+ $str = $this->camel();`
`370`	`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');`
`371`	`371`
`372`	`372`	`return $str;`
Original file line number	Diff line number	Diff line change
`@@ -363,7 +363,7 @@ public function slice(int $start = 0, int $length = null): parent`
`363`	`363`
`364`	`364`	`public function snake(): parent`
`365`	`365`	`{`
`366`		`- $str = $this->camel()->title();`
	`366`	`+ $str = $this->camel();`
`367`	`367`	`$str->string = strtolower(preg_replace(['/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'], '\1_\2', $str->string));`
`368`	`368`
`369`	`369`	`return $str;`