Less strict

VincentLanglet · Jul 28, 2024 · dd03903 · dd03903
1 parent 7c49b94
commit dd03903
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/src/Util/StringUtil.php b/src/Util/StringUtil.php
@@ -26,7 +26,7 @@ public static function toSnakeCase(string $string): string
 
     public static function toCamelCase(string $string): string
     {
-        return (new UnicodeString(static::toSnakeCase($string)))->camel()->toString();
+        return (new UnicodeString($string))->camel()->toString();
     }
 
     public static function toPascalCase(string $string): string

diff --git a/tests/Rules/Variable/VariableName/VariableNameRuleTest.php b/tests/Rules/Variable/VariableName/VariableNameRuleTest.php
@@ -62,7 +62,6 @@ public function testRulePascalCase(): void
             'VariableName.Error:6:8' => 'The var name must use PascalCase; expected UserFoo.',
             'VariableName.Error:7:8' => 'The var name must use PascalCase; expected KeyFoo.',
             'VariableName.Error:7:16' => 'The var name must use PascalCase; expected UserFoo.',
-            'VariableName.Error:9:8' => 'The var name must use PascalCase; expected FooBar.',
             'VariableName.Error:11:8' => 'The var name must use PascalCase; expected FooBar.',
             'VariableName.Error:12:8' => 'The var name must use PascalCase; expected FooBar.',
         ]);

diff --git a/tests/Util/StringUtilTest.php b/tests/Util/StringUtilTest.php
@@ -61,7 +61,7 @@ public static function toCamelCaseDataProvider(): iterable
         yield ['foo_bar', 'fooBar'];
         yield ['foo-bar', 'fooBar'];
         yield ['FooBar', 'fooBar'];
-        yield ['FOOBar', 'fooBar'];
+        yield ['FOOBar', 'FOOBar'];
         yield ['foo1bar', 'foo1bar'];
         yield ['foo1Bar', 'foo1Bar'];
         yield ['foo_bar1', 'fooBar1'];
@@ -72,7 +72,7 @@ public static function toCamelCaseDataProvider(): iterable
         yield ['foo__bar', 'fooBar'];
         yield ['_foo_bar_', 'fooBar'];
         yield ['foo bar', 'fooBar'];
-        yield ['FOO BAR', 'fooBar'];
+        yield ['FOO BAR', 'FOOBAR'];
         yield ['foo#/+bar', 'fooBar'];
     }
 
@@ -94,7 +94,7 @@ public static function toPascalCaseDataProvider(): iterable
         yield ['foo_bar', 'FooBar'];
         yield ['foo-bar', 'FooBar'];
         yield ['FooBar', 'FooBar'];
-        yield ['FOOBar', 'FooBar'];
+        yield ['FOOBar', 'FOOBar'];
         yield ['foo1bar', 'Foo1bar'];
         yield ['foo1Bar', 'Foo1Bar'];
         yield ['foo_bar1', 'FooBar1'];
@@ -106,7 +106,7 @@ public static function toPascalCaseDataProvider(): iterable
         yield ['foo__bar', 'FooBar'];
         yield ['_foo_bar_', 'FooBar'];
         yield ['foo bar', 'FooBar'];
-        yield ['FOO BAR', 'FooBar'];
+        yield ['FOO BAR', 'FOOBAR'];
         yield ['foo#/+bar', 'FooBar'];
     }