LinkGenerator: accept classname in $dest

.github/workflows/coding-style.yml

@@ -10,7 +10,7 @@ jobs:
             - uses: actions/checkout@v2
             - uses: shivammathur/setup-php@v2
               with:
-                  php-version: 7.2
+                  php-version: 8.0
                   coverage: none
 
             - run: composer create-project nette/code-checker temp/code-checker ^3 --no-progress

.github/workflows/static-analysis.yml

@@ -13,7 +13,7 @@ jobs:
             - uses: actions/checkout@v2
             - uses: shivammathur/setup-php@v2
               with:
-                  php-version: 7.4
+                  php-version: 8.0
                   coverage: none
 
             - run: composer install --no-progress --prefer-dist

.github/workflows/tests.yml

@@ -7,7 +7,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php: ['7.2', '7.3', '7.4', '8.0', '8.1']
+                php: ['8.0', '8.1']
 
             fail-fast: false
 
@@ -35,7 +35,7 @@ jobs:
             - uses: actions/checkout@v2
             - uses: shivammathur/setup-php@v2
               with:
-                  php-version: 7.2
+                  php-version: 8.0
                   coverage: none
 
             - run: composer update --no-progress --prefer-dist --prefer-lowest --prefer-stable
@@ -49,7 +49,7 @@ jobs:
             - uses: actions/checkout@v2
             - uses: shivammathur/setup-php@v2
               with:
-                  php-version: 7.4
+                  php-version: 8.0
                   coverage: none
 
             - run: composer install --no-progress --prefer-dist

composer.json

@@ -15,25 +15,25 @@
 		}
 	],
 	"require": {
-		"php": ">=7.2",
-		"nette/component-model": "^3.0",
-		"nette/http": "^3.0.2",
-		"nette/routing": "^3.0.2",
-		"nette/utils": "^3.2.1"
+		"php": ">=8.0 <8.2",
+		"nette/component-model": "^4.0",
+		"nette/http": "^4.0",
+		"nette/routing": "^4.0",
+		"nette/utils": "^3.2.1 || ^4.0"
 	},
 	"suggest": {
 		"nette/forms": "Allows to use Nette\\Application\\UI\\Form",
 		"latte/latte": "Allows using Latte in templates"
 	},
 	"require-dev": {
-		"nette/tester": "^2.3.1",
-		"nette/di": "^v3.0",
-		"nette/forms": "^3.0",
-		"nette/robot-loader": "^3.2",
-		"nette/security": "^3.0",
+		"nette/tester": "^2.4",
+		"nette/di": "^v4.0",
+		"nette/forms": "^4.0",
+		"nette/robot-loader": "^3.2 || ^4.0",
+		"nette/security": "^4.0",
 		"latte/latte": "^2.10.2",
-		"tracy/tracy": "^2.6",
-		"mockery/mockery": "^1.0",
+		"tracy/tracy": "^2.8",
+		"mockery/mockery": "^1.4",
 		"phpstan/phpstan-nette": "^0.12"
 	},
 	"conflict": {
@@ -54,7 +54,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "3.1-dev"
+			"dev-master": "4.0-dev"
 		}
 	}
 }

src/Application/Application.php

@@ -21,14 +21,12 @@ class Application
 {
 	use Nette\SmartObject;
 
-	/** @var int */
-	public $maxLoop = 20;
+	public int $maxLoop = 20;
 
-	/** @var bool enable fault barrier? */
-	public $catchExceptions;
+	/** enable fault barrier? */
+	public bool $catchExceptions = false;
 
-	/** @var string|null */
-	public $errorPresenter;
+	public ?string $errorPresenter = null;
 
 	/** @var array<callable(self): void>  Occurs before the application loads presenter */
 	public $onStartup = [];
@@ -49,29 +47,24 @@ class Application
 	public $onError = [];
 
 	/** @var Request[] */
-	private $requests = [];
+	private array $requests = [];
 
-	/** @var IPresenter|null */
-	private $presenter;
+	private ?IPresenter $presenter = null;
 
-	/** @var Nette\Http\IRequest */
-	private $httpRequest;
+	private Nette\Http\IRequest $httpRequest;
 
-	/** @var Nette\Http\IResponse */
-	private $httpResponse;
+	private Nette\Http\IResponse $httpResponse;
 
-	/** @var IPresenterFactory */
-	private $presenterFactory;
+	private IPresenterFactory $presenterFactory;
 
-	/** @var Router */
-	private $router;
+	private Router $router;
 
 
 	public function __construct(
 		IPresenterFactory $presenterFactory,
 		Router $router,
 		Nette\Http\IRequest $httpRequest,
-		Nette\Http\IResponse $httpResponse
+		Nette\Http\IResponse $httpResponse,
 	) {
 		$this->httpRequest = $httpRequest;
 		$this->httpResponse = $httpResponse;
@@ -117,7 +110,7 @@ public function createInitialRequest(): Request
 			throw new BadRequestException('No route for HTTP request.');
 		} elseif (!is_string($presenter)) {
 			throw new Nette\InvalidStateException('Missing presenter in route definition.');
-		} elseif (Nette\Utils\Strings::startsWith($presenter, 'Nette:') && $presenter !== 'Nette:Micro') {
+		} elseif (str_starts_with($presenter, 'Nette:') && $presenter !== 'Nette:Micro') {
 			throw new BadRequestException('Invalid request. Presenter is not achievable.');
 		}
 
@@ -128,7 +121,7 @@ public function createInitialRequest(): Request
 			$params,
 			$this->httpRequest->getPost(),
 			$this->httpRequest->getFiles(),
-			[Request::SECURED => $this->httpRequest->isSecured()]
+			[Request::SECURED => $this->httpRequest->isSecured()],
 		);
 	}
 

src/Application/ErrorPresenter.php

@@ -22,13 +22,9 @@ final class ErrorPresenter implements Application\IPresenter
 {
 	use Nette\SmartObject;
 
-	/** @var ILogger|null */
-	private $logger;
-
-
-	public function __construct(ILogger $logger = null)
-	{
-		$this->logger = $logger;
+	public function __construct(
+		private ?ILogger $logger = null,
+	) {
 	}
 
 

src/Application/LinkGenerator.php

@@ -21,32 +21,26 @@ final class LinkGenerator
 {
 	use Nette\SmartObject;
 
-	/** @var Router */
-	private $router;
-
-	/** @var UrlScript */
-	private $refUrl;
-
-	/** @var IPresenterFactory|null */
-	private $presenterFactory;
-
-
-	public function __construct(Router $router, UrlScript $refUrl, IPresenterFactory $presenterFactory = null)
-	{
-		$this->router = $router;
-		$this->refUrl = $refUrl;
-		$this->presenterFactory = $presenterFactory;
+	public function __construct(
+		private Router $router,
+		private UrlScript $refUrl,
+		private ?IPresenterFactory $presenterFactory = null,
+	) {
 	}
 
 
 	/**
 	 * Generates URL to presenter.
-	 * @param  string   $dest in format "[[[module:]presenter:]action] [#fragment]"
+	 * @param  string   $dest in format "[[[module:]presenter:]action] [#fragment]" or "[[Class\Name:]action] [#fragment]"
 	 * @throws UI\InvalidLinkException
 	 */
 	public function link(string $dest, array $params = []): string
 	{
-		if (!preg_match('~^([\w:]+):(\w*+)(#.*)?()$~D', $dest, $m)) {
+		if (!preg_match('~^([\w:]+):(\w*+)(#.*)?()$~D', $dest, $m)
+			&& !preg_match('~^([\\\]?\w+(?:[\\\]{1}\w+)+):(\w*+)(#.*)?()$~D', $dest, $m)
+		) {
+			throw new UI\InvalidLinkException("Invalid link destination '$dest'.");
+		}
 			throw new UI\InvalidLinkException("Invalid link destination '$dest'.");
 		}
 		[, $presenter, $action, $frag] = $m;
@@ -93,12 +87,12 @@ public function link(string $dest, array $params = []): string
 	}
 
 
-	public function withReferenceUrl(string $url): self
+	public function withReferenceUrl(string $url): static
 	{
 		return new self(
 			$this->router,
 			new UrlScript($url),
-			$this->presenterFactory
+			$this->presenterFactory,
 		);
 	}
 }

src/Application/MicroPresenter.php

@@ -24,27 +24,14 @@ final class MicroPresenter implements Application\IPresenter
 {
 	use Nette\SmartObject;
 
-	/** @var Nette\DI\Container|null */
-	private $context;
-
-	/** @var Nette\Http\IRequest|null */
-	private $httpRequest;
-
-	/** @var Router|null */
-	private $router;
-
-	/** @var Application\Request|null */
-	private $request;
+	private ?Application\Request $request;
 
 
 	public function __construct(
-		Nette\DI\Container $context = null,
-		Http\IRequest $httpRequest = null,
-		Router $router = null
+		private ?Nette\DI\Container $context = null,
+		private ?Nette\Http\IRequest $httpRequest = null,
+		private ?Router $router = null,
 	) {
-		$this->context = $context;
-		$this->httpRequest = $httpRequest;
-		$this->router = $router;
 	}