up: update some method for object helper

Author: inhere

src/Obj/AbstractObj.php

@@ -11,7 +11,6 @@
 
 use Toolkit\Stdlib\Obj;
 use Toolkit\Stdlib\Obj\Traits\QuickInitTrait;
-use function get_object_vars;
 
 /**
  * Class AbstractObj
@@ -37,6 +36,6 @@ public function __construct(array $config = [])
      */
     public function toArray(): array
     {
-        return get_object_vars($this);
+        return Obj::toArray($this);
     }
 }

src/Obj/DataObject.php

@@ -227,11 +227,22 @@ public function getSubObject(string $key, string $dataClass = ''): self
     }
 
     /**
-     * @param array $fields Restrict to return only these fields, and return all of them if it is empty
+     * @param array $fields
      *
      * @return array
+     * @deprecated please use getMulti()
      */
     public function getSome(array $fields = []): array
+    {
+        return $this->getMulti($fields);
+    }
+
+    /**
+     * @param array $fields Restrict to return only these fields, and return all of them if it is empty
+     *
+     * @return array
+     */
+    public function getMulti(array $fields = []): array
     {
         $data = [];
         foreach ($this->getArrayCopy() as $key => $value) {
@@ -253,12 +264,25 @@ public function toArray(): array
         return $this->getArrayCopy();
     }
 
+    /**
+     * @return array
+     */
+    public function getKeys(): array
+    {
+        $keys = [];
+        foreach ($this as $key => $val) {
+            $keys[] = $key;
+        }
+
+        return $keys;
+    }
+
     /**
      * @return string
      */
     public function toString(): string
     {
-        return JsonHelper::enc($this->getArrayCopy(), JSON_THROW_ON_ERROR|JSON_UNESCAPED_SLASHES);
+        return JsonHelper::enc($this->getArrayCopy(), JSON_UNESCAPED_SLASHES);
     }
 
     /**

src/Obj/ObjectHelper.php

@@ -25,6 +25,7 @@
 use function base64_encode;
 use function basename;
 use function dirname;
+use function get_object_vars;
 use function gettype;
 use function gzcompress;
 use function gzuncompress;
@@ -156,31 +157,26 @@ public static function decode(string $txt, bool|array $allowedClasses): mixed
     }
 
     /**
-     * php对象转换成为数组
+     * PHP对象转换成为数组
      *
-     * @param Traversable|array $data
+     * @param object $data
      * @param bool $recursive
      *
      * @return array
      */
-    public static function toArray(Traversable|array $data, bool $recursive = false): array
+    public static function toArray(object $data, bool $recursive = false): array
     {
-        $arr = [];
-
-        // Ensure the input data is an array.
-        if (is_object($data)) {
-            if ($data instanceof Traversable) {
-                $arr = iterator_to_array($data);
-            } elseif (method_exists($data, 'toArray')) {
-                $arr = $data->toArray();
-            }
+        if ($data instanceof Traversable) {
+            $arr = iterator_to_array($data);
+        } elseif (method_exists($data, 'toArray')) {
+            $arr = $data->toArray();
         } else {
-            $arr = (array)$data;
+            $arr = get_object_vars($data);
         }
 
         if ($recursive) {
             foreach ($arr as $key => $value) {
-                if (is_array($value) || is_object($value)) {
+                if (is_object($value)) {
                     $arr[$key] = static::toArray($value, $recursive);
                 }
             }