normalize underscores in snake()

xabbuh · xabbuh · commit 0e6cd07718e5 · 2024-06-29T07:32:21.000+02:00
diff --git a/src/Symfony/Component/String/AbstractUnicodeString.php b/src/Symfony/Component/String/AbstractUnicodeString.php
@@ -367,7 +367,7 @@ public function reverse(): parent
     public function snake(): parent
     {
         $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'));
+        $str->string = preg_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
@@ -367,7 +367,7 @@ public function slice(int $start = 0, ?int $length = null): parent
     public function snake(): parent
     {
         $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)));
+        $str->string = preg_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
@@ -1079,6 +1079,9 @@ public static function provideSnake()
             ['symfony', 'SYMFONY'],
             ['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', 'SYMFONY _ IS _ GREAT'],
         ];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -367,7 +367,7 @@ public function reverse(): parent`
`367`	`367`	`public function snake(): parent`
`368`	`368`	`{`
`369`	`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', $str->string), 'UTF-8'));`
	`370`	`+ $str->string = preg_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'));`
`371`	`371`
`372`	`372`	`return $str;`
`373`	`373`	`}`
Original file line number	Diff line number	Diff line change
`@@ -367,7 +367,7 @@ public function slice(int $start = 0, ?int $length = null): parent`
`367`	`367`	`public function snake(): parent`
`368`	`368`	`{`
`369`	`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)));`
	`370`	`+ $str->string = preg_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
`@@ -1079,6 +1079,9 @@ public static function provideSnake()`
`1079`	`1079`	`['symfony', 'SYMFONY'],`
`1080`	`1080`	`['symfony_is_great', 'SYMFONY IS GREAT'],`
`1081`	`1081`	`['symfony_is_great', 'SYMFONY_IS_GREAT'],`
	`1082`	`+ ['symfony_is_great', 'symfony is great'],`
	`1083`	`+ ['symfony_is_great', 'SYMFONY IS GREAT'],`
	`1084`	`+ ['symfony_is_great', 'SYMFONY _ IS _ GREAT'],`
`1082`	`1085`	`];`
`1083`	`1086`	`}`
`1084`	`1087`