update some url helper method

Author: inhere

phpunit.xml.dist renamed to phpunit.xml

@@ -3,7 +3,7 @@
 <phpunit backupGlobals="false"
          backupStaticAttributes="false"
          bootstrap="test/bootstrap.php"
-         colors="false"
+         colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
@@ -16,9 +16,9 @@
         </testsuite>
     </testsuites>
 
-    <filter>
-        <whitelist>
+    <coverage>
+        <include>
             <directory suffix=".php">src</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </coverage>
 </phpunit>

src/Arr/Traits/ArrayMergeTrait.php

@@ -60,7 +60,7 @@ public static function quickMerge(array $append, array $base): array
                 if (is_array($item)) {
                     $base[$key] = array_merge($base[$key], $item);
                 } else {
-                    throw new RuntimeException("Array merge error! the '{$key}' must be an array");
+                    throw new RuntimeException("Array merge error! the '$key' must be an array");
                 }
             } else { // set new value OR add new key.
                 $base[$key] = $item;

src/Str/UrlHelper.php

@@ -9,6 +9,7 @@
 
 namespace Toolkit\Stdlib\Str;
 
+use InvalidArgumentException;
 use function preg_match;
 use function http_build_query;
 use function curl_init;
@@ -219,6 +220,27 @@ public static function parseUrl(string $url): array
         return $result;
     }
 
+    /**
+     * @param string $url
+     *
+     * @return array
+     */
+    public static function parse2(string $url): array
+    {
+        $info = parse_url($url);
+        if ($info === false) {
+            throw new InvalidArgumentException('invalid request url: ' . $url);
+        }
+
+        return array_merge([
+            'scheme' => 'http',
+            'host'   => '',
+            'port'   => 80,
+            'path'   => '/',
+            'query'  => '',
+        ], $info);
+    }
+
     /**
      * url_encode form urlencode(),但是 : / ? & = ...... 几个符号不会被转码为 %3A %2F %3F %26 %3D ......
      * $url="ftp://ud03:password@www.xxx.net/中文/中文.rar";
@@ -238,9 +260,8 @@ public static function encode(string $url): string
         }
 
         // 若已被编码的url，将被解码，再继续重新编码
-        $url = urldecode($url);
-
-        $encodeUrl = urlencode($url);
+        $decodeUrl = urldecode($url);
+        $encodeUrl = urlencode($decodeUrl);
 
         return str_replace(self::$entities, self::$replacements, $encodeUrl);
     }