Route: fixed handling of required parameters with default value

Author: dg

src/Application/Routers/Route.php

@@ -570,11 +570,10 @@ private function setMask(string $mask, array $metadata): void
 				}
 				$meta['fixity'] = self::PATH_OPTIONAL;
 
-			} elseif (!$autoOptional) {
-				unset($meta['fixity']);
-
-			} elseif (isset($meta['fixity'])) { // auto-optional
-				$re = '(?:' . $re . ')?';
+			} elseif (isset($meta['fixity'])) {
+				if ($autoOptional) {
+					$re = '(?:' . $re . ')?';
+				}
 				$meta['fixity'] = self::PATH_OPTIONAL;
 
 			} else {

tests/Routers/Route.optional.autooptional3.phpt

@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * Test: Nette\Application\Routers\Route: required parameter with default value
+ */
+
+declare(strict_types=1);
+
+use Nette\Application\Routers\Route;
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+require __DIR__ . '/Route.php';
+
+
+$route = new Route('<presenter>/<default=123>/<required>', [
+	'action' => 'default',
+]);
+
+testRouteIn($route, '/presenter/');
+testRouteIn($route, '/presenter/abc');
+testRouteIn($route, '/presenter/abc/');
+
+testRouteIn($route, '/presenter/abc/xyy', 'Presenter', [
+	'default' => 'abc',
+	'action' => 'default',
+	'test' => 'testvalue',
+	'required' => 'xyy',
+], '/presenter/abc/xyy?test=testvalue');
+
+
+Assert::null(testRouteOut($route, 'Homepage'));
+Assert::null(testRouteOut($route, 'Homepage', ['default' => 'abc']));
+
+Assert::same(
+	'http://example.com/homepage/123/xyz',
+	testRouteOut($route, 'Homepage', ['required' => 'xyz'])
+);
+
+Assert::same(
+	'http://example.com/homepage/abc/xyz',
+	testRouteOut($route, 'Homepage', ['required' => 'xyz', 'default' => 'abc'])
+);