Route: added port to %host%, %domain%, %tld% WIP [Closes #10][Closes nette/application#297]

Author: dg

composer.json

@@ -16,7 +16,7 @@
 	],
 	"require": {
 		"php": ">=7.2 <8.3",
-		"nette/http": "^3.0",
+		"nette/http": "^3.2",
 		"nette/utils": "^3.2 || ~4.0.0"
 	},
 	"require-dev": {

src/Routing/Route.php

@@ -271,12 +271,13 @@ public function constructUrl(array $params, Nette\Http\UrlScript $refUrl): ?stri
 			$parts = ip2long($host)
 				? [$host]
 				: array_reverse(explode('.', $host));
+			$port = $refUrl->getDefaultPort() === ($tmp = $refUrl->getPort()) ? '' : ':' . $tmp;
 			$url = strtr($url, [
 				'/%basePath%/' => $refUrl->getBasePath(),
-				'%tld%' => $parts[0],
-				'%domain%' => isset($parts[1]) ? "$parts[1].$parts[0]" : $parts[0],
+				'%tld%' => $parts[0] . $port,
+				'%domain%' => (isset($parts[1]) ? "$parts[1].$parts[0]" : $parts[0]) . $port,
 				'%sld%' => $parts[1] ?? '',
-				'%host%' => $host,
+				'%host%' => $host . $port,
 			]);
 		}
 

tests/Route/ports.phpt

@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * Test: Nette\Routing\Route ports
+ */
+
+declare(strict_types=1);
+
+use Nette\Http\UrlScript;
+use Nette\Routing\Route;
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+$route = new Route('//%domain%');
+
+$url = $route->constructUrl(
+	[],
+	new UrlScript('https://example.org:8000'),
+);
+Assert::same('https://example.org:8000', $url);
+
+$url = $route->constructUrl(
+    [],
+    new UrlScript('https://localhost:8000'),
+);
+Assert::same('https://localhost:8000', $url);