Route: always copies protocol

Author: dg

src/Application/Routers/Route.php

@@ -401,13 +401,7 @@ public function constructUrl(Application\Request $appRequest, Nette\Http\Url $re
 				'%domain%' => isset($parts[1]) ? "$parts[1].$parts[0]" : $parts[0],
 				'%sld%' => isset($parts[1]) ? $parts[1] : '',
 			]);
-			if ($this->scheme) {
-				$url = $this->scheme . ':' . $url;
-			} elseif (strncmp($url, "//$host/", strlen($host) + 3) === 0) {
-				$url = $refUrl->getScheme() . ':' . $url;
-			} else {
-				$url = 'http:' . $url;
-			}
+			$url = ($this->scheme ?: $refUrl->getScheme() ?: 'http') . ':' . $url;
 		} else {
 			if ($this->lastRefUrl !== $refUrl) {
 				$scheme = ($this->scheme ?: $refUrl->getScheme());

tests/Routers/Route.withHost.secured.phpt

@@ -30,7 +30,7 @@ $url = $route->constructUrl(
 	new Request('Default', NULL, ['action' => 'default']),
 	new Url('https://example.com')
 );
-Assert::same('http://example.org/test', $url);
+Assert::same('https://example.org/test', $url);