[String] Fix snake conversion

simPod · simPod · commit 7e178fe9fc75 · 2022-08-04T16:12:07.000+02:00
diff --git a/src/Symfony/Component/String/AbstractUnicodeString.php b/src/Symfony/Component/String/AbstractUnicodeString.php
@@ -348,7 +348,7 @@ public function reverse(): static
 
     public function snake(): static
     {
-        $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
@@ -339,7 +339,7 @@ public function slice(int $start = 0, int $length = null): static
 
     public function snake(): static
     {
-        $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
`@@ -348,7 +348,7 @@ public function reverse(): static`
`348`	`348`
`349`	`349`	`public function snake(): static`
`350`	`350`	`{`
`351`		`- $str = $this->camel()->title();`
	`351`	`+ $str = $this->camel();`
`352`	`352`	`$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');`
`353`	`353`
`354`	`354`	`return $str;`
Original file line number	Diff line number	Diff line change
`@@ -339,7 +339,7 @@ public function slice(int $start = 0, int $length = null): static`
`339`	`339`
`340`	`340`	`public function snake(): static`
`341`	`341`	`{`
`342`		`- $str = $this->camel()->title();`
	`342`	`+ $str = $this->camel();`
`343`	`343`	`$str->string = strtolower(preg_replace(['/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'], '\1_\2', $str->string));`
`344`	`344`
`345`	`345`	`return $str;`