Route: fixed bug for constant module & presenter [Closes #216]

Author: dg

src/Application/Routers/Route.php

@@ -139,7 +139,12 @@ public function constructUrl(array $params, Nette\Http\UrlScript $refUrl): ?stri
 	public function getConstantParameters(): array
 	{
 		$res = parent::getConstantParameters();
-		unset($res['module']);
+		if (isset($res[self::MODULE_KEY], $res[self::PRESENTER_KEY])) {
+			$res[self::PRESENTER_KEY] = $res[self::MODULE_KEY] . ':' . $res[self::PRESENTER_KEY];
+		} elseif (isset($this->getMetadata()[self::MODULE_KEY])) {
+			unset($res[self::PRESENTER_KEY]);
+		}
+		unset($res[self::MODULE_KEY]);
 		return $res;
 	}
 

tests/Routers/Route.modules.fixity.phpt

@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Test: Nette\Application\Routers\Route & module fixity.
+ */
+
+declare(strict_types=1);
+
+use Nette\Application\Routers\Route;
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+$route = new Route('auth', [
+	'module' => 'Auth',
+	'presenter' => 'Homepage',
+	'action' => 'default',
+]);
+
+Assert::same(['presenter' => 'Auth:Homepage', 'action' => 'default'], $route->getConstantParameters());
+
+
+$route = new Route('<module>', [
+	'presenter' => 'Homepage',
+	'action' => 'default',
+]);
+
+Assert::same(['action' => 'default'], $route->getConstantParameters());
+
+
+$route = new Route('<presenter>', [
+	'module' => 'Auth',
+	'action' => 'default',
+]);
+
+Assert::same(['action' => 'default'], $route->getConstantParameters());