add new string util func and fix some error

Author: inhere

src/Str/StringHelper.php

@@ -35,6 +35,7 @@
 use function preg_split;
 use function random_bytes;
 use function random_int;
+use function sprintf;
 use function str_pad;
 use function str_repeat;
 use function str_replace;
@@ -275,14 +276,33 @@ public static function genNOV2($prefix = '', array $randomRange = []): string
     }
 
     /**
-     * @param string $template
+     * @param string $tplCode
      * @param array  $vars
      *
      * @return string
      */
-    public static function replaces(string $template, array $vars): string
+    public static function replaces(string $tplCode, array $vars): string
     {
-        return strtr($template, $vars);
+        return strtr($tplCode, $vars);
+    }
+
+    /**
+     * @param string $tplCode
+     * @param array $vars
+     * @param string $format
+     *
+     * @return string
+     */
+    public static function renderTemplate(string $tplCode, array $vars, string $format = '{{%s}}'): string
+    {
+        $fmtVars = [];
+        foreach ($vars as $name => $var) {
+            $name = sprintf($format, (string)$name);
+            // add
+            $fmtVars[$name] = $var;
+        }
+
+        return strtr($tplCode, $fmtVars);
     }
 
     ////////////////////////////////////////////////////////////
@@ -335,6 +355,30 @@ public static function removeQuotes(string $str): string
         return $str;
     }
 
+    /**
+     * @param string $str
+     * @param bool $quoteAll
+     *
+     * @return string
+     */
+    public static function paramQuotes(string $str, bool $quoteAll = false): string
+    {
+        if ($str === '') {
+            return "''";
+        }
+
+        if (
+            !$quoteAll &&
+            (preg_match("/^\".*\"$/", $str) || preg_match("/^'.*'$/", $str))
+        ) {
+            return $str;
+        }
+
+        $quote = str_contains($str, "'") ? '"' : "'";
+
+        return $quote . $str . $quote;
+    }
+
     /**
      * @param array $list
      * @param string $wrapChar
@@ -377,7 +421,7 @@ public static function shellQuote(string $arg): string
         $quote = '';
         if (str_contains($arg, '"')) {
             $quote = "'";
-        } elseif ($arg === '' || strpos($arg, "'") !== false || strpos($arg, ' ') !== false) {
+        } elseif ($arg === '' || str_contains($arg, "'") || str_contains($arg, ' ')) {
             $quote = '"';
         }
 

src/Str/Traits/StringCaseHelperTrait.php

@@ -227,7 +227,7 @@ public static function toCamelCase(string $str, bool $upperFirst = false): strin
             $str = self::ucfirst($str);
         }
 
-        return preg_replace_callback('/_+([a-z])/', static function ($c) {
+        return preg_replace_callback('/[_-]+([a-z])/', static function ($c) {
             return strtoupper($c[1]);
         }, $str);
     }

test/Str/StringHelperTest.php

@@ -51,6 +51,20 @@ public function testToTyped(): void
         $this->assertEquals('true', Str::toTyped('true'));
     }
 
+    public function testParamQuotes(): void
+    {
+        $tests = [
+            ['', "''"],
+            ['abc', "'abc'"],
+            ["'abc'", "'abc'"],
+            ['ab" c', "'ab\" c'"],
+            ["ab' c", '"ab\' c"'],
+        ];
+        foreach ($tests as [$given, $want]) {
+            self::assertSame($want, Str::paramQuotes($given));
+        }
+    }
+
     public function testShellQuote(): void
     {
         $tests = [