up: update some generic class logic

Author: inhere

src/Obj/DataObject.php

@@ -16,6 +16,7 @@
 use Toolkit\Stdlib\Str;
 use UnexpectedValueException;
 use function in_array;
+use const JSON_UNESCAPED_SLASHES;
 
 /**
  * Class DataObject
@@ -247,7 +248,7 @@ public function toArray(): array
      */
     public function toString(): string
     {
-        return JsonHelper::enc($this->getArrayCopy(), JSON_THROW_ON_ERROR);
+        return JsonHelper::enc($this->getArrayCopy(), JSON_THROW_ON_ERROR|JSON_UNESCAPED_SLASHES);
     }
 
     /**
@@ -258,6 +259,37 @@ public function __toString(): string
         return $this->toString();
     }
 
+    /**
+     * @param string $key
+     *
+     * @return bool
+     */
+    public function __isset(string $key): bool
+    {
+        return $this->offsetExists($key);
+    }
+
+    /**
+     * @param string $key
+     *
+     * @return mixed
+     */
+    public function __get(string $key): mixed
+    {
+        return $this->offsetGet($key);
+    }
+
+    /**
+     * @param string $key
+     * @param mixed $value
+     *
+     * @return void
+     */
+    public function __set(string $key, mixed $value): void
+    {
+         $this->offsetSet($key, $value);
+    }
+
     /**
      * @return mixed
      */

src/Obj/Traits/ArrayAccessByGetterSetterTrait.php

@@ -25,7 +25,6 @@
  */
 trait ArrayAccessByGetterSetterTrait
 {
-    /** @var bool */
     // protected $__strict__ = false;
 
     /**

src/Obj/Traits/PropertyAccessByGetterSetterTrait.php

@@ -32,12 +32,10 @@ trait PropertyAccessByGetterSetterTrait
     /**
      * @reference yii2 yii\base\Object::__set()
      *
-     * @param $name
-     * @param $value
-     *
-     * @throws SetPropertyException
+     * @param string $name
+     * @param mixed $value
      */
-    public function __set($name, $value): void
+    public function __set(string $name, mixed $value): void
     {
         $setter = 'set' . ucfirst($name);
 
@@ -58,7 +56,7 @@ public function __set($name, $value): void
      * @return mixed
      * @throws GetPropertyException
      */
-    public function __get($name)
+    public function __get(string $name)
     {
         $getter = 'get' . ucfirst($name);
 
@@ -78,7 +76,7 @@ public function __get($name)
      *
      * @return bool
      */
-    public function __isset($name)
+    public function __isset(string $name)
     {
         $getter = 'get' . ucfirst($name);
 

src/Std/Collection.php

@@ -14,8 +14,11 @@
 use Countable;
 use IteratorAggregate;
 use JsonSerializable;
+use Toolkit\Stdlib\Obj\DataObject;
+use Toolkit\Stdlib\Php;
 use Traversable;
 use function count;
+use function is_string;
 
 /**
  * Class Collection
@@ -171,6 +174,39 @@ public function getArray(string $key, array $default = []): array
         return $data ? (array)$data : $default;
     }
 
+    /**
+     * @param string $key
+     * @param array $default
+     *
+     * @return DataObject
+     */
+    public function getDataObject(string $key, array $default = []): DataObject
+    {
+        $data = $this->get($key);
+
+        return DataObject::new($data ? (array)$data : $default);
+    }
+
+    /**
+     * @param string $key
+     * @param class-string|object $obj
+     *
+     * @return object
+     */
+    public function mapObject(string $key, string|object $obj): object
+    {
+        // is class string
+        if (is_string($obj)) {
+            $obj = new $obj();
+        }
+
+        if ($data = $this->getArray($key)) {
+            Php::initObject($obj, $data);
+        }
+
+        return $obj;
+    }
+
     /**
      * Add item to collection
      *
@@ -286,6 +322,14 @@ public function toArray(): array
         return $this->all();
     }
 
+    /**
+     * @return string
+     */
+    public function toString(): string
+    {
+        return Php::dumpVars($this->data);
+    }
+
     /**
      * Get collection keys
      *
@@ -339,6 +383,14 @@ public function reset(): void
         $this->data = [];
     }
 
+    /**
+     * @return string
+     */
+    public function __toString(): string
+    {
+        return $this->toString();
+    }
+
     /********************************************************************************
      * ArrayAccess interface
      *******************************************************************************/

src/Util/Optional.php

@@ -168,7 +168,7 @@ public function isNull(): bool
      */
     public function isEmpty(): bool
     {
-        return $this->value === null;
+        return empty($this->value);
     }
 
     /**