fix: PhpUnitMethodCasingFixer - do not double underscore (#7949)

PHP-CS-Fixer · Apr 15, 2024 · 0e9f115 · 0e9f115
1 parent 8a115cd
commit 0e9f115
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/src/Utils.php b/src/Utils.php
@@ -43,7 +43,7 @@ private function __construct()
      */
     public static function camelCaseToUnderscore(string $string): string
     {
-        return mb_strtolower(Preg::replace('/(?<!^)((?=[\p{Lu}][^\p{Lu}])|(?<![\p{Lu}])(?=[\p{Lu}]))/', '_', $string));
+        return mb_strtolower(Preg::replace('/(?<!^)(?<!_)((?=[\p{Lu}][^\p{Lu}])|(?<![\p{Lu}])(?=[\p{Lu}]))/', '_', $string));
     }
 
     /**

diff --git a/tests/Fixer/PhpUnit/PhpUnitMethodCasingFixerTest.php b/tests/Fixer/PhpUnit/PhpUnitMethodCasingFixerTest.php
@@ -57,6 +57,17 @@ public function notATestEither() {}
 
             yield $key.' to snake case' => [$snakeCase, $camelCase, ['case' => 'snake_case']];
         }
+
+        yield 'mixed case to camel case' => [
+            '<?php class MyTest extends TestCase { function testShouldNotFooWhenBar() {} }',
+            '<?php class MyTest extends TestCase { function test_should_notFoo_When_Bar() {} }',
+        ];
+
+        yield 'mixed case to snake case' => [
+            '<?php class MyTest extends TestCase { function test_should_not_foo_when_bar() {} }',
+            '<?php class MyTest extends TestCase { function test_should_notFoo_When_Bar() {} }',
+            ['case' => 'snake_case'],
+        ];
     }
 
     /**

diff --git a/tests/UtilsTest.php b/tests/UtilsTest.php
@@ -125,6 +125,11 @@ public static function provideCamelCaseToUnderscoreCases(): iterable
             'voyage_éclair',
             'VoyageÉclair',
         ];
+
+        yield [
+            'i_want_to_fully_be_a_snake',
+            'i_wantTo_fully_be_A_Snake',
+        ];
     }
 
     /**