up: obj, url - update some helper method logic

Author: inhere

src/Obj/AbstractObj.php

@@ -36,6 +36,6 @@ public function __construct(array $config = [])
      */
     public function toArray(): array
     {
-        return Obj::toArray($this);
+        return Obj::toArray($this, false, false);
     }
 }

src/Obj/ObjectHelper.php

@@ -59,12 +59,11 @@ class ObjectHelper
      * - 会先尝试用 setter 方法设置属性
      * - 再尝试直接设置属性
      *
-     * @template T object
-     * @param T $object An object instance
+     * @param object $object An object instance
      * @param array $config
      * @param bool $toCamel
      *
-     * @return T
+     * @return object
      */
     public static function init(object $object, array $config, bool $toCamel = false): object
     {
@@ -159,25 +158,26 @@ public static function decode(string $txt, bool|array $allowedClasses): mixed
     /**
      * PHP对象转换成为数组
      *
-     * @param object $data
+     * @param object $obj
      * @param bool $recursive
+     * @param bool $checkMth in the data obj
      *
      * @return array
      */
-    public static function toArray(object $data, bool $recursive = false): array
+    public static function toArray(object $obj, bool $recursive = false, bool $checkMth = true): array
     {
-        if ($data instanceof Traversable) {
-            $arr = iterator_to_array($data);
-        } elseif (method_exists($data, 'toArray')) {
-            $arr = $data->toArray();
+        if ($obj instanceof Traversable) {
+            $arr = iterator_to_array($obj);
+        } elseif ($checkMth && method_exists($obj, self::TO_ARRAY_METHOD)) {
+            $arr = $obj->toArray();
         } else {
-            $arr = get_object_vars($data);
+            $arr = get_object_vars($obj);
         }
 
         if ($recursive) {
             foreach ($arr as $key => $value) {
                 if (is_object($value)) {
-                    $arr[$key] = static::toArray($value, $recursive);
+                    $arr[$key] = static::toArray($value, $recursive, $checkMth);
                 }
             }
         }

src/Str/UrlHelper.php

@@ -10,29 +10,29 @@
 namespace Toolkit\Stdlib\Str;
 
 use InvalidArgumentException;
-use function implode;
-use function preg_match;
-use function http_build_query;
-use function curl_init;
-use function curl_setopt;
 use function curl_exec;
 use function curl_getinfo;
+use function curl_init;
+use function curl_setopt;
+use function file_get_contents;
 use function function_exists;
 use function get_headers;
-use function stream_context_create;
-use function file_get_contents;
+use function http_build_query;
+use function implode;
+use function mb_convert_encoding;
 use function parse_url;
+use function preg_match;
+use function rawurlencode;
+use function str_replace;
+use function stream_context_create;
 use function strpos;
 use function trim;
 use function urldecode;
-use function rawurlencode;
-use function mb_convert_encoding;
-use function str_replace;
 use function urlencode;
-use const CURLOPT_NOBODY;
+use const CURLINFO_HTTP_CODE;
 use const CURLOPT_CONNECTTIMEOUT;
+use const CURLOPT_NOBODY;
 use const CURLOPT_TIMEOUT;
-use const CURLINFO_HTTP_CODE;
 
 /**
  * Class UrlHelper
@@ -272,8 +272,8 @@ public static function encode(string $url): string
         }
 
         // 若已被编码的url，将被解码，再继续重新编码
-        $decodeUrl = urldecode($url);
-        $encodeUrl = urlencode($decodeUrl);
+        // $decodeUrl = urldecode($url);
+        $encodeUrl = urlencode($url);
 
         return str_replace(self::$entities, self::$replacements, $encodeUrl);
     }
@@ -297,7 +297,7 @@ public static function encode2(string $url): string
         }
 
         // 若已被编码的url，将被解码，再继续重新编码
-        $url = urldecode($url);
+        // $url = urldecode($url);
 
         $encodeUrl = rawurlencode(mb_convert_encoding($url, 'utf-8'));
         // $url  = rawurlencode($url);