normalize underscores in snake()

symfony · Jun 29, 2024 · a382cfb · a382cfb
1 parent 065a961
commit a382cfb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/AbstractUnicodeString.php b/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/ByteString.php b/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/Tests/AbstractAsciiTestCase.php b/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'],
         ];
     }