up: enhance the Str.renderVars, support print array as string

Author: inhere

src/Any.php

@@ -0,0 +1,16 @@
+<?php declare(strict_types=1);
+
+namespace Toolkit\Stdlib;
+
+use Toolkit\Stdlib\Helper\DataHelper;
+
+/**
+ * class Any
+ *
+ * @author inhere
+ * @date 2022/12/30
+ */
+final class Any extends DataHelper
+{
+
+}

src/Str/StringHelper.php

@@ -30,6 +30,7 @@
 use function gethostname;
 use function hash;
 use function hex2bin;
+use function is_array;
 use function is_int;
 use function mb_strwidth;
 use function microtime;
@@ -309,9 +310,16 @@ public static function renderVars(string $tplCode, array $vars, string $format =
             return $tplCode;
         }
 
-        $fmtVars = Arr::flattenMap($vars, Arr::FLAT_DOT_JOIN_INDEX);
+        $fmtVars = Arr::flattenMap($vars, Arr\ArrConst::FLAT_DOT_JOIN_INDEX);
         $pattern = sprintf('/%s([\w\s.-]+)%s/', preg_quote($left, '/'), preg_quote($right, '/'));
 
+        // convert array value to string.
+        foreach ($vars as $name => $val) {
+            if (is_array($val)) {
+                $fmtVars[$name] = Arr::toStringV2($val);
+            }
+        }
+
         return preg_replace_callback($pattern, static function (array $match) use ($fmtVars) {
             $var = trim($match[1]);
             if ($var && isset($fmtVars[$var])) {

src/Str/Traits/StringCheckHelperTrait.php

@@ -489,6 +489,17 @@ public static function isAlphaNum(string $str): bool
         return preg_match('/^[a-zA-Z0-9]+$/', $str) === 1;
     }
 
+    /**
+     * @param string $pattern
+     * @param string $str
+     *
+     * @return bool
+     */
+    public static function pregMatch(string $pattern, string $str): bool
+    {
+        return preg_match($pattern, $str) === 1;
+    }
+
     /**
      * 使用正则验证数据
      *

test/Str/StringHelperTest.php

@@ -27,6 +27,10 @@ public function testBasicStrMethods(): void
 
         $this->assertTrue(Str::isNull('null'));
         $this->assertFalse(Str::isNull('abc'));
+
+        $this->assertTrue(Str::isAlphaNum('abc'));
+        $this->assertTrue(Str::isAlphaNum('abc23'));
+        $this->assertFalse(Str::isAlphaNum('--'));
     }
 
     public function testIsBool(): void
@@ -273,7 +277,7 @@ public function testRenderVars(): void
         $vars = [
             'name' => 'inhere',
             'age'  => 200,
-            'tags' => ['php'],
+            'tags' => ['php', 'java'],
             'top' => [
                 'key0' => 'val0',
             ]
@@ -284,5 +288,8 @@ public function testRenderVars(): void
 
         $text = Str::renderVars('hello ${ name }, age: ${ age}, tags: ${ tags.0 }, key0: ${top.key0 }', $vars, '${%s}');
         $this->assertEquals('hello inhere, age: 200, tags: php, key0: val0', $text);
+
+        $text = Str::renderVars('tags: ${ tags }', $vars, '${%s}');
+        $this->assertEquals('tags: [php, java]', $text);
     }
 }