up: update some for data and stream helper

Author: inhere

src/Helper/DataHelper.php

@@ -9,14 +9,14 @@
 
 namespace Toolkit\Stdlib\Helper;
 
+use Toolkit\Stdlib\Json;
 use function filter_var;
 use function gettype;
 use function is_array;
 use function is_bool;
 use function is_object;
 use function is_scalar;
 use function is_string;
-use function json_encode;
 use function method_exists;
 use const FILTER_NULL_ON_FAILURE;
 use const FILTER_VALIDATE_BOOLEAN;
@@ -59,13 +59,17 @@ public static function toBool(mixed $val, bool $nullAsFalse = false): bool
 
     /**
      * @param mixed $val
+     * @param bool $simpleBool
      *
      * @return string
      */
-    public static function toString(mixed $val): string
+    public static function toString(mixed $val, bool $simpleBool = false): string
     {
         if (is_scalar($val)) {
             if (is_bool($val)) {
+                if ($simpleBool) {
+                    return $val ? 'TRUE' : 'FALSE';
+                }
                 return $val ? 'bool(TRUE)' : 'bool(FALSE)';
             }
 
@@ -78,7 +82,7 @@ public static function toString(mixed $val): string
         }
 
         if (is_array($val)) {
-            return json_encode($val);
+            return Json::enc($val);
         }
 
         if (is_object($val)) {

src/Util/Stream/MapStream.php

@@ -45,6 +45,7 @@ public function map(callable $mapper): static
 
     /**
      * @param callable(mixed): mixed $func
+     * @param array $map
      *
      * @return array<string, mixed>
      */

test/Str/StringHelperTest.php

@@ -36,6 +36,15 @@ public function testIsBool(): void
         $this->assertFalse(Str::isBool('abc'));
     }
 
+    public function testIsVarName(): void
+    {
+        $this->assertTrue(Str::isVarName('true'));
+        $this->assertTrue(Str::isVarName('abc'));
+        $this->assertTrue(Str::isVarName('some_name'));
+        $this->assertFalse(Str::isVarName('some-name'));
+        $this->assertFalse(Str::isVarName('some_name()'));
+    }
+
     public function testToTyped(): void
     {
         $tests = [