UriUtil::parseUrl(): return port as integer

Author: codemasher

src/UriUtil.php

@@ -173,7 +173,13 @@ public static function parseUrl(string $url):array|null{
 			return null;
 		}
 
-		return array_map('urldecode', $result);
+		$parsed = array_map('urldecode', $result);
+
+		if(isset($parsed['port'])){
+			$parsed['port'] = (int)$parsed['port'];
+		}
+
+		return $parsed;
 	}
 
 }

tests/UriUtilTest.php

@@ -134,18 +134,20 @@ public static function parseUrlProvider():array{
 		return [
 			['http://', null],
 			[
-				'https://яндекAс.рф', [
-				'scheme' => 'https',
-				'host'   => 'яндекAс.рф',
-			],
+				'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',
-			],
+				'http://[2a00:f48:1008::212:183:10]:56?foo=bar',
+				[
+					'scheme' => 'http',
+					'host'   => '[2a00:f48:1008::212:183:10]',
+					'port'   => 56,
+					'query'  => 'foo=bar',
+				],
 			],
 		];
 	}