update: add some new methods, add new tests

Author: inhere

src/Arr/ArrObject.php

@@ -0,0 +1,15 @@
+<?php declare(strict_types=1);
+
+namespace Toolkit\Stdlib\Arr;
+
+use Toolkit\Stdlib\Obj\DataObject;
+
+/**
+ * class ArrObject
+ *
+ * @author inhere
+ */
+class ArrObject extends DataObject
+{
+
+}

src/Obj/DataObject.php

@@ -13,11 +13,12 @@
 use JsonSerializable;
 use Toolkit\Stdlib\Helper\JsonHelper;
 use Toolkit\Stdlib\Obj;
+use Toolkit\Stdlib\Str;
 use UnexpectedValueException;
 use function in_array;
 
 /**
- * Class ConfigObject
+ * Class DataObject
  *
  * @package Toolkit\Stdlib\Obj
  */
@@ -28,7 +29,7 @@ class DataObject extends ArrayObject  implements JsonSerializable
      *
      * @return static
      */
-    public static function new(array $data = []): self
+    public static function new(array $data = []): static
     {
         return new static($data);
     }
@@ -152,6 +153,20 @@ public function getString(string $key, string $default = ''): string
         return $default;
     }
 
+    /**
+     * @param string $key
+     * @param array $default
+     * @param string $sep
+     *
+     * @return array
+     */
+    public function getStrings(string $key, array $default = [], string $sep = ','): array
+    {
+        $str = $this->getString($key);
+
+        return $str ? Str::toArray($str, $sep) : $default;
+    }
+
     /**
      * @param string $key
      *

src/Std/Collection.php

@@ -250,6 +250,14 @@ public function all(): array
         return $this->data;
     }
 
+    /**
+     * @return array
+     */
+    public function getData(): array
+    {
+        return $this->data;
+    }
+
     /**
      * @return array
      */

src/Str/Traits/StringConvertTrait.php

@@ -185,7 +185,7 @@ public static function explode(string $str, string $separator = '.', int $limit
      */
     public static function toArray(string $str, string $sep = ',', int $limit = 0): array
     {
-        return self::toNoEmptyArray($str, $sep, $limit);;
+        return self::toNoEmptyArray($str, $sep, $limit);
     }
 
     /**

src/Type.php

@@ -112,34 +112,15 @@ public static function getDefault(string $type): float|bool|int|array|string|nul
      */
     public static function fmtValue(string $type, mixed $value): mixed
     {
-        switch ($type) {
-            case self::INT:
-            case self::INTEGER:
-                $value = (int)$value;
-                break;
-            case self::BOOL:
-            case self::BOOLEAN:
-                if (is_string($value)) {
-                    $value = Str::toBool2($value);
-                } else {
-                    $value = (bool)$value;
-                }
-                break;
-            case self::FLOAT:
-                $value = (float)$value;
-                break;
-            case self::DOUBLE:
-                $value = (double)$value;
-                break;
-            case self::STRING:
-                $value = (string)$value;
-                break;
-            case self::ARRAY:
-                $value = (array)$value;
-                break;
-        }
-
-        return $value;
+        return match ($type) {
+            self::INT, self::INTEGER => (int)$value,
+            self::BOOL, self::BOOLEAN => is_string($value) ? Str::toBool2($value) : (bool)$value,
+            self::FLOAT => (float)$value,
+            self::DOUBLE => (double)$value,
+            self::STRING => (string)$value,
+            self::ARRAY => (array)$value,
+            default => $value
+        };
     }
 
     /**

src/Util/Stream/DataStream.php

@@ -46,7 +46,7 @@ public static function new(array|Traversable $data): static
     public static function empty(): self
     {
         if (!self::$emptyObj) {
-            self::$emptyObj = new self();
+            self::$emptyObj = new static();
         }
 
         return self::$emptyObj;
@@ -591,6 +591,14 @@ public function getArray(): array
         return $this->getArrayCopy();
     }
 
+    /**
+     * close and clear data.
+     */
+    public function close(): void
+    {
+        // clear all data.
+    }
+
     /**
      * @return int
      */

test/TypeTest.php

@@ -0,0 +1,31 @@
+<?php declare(strict_types=1);
+
+namespace Toolkit\StdlibTest;
+
+use Toolkit\Stdlib\Type;
+
+/**
+ * class TypeTest
+ *
+ * @author inhere
+ */
+class TypeTest extends BaseLibTestCase
+{
+    public function testType_fmtValue(): void
+    {
+        $tests = [
+            ['23', Type::INT, 23],
+            ['23', Type::INTEGER, 23],
+            ['23', 'unknown', '23'],
+            ['true', Type::BOOL, true],
+            ['yes', Type::BOOL, true],
+            ['no', Type::BOOL, false],
+            ['true', Type::STRING, 'true'],
+            ['no', Type::STRING, 'no'],
+        ];
+
+        foreach ($tests as [$value, $type, $want]) {
+            $this->assertEquals($want, Type::fmtValue($type, $value));
+        }
+    }
+}