move parseUrl() to QueryUtil::parseUrl()

Author: codemasher

src/QueryUtil.php

@@ -10,8 +10,10 @@
 
 namespace chillerlan\HTTP\Utils;
 
-use function array_merge, call_user_func_array, explode, implode, is_array, is_bool, is_iterable,
-	is_numeric, is_string, rawurldecode, sort, str_replace, trim, uksort;
+use function array_map, array_merge, call_user_func_array, explode, implode, is_array, is_bool, is_iterable,
+	is_numeric, is_string, parse_url, preg_match, preg_replace_callback, rawurldecode, sort, str_replace, trim, uksort,
+	urlencode;
+
 use const PHP_QUERY_RFC1738, PHP_QUERY_RFC3986, SORT_STRING;
 
 /**
@@ -166,7 +168,7 @@ public static function build(array $params, int $encoding = null, string $delimi
 	 * Merges additional query parameters into an existing query string
 	 */
 	public static function merge(string $uri, array $query):string{
-		$parsedquery = self::parse(parseUrl($uri)['query'] ?? '');
+		$parsedquery = self::parse(self::parseUrl($uri)['query'] ?? '');
 		$requestURI  = explode('?', $uri)[0];
 		$params      = array_merge($parsedquery, $query);
 
@@ -225,4 +227,39 @@ public static function parse(string $querystring, int $urlEncoding = null):array
 		return $result;
 	}
 
+	/**
+	 * UTF-8 aware \parse_url() replacement.
+	 *
+	 * The internal function produces broken output for non ASCII domain names
+	 * (IDN) when used with locales other than "C".
+	 *
+	 * On the other hand, cURL understands IDN correctly only when UTF-8 locale
+	 * is configured ("C.UTF-8", "en_US.UTF-8", etc.).
+	 *
+	 * @see https://bugs.php.net/bug.php?id=52923
+	 * @see https://www.php.net/manual/en/function.parse-url.php#114817
+	 * @see https://curl.haxx.se/libcurl/c/CURLOPT_URL.html#ENCODING
+	 *
+	 * @link https://github.com/guzzle/psr7/blob/c0dcda9f54d145bd4d062a6d15f54931a67732f9/src/Uri.php#L89-L130
+	 */
+	public static function parseUrl(string $url):?array{
+		// If IPv6
+		$prefix = '';
+		/** @noinspection RegExpRedundantEscape */
+		if(preg_match('%^(.*://\[[0-9:a-f]+\])(.*?)$%', $url, $matches)){
+			/** @var array{0:string, 1:string, 2:string} $matches */
+			$prefix = $matches[1];
+			$url    = $matches[2];
+		}
+
+		$encodedUrl = preg_replace_callback('%[^:/@?&=#]+%usD', fn($matches) => urlencode($matches[0]), $url);
+		$result     = parse_url($prefix.$encodedUrl);
+
+		if($result === false){
+			return null;
+		}
+
+		return array_map('urldecode', $result);
+	}
+
 }

src/message_helpers.php

@@ -374,38 +374,3 @@ function uriWithQueryValue(UriInterface $uri, string $key, string $value = null)
 
 	return $uri->withQuery(implode('&', $result));
 }
-
-/**
- * UTF-8 aware \parse_url() replacement.
- *
- * The internal function produces broken output for non ASCII domain names
- * (IDN) when used with locales other than "C".
- *
- * On the other hand, cURL understands IDN correctly only when UTF-8 locale
- * is configured ("C.UTF-8", "en_US.UTF-8", etc.).
- *
- * @see https://bugs.php.net/bug.php?id=52923
- * @see https://www.php.net/manual/en/function.parse-url.php#114817
- * @see https://curl.haxx.se/libcurl/c/CURLOPT_URL.html#ENCODING
- *
- * @link https://github.com/guzzle/psr7/blob/c0dcda9f54d145bd4d062a6d15f54931a67732f9/src/Uri.php#L89-L130
- */
-function parseUrl(string $url):?array{
-	// If IPv6
-	$prefix = '';
-	/** @noinspection RegExpRedundantEscape */
-	if(preg_match('%^(.*://\[[0-9:a-f]+\])(.*?)$%', $url, $matches)){
-		/** @var array{0:string, 1:string, 2:string} $matches */
-		$prefix = $matches[1];
-		$url    = $matches[2];
-	}
-
-	$encodedUrl = preg_replace_callback('%[^:/@?&=#]+%usD', fn($matches) => urlencode($matches[0]), $url);
-	$result     = parse_url($prefix.$encodedUrl);
-
-	if($result === false){
-		return null;
-	}
-
-	return array_map('urldecode', $result);
-}

tests/MessageHelpersTest.php

@@ -14,7 +14,7 @@
 
 use function chillerlan\HTTP\Utils\{
 	decompress_content, get_json, get_xml, getMimetypeFromExtension, getMimetypeFromFilename, message_to_string,
-	parseUrl, r_rawurlencode, uriIsAbsolute, uriIsAbsolutePathReference, uriIsDefaultPort, uriIsNetworkPathReference,
+	r_rawurlencode, uriIsAbsolute, uriIsAbsolutePathReference, uriIsDefaultPort, uriIsNetworkPathReference,
 	uriIsRelativePathReference, uriWithoutQueryValue, uriWithQueryValue
 };
 
@@ -262,29 +262,6 @@ public function testUriIsDefaultPort():void{
 
 	}
 
-	public function parseUrlProvider():array{
-		return [
-			['http://', null],
-			['https://яндекAс.рф', [
-				'scheme' => 'https',
-				'host'   => 'яндекAс.рф'
-			]],
-			['http://[2a00:f48:1008::212:183:10]:56?foo=bar', [
-				'scheme' => 'http',
-				'host'   => '[2a00:f48:1008::212:183:10]',
-				'port'   => '56',
-				'query'  => 'foo=bar',
-			]]
-		];
-	}
-
-	/**
-	 * @dataProvider parseUrlProvider
-	 */
-	public function testParseUrl($url, $expected):void{
-		$this::assertSame($expected, parseUrl($url));
-	}
-
 	public function testGetMimetype():void{
 		$this::assertSame('application/json', getMimetypeFromExtension('json'));
 		$this::assertSame('application/json', getMimetypeFromFilename('/path/to/some/file.json'));

tests/QueryUtilTest.php

@@ -180,4 +180,28 @@ public function testBuildBooleans():void{
 	public function testParseDoesTrimQuestionMark():void{
 		$this::assertSame(QueryUtil::parse('?q=a'), ['q' => 'a']);
 	}
+
+	public function parseUrlProvider():array{
+		return [
+			['http://', null],
+			['https://яндекAс.рф', [
+				'scheme' => 'https',
+				'host'   => 'яндекAс.рф'
+			]],
+			['http://[2a00:f48:1008::212:183:10]:56?foo=bar', [
+				'scheme' => 'http',
+				'host'   => '[2a00:f48:1008::212:183:10]',
+				'port'   => '56',
+				'query'  => 'foo=bar',
+			]]
+		];
+	}
+
+	/**
+	 * @dataProvider parseUrlProvider
+	 */
+	public function testParseUrl($url, $expected):void{
+		$this::assertSame($expected, QueryUtil::parseUrl($url));
+	}
+
 }