fix: str to camel convert error

Author: inhere

src/Str/Traits/StringCaseHelperTrait.php

@@ -187,6 +187,23 @@ public static function toCamel(string $str, bool $upperFirst = false): string
         return self::toCamelCase($str, $upperFirst);
     }
 
+    /**
+     * Translates a string with `\s_-` into camel case (e.g. first_name -> firstName)
+     *
+     * @param string $str
+     * @param bool   $upperFirst
+     *
+     * @return mixed
+     */
+    public static function toCamelCase(string $str, bool $upperFirst = false): string
+    {
+        if ($upperFirst) {
+            $str = self::ucfirst($str);
+        }
+
+        return preg_replace_callback('/[\s_-]+([a-z])/', static fn($c) => strtoupper($c[1]), $str);
+    }
+
     /**
      * string to camel case
      *
@@ -211,27 +228,6 @@ public static function camelCase(string $name, bool $upFirst = false, string $se
         return $upFirst ? ucfirst($name) : lcfirst($name);
     }
 
-    /**
-     * Translates a string with underscores into camel case (e.g. first_name -> firstName)
-     *
-     * @param string $str
-     * @param bool   $upperFirst
-     *
-     * @return mixed
-     */
-    public static function toCamelCase(string $str, bool $upperFirst = false): string
-    {
-        $str = self::toLower($str);
-
-        if ($upperFirst) {
-            $str = self::ucfirst($str);
-        }
-
-        return preg_replace_callback('/[_-]+([a-z])/', static function ($c) {
-            return strtoupper($c[1]);
-        }, $str);
-    }
-
     /**
      * @param string $str
      * @param string $sep

test/Str/StringHelperTest.php

@@ -147,6 +147,23 @@ public function testStrpos(): void
         self::assertFalse(Str::notContains('abc', 'b'));
     }
 
+    public function testStrCase_toCamel(): void
+    {
+        $tests = [
+            ['voicePlayTimes', 'voicePlayTimes', 'VoicePlayTimes'],
+            ['fieldName', 'fieldName', 'FieldName'],
+            ['the_fieldName', 'theFieldName', 'TheFieldName'],
+            ['the_field_name', 'theFieldName', 'TheFieldName'],
+            ['the-field-name', 'theFieldName', 'TheFieldName'],
+            ['the field name', 'theFieldName', 'TheFieldName'],
+        ];
+
+        foreach ($tests as [$case, $want, $want1]) {
+            $this->assertEquals(Str::toCamel($case), $want);
+            $this->assertEquals(Str::toCamel($case, true), $want1);
+        }
+    }
+
     public function testToNoEmptyArray(): void
     {
         $tests = [
@@ -240,4 +257,5 @@ public function testSplitTypedList(): void
         }
     }
 
+
 }