Route: added support for scheme:// in mask

Author: dg

src/Application/Routers/Route.php

@@ -96,6 +96,9 @@ class Route implements Application\IRouter
 	/** @var int HOST, PATH, RELATIVE */
 	private $type;
 
+	/** @var string  http | https */
+	private $scheme;
+
 	/** @var int */
 	private $flags;
 
@@ -136,8 +139,9 @@ public function __construct($mask, $metadata = [], $flags = 0)
 		$this->setMask($mask, $metadata);
 		if (static::$defaultFlags) {
 			trigger_error('Route::$defaultFlags is deprecated, router by default keeps the used protocol.', E_USER_DEPRECATED);
-		} elseif ($this->type !== self::HOST && $flags & self::SECURED) {
-			trigger_error('Router::SECURED is deprecated for routes without host, router by default keeps the used protocol.', E_USER_DEPRECATED);
+		} elseif ($flags & self::SECURED) {
+			trigger_error('Router::SECURED is deprecated, specify scheme in mask.', E_USER_DEPRECATED);
+			$this->scheme = 'https';
 		}
 	}
 
@@ -397,18 +401,18 @@ 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->flags & self::SECURED) {
-				$url = 'https:' . $url;
+			if ($this->scheme) {
+				$url = $this->scheme . ':' . $url;
 			} elseif (strncmp($url, "//$host/", strlen($host) + 3) === 0) {
 				$url = $refUrl->getScheme() . ':' . $url;
 			} else {
 				$url = 'http:' . $url;
 			}
 		} else {
 			if ($this->lastRefUrl !== $refUrl) {
-				$scheme = ($this->flags & self::SECURED ? 'https://' : $refUrl->getScheme() . '://');
+				$scheme = ($this->scheme ?: $refUrl->getScheme());
 				$basePath = ($this->type === self::RELATIVE ? $refUrl->getBasePath() : '');
-				$this->lastBaseUrl = $scheme . $refUrl->getAuthority() . $basePath;
+				$this->lastBaseUrl = $scheme . '://' . $refUrl->getAuthority() . $basePath;
 				$this->lastRefUrl = $refUrl;
 			}
 			$url = $this->lastBaseUrl . $url;
@@ -444,8 +448,9 @@ private function setMask($mask, array $metadata)
 		$this->mask = $mask;
 
 		// detect '//host/path' vs. '/abs. path' vs. 'relative path'
-		if (substr($mask, 0, 2) === '//') {
+		if (preg_match('#(?:(https?):)?(//.*)#A', $mask, $m)) {
 			$this->type = self::HOST;
+			list(, $this->scheme, $mask) = $m;
 
 		} elseif (substr($mask, 0, 1) === '/') {
 			$this->type = self::PATH;

tests/Routers/Route.withHost.protocol.phpt

@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * Test: Nette\Application\Routers\Route with host & protocol
+ */
+
+use Nette\Application\Routers\Route;
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+require __DIR__ . '/Route.php';
+
+
+$route = new Route('http://<host>.<domain>/<path>', [
+	'presenter' => 'Default',
+	'action' => 'default',
+]);
+
+testRouteIn($route, '/abc', 'Default', [
+	'host' => 'example',
+	'domain' => 'com',
+	'path' => 'abc',
+	'action' => 'default',
+	'test' => 'testvalue',
+], '/abc?test=testvalue');
+
+
+$route = new Route('https://<host>.<domain>/<path>', [
+	'presenter' => 'Default',
+	'action' => 'default',
+]);
+
+testRouteIn($route, '/abc', 'Default', [
+	'host' => 'example',
+	'domain' => 'com',
+	'path' => 'abc',
+	'action' => 'default',
+	'test' => 'testvalue',
+], 'https://example.com/abc?test=testvalue');

tests/Routers/Route.withHost.secured.phpt

@@ -34,10 +34,10 @@ Assert::same('http://example.org/test', $url);
 
 
 
-$route = new Route('//example.org/test', [
+$route = new Route('https://example.org/test', [
 	'presenter' => 'Default',
 	'action' => 'default',
-], Route::SECURED);
+]);
 
 $url = $route->constructUrl(
 	new Request('Default', NULL, ['action' => 'default']),