Presenter: added parseDestination(), taken out from createRequest()

Author: dg

src/Application/UI/Presenter.php

@@ -725,17 +725,11 @@ protected function createRequest(Component $component, string $destination, arra
 
 		$this->lastCreatedRequest = $this->lastCreatedRequestFlag = NULL;
 
-		// PARSE DESTINATION
-		if (!preg_match('~^ (?<absolute>//)?+ (?<path>[^!?#]++) (?<signal>!)?+ (?<query>\?[^#]*)?+ (?<fragment>\#.*)?+ $~x', $destination, $parts)) {
-			throw new InvalidLinkException("Invalid destination '$destination'.");
-		}
-
+		$parts = $this->parseDestination($destination);
 		$path = $parts['path'];
-		if (!empty($parts['query'])) {
-			parse_str(substr($parts['query'], 1), $args);
-		}
+		$args = $parts['args'] ?? $args;
 
-		if (!$component instanceof self || !empty($parts['signal'])) {
+		if (!$component instanceof self || $parts['signal']) {
 			[$cname, $signal] = Helpers::splitName($path);
 			if ($cname !== '') {
 				$component = $component->getComponent(strtr($cname, ':', '-'));
@@ -881,7 +875,30 @@ protected function createRequest(Component $component, string $destination, arra
 
 		return $mode === 'forward' || $mode === 'test'
 			? NULL
-			: $this->requestToUrl($this->lastCreatedRequest, $mode === 'link' && !$parts['absolute']) . ($parts['fragment'] ?? '');
+			: $this->requestToUrl($this->lastCreatedRequest, $mode === 'link' && !$parts['absolute']) . $parts['fragment'];
+	}
+
+
+	/**
+	 * Parse destination in format "[//] [[[module:]presenter:]action | signal! | this] [?query] [#fragment]"
+	 * @throws InvalidLinkException
+	 * @internal
+	 */
+	public static function parseDestination(string $destination): array
+	{
+		if (!preg_match('~^ (?<absolute>//)?+ (?<path>[^!?#]++) (?<signal>!)?+ (?<query>\?[^#]*)?+ (?<fragment>\#.*)?+ $~x', $destination, $matches)) {
+			throw new InvalidLinkException("Invalid destination '$destination'.");
+		}
+		if (!empty($matches['query'])) {
+			parse_str(substr($matches['query'], 1), $args);
+		}
+		return [
+			'absolute' => (bool) $matches['absolute'],
+			'path' => $matches['path'],
+			'signal' => !empty($matches['signal']),
+			'args' => $args ?? NULL,
+			'fragment' => $matches['fragment'] ?? '',
+		];
 	}
 
 

tests/UI/Presenter.parseDestination().phpt

@@ -0,0 +1,63 @@
+<?php
+
+declare(strict_types=1);
+
+use Nette\Application\UI\Presenter;
+use Nette\Application\UI\InvalidLinkException;
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+Assert::same([
+	'absolute' => FALSE,
+	'path' => 'a:b',
+	'signal' => FALSE,
+	'args' => NULL,
+	'fragment' => '',
+], Presenter::parseDestination('a:b'));
+
+Assert::same([
+	'absolute' => FALSE,
+	'path' => 'a:b',
+	'signal' => TRUE,
+	'args' => NULL,
+	'fragment' => '',
+], Presenter::parseDestination('a:b!'));
+
+Assert::same([
+	'absolute' => TRUE,
+	'path' => 'a:b',
+	'signal' => FALSE,
+	'args' => NULL,
+	'fragment' => '',
+], Presenter::parseDestination('//a:b'));
+
+Assert::same([
+	'absolute' => FALSE,
+	'path' => 'a:b',
+	'signal' => FALSE,
+	'args' => NULL,
+	'fragment' => '#fragment',
+], Presenter::parseDestination('a:b#fragment'));
+
+Assert::same([
+	'absolute' => FALSE,
+	'path' => 'a:b',
+	'signal' => FALSE,
+	'args' => [],
+	'fragment' => '#fragment',
+], Presenter::parseDestination('a:b?#fragment'));
+
+Assert::same([
+	'absolute' => FALSE,
+	'path' => 'a:b',
+	'signal' => FALSE,
+	'args' => ['a' => 'b', 'c' => 'd'],
+	'fragment' => '#fragment',
+], Presenter::parseDestination('a:b?a=b&c=d#fragment'));
+
+Assert::exception(function () {
+	Presenter::parseDestination('');
+}, InvalidLinkException::class);