LinkGenerator: allow semicolon destination prefix

.github/workflows/tests.yml

@@ -7,7 +7,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php: ['7.1', '7.2', '7.3', '7.4']
+                php: ['7.2', '7.3', '7.4']
 
             fail-fast: false
 

.phpstorm.meta.php

@@ -64,3 +64,5 @@
 exitPoint(\Nette\Application\UI\Presenter::sendResponse());
 exitPoint(\Nette\Application\UI\Presenter::sendTemplate());
 exitPoint(\Nette\Application\UI\Presenter::terminate());
+
+override(\Nette\Application\UI\Control::createTemplate(0), map(['' => '@']));

.travis.yml

@@ -1,6 +1,5 @@
 language: php
 php:
-    - 7.1
     - 7.2
     - 7.3
     - 7.4

composer.json

@@ -15,7 +15,7 @@
 		}
 	],
 	"require": {
-		"php": ">=7.1",
+		"php": ">=7.2",
 		"nette/component-model": "^3.0",
 		"nette/http": "^3.0.2",
 		"nette/routing": "~3.0.0",
@@ -31,15 +31,15 @@
 		"nette/forms": "^3.0",
 		"nette/robot-loader": "^3.2",
 		"nette/security": "^3.0",
-		"latte/latte": "^2.6.2",
+		"latte/latte": "^2.7",
 		"tracy/tracy": "^2.6",
 		"mockery/mockery": "^1.0",
 		"phpstan/phpstan-nette": "^0.12"
 	},
 	"conflict": {
 		"nette/di": "<3.0-stable",
 		"nette/forms": "<3.0",
-		"latte/latte": "<2.6",
+		"latte/latte": "<2.7.1",
 		"tracy/tracy": "<2.5"
 	},
 	"autoload": {
@@ -52,7 +52,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "3.0-dev"
+			"dev-master": "3.1-dev"
 		}
 	}
 }

src/Application/LinkGenerator.php

@@ -51,6 +51,13 @@ public function link(string $dest, array $params = []): string
 		}
 		[, $presenter, $action, $frag] = $m;
 
+		if ($presenter[0] === ':') { // absolute
+			$presenter = substr($presenter, 1);
+			if (!$presenter) {
+				throw new UI\InvalidLinkException("Missing presenter name in '$dest'.");
+			}
+		}
+
 		try {
 			$class = $this->presenterFactory ? $this->presenterFactory->getPresenterClass($presenter) : null;
 		} catch (InvalidPresenterException $e) {

src/Application/MicroPresenter.php

@@ -114,7 +114,7 @@ public function run(Application\Request $request): Application\IResponse
 	public function createTemplate(string $class = null, callable $latteFactory = null): Application\UI\ITemplate
 	{
 		$latte = $latteFactory ? $latteFactory() : $this->getContext()->getByType(Nette\Bridges\ApplicationLatte\ILatteFactory::class)->create();
-		$template = $class ? new $class : new Nette\Bridges\ApplicationLatte\Template($latte);
+		$template = $class ? new $class : new Nette\Bridges\ApplicationLatte\DefaultTemplate($latte);
 
 		$template->setParameters($this->request->getParameters());
 		$template->presenter = $this;

src/Application/Routers/CliRouter.php

@@ -10,13 +10,12 @@
 namespace Nette\Application\Routers;
 
 use Nette;
-use Nette\Application;
 
 
 /**
  * The unidirectional router for CLI. (experimental)
  */
-final class CliRouter implements Application\IRouter
+final class CliRouter implements Nette\Routing\Router
 {
 	use Nette\SmartObject;
 

src/Application/Routers/Route.php

@@ -16,7 +16,7 @@
  * The bidirectional route is responsible for mapping
  * HTTP request to an array for dispatch and vice-versa.
  */
-class Route extends Nette\Routing\Route implements Nette\Application\IRouter
+class Route extends Nette\Routing\Route implements Nette\Routing\Router
 {
 	private const
 		PRESENTER_KEY = 'presenter',
@@ -40,9 +40,6 @@ class Route extends Nette\Routing\Route implements Nette\Application\IRouter
 		],
 	];
 
-	/** @deprecated */
-	public static $styles = [];
-
 	/** @var int */
 	private $flags;
 
@@ -69,12 +66,11 @@ public function __construct(string $mask, $metadata = [], int $flags = 0)
 			];
 		}
 
-		$this->defaultMeta = $this->defaultMeta + self::UI_META;
-		if (self::$styles) {
-			trigger_error('Route::$styles is deprecated.', E_USER_DEPRECATED);
-			array_replace_recursive($this->defaultMeta, self::$styles);
+		if ($flags) {
+			trigger_error(__METHOD__ . '() parameter $flags is deprecated, use RouteList::addRoute(..., ..., $flags) instead.', E_USER_DEPRECATED);
 		}
 
+		$this->defaultMeta = $this->defaultMeta + self::UI_META;
 		$this->flags = $flags;
 		parent::__construct($mask, $metadata);
 	}
@@ -149,11 +145,10 @@ public function getConstantParameters(): array
 	}
 
 
-	/**
-	 * Returns flags.
-	 */
+	/** @deprecated */
 	public function getFlags(): int
 	{
+		trigger_error(__METHOD__ . '() is deprecated.', E_USER_DEPRECATED);
 		return $this->flags;
 	}
 
@@ -210,3 +205,6 @@ public static function path2presenter(string $s): string
 		return $s;
 	}
 }
+
+
+interface_exists(Nette\Application\IRouter::class);

src/Application/Routers/RouteList.php

@@ -15,7 +15,7 @@
 /**
  * The router broker.
  */
-class RouteList extends Nette\Routing\RouteList implements Nette\Application\IRouter, \ArrayAccess, \Countable, \IteratorAggregate
+class RouteList extends Nette\Routing\RouteList implements Nette\Routing\Router, \ArrayAccess, \Countable, \IteratorAggregate
 {
 	private const PRESENTER_KEY = 'presenter';
 
@@ -93,8 +93,10 @@ public function getModule(): ?string
 	}
 
 
+	/** @deprecated */
 	public function count(): int
 	{
+		trigger_error(__METHOD__ . '() is deprecated.', E_USER_DEPRECATED);
 		return count($this->getRouters());
 	}
 
@@ -132,7 +134,7 @@ public function offsetGet($index)
 	 */
 	public function offsetExists($index): bool
 	{
-		return is_int($index) && $index >= 0 && $index < $this->count();
+		return is_int($index) && $index >= 0 && $index < count($this->getRouters());
 	}
 
 
@@ -149,8 +151,13 @@ public function offsetUnset($index): void
 	}
 
 
+	/** @deprecated */
 	public function getIterator(): \ArrayIterator
 	{
+		trigger_error(__METHOD__ . '() is deprecated, use getRouters().', E_USER_DEPRECATED);
 		return new \ArrayIterator($this->getRouters());
 	}
 }
+
+
+interface_exists(Nette\Application\IRouter::class);

src/Application/Routers/SimpleRouter.php

@@ -16,15 +16,12 @@
 /**
  * The bidirectional route for trivial routing via query parameters.
  */
-final class SimpleRouter extends Nette\Routing\SimpleRouter implements Nette\Application\IRouter
+final class SimpleRouter extends Nette\Routing\SimpleRouter implements Nette\Routing\Router
 {
 	private const
 		PRESENTER_KEY = 'presenter',
 		MODULE_KEY = 'module';
 
-	/** @var string */
-	private $module = '';
-
 	/** @var int */
 	private $flags;
 
@@ -43,31 +40,16 @@ public function __construct($defaults = [], int $flags = 0)
 		}
 
 		if (isset($defaults[self::MODULE_KEY])) {
-			trigger_error(__METHOD__ . '() parameter module is deprecated, use RouteList::withModule() instead.', E_USER_DEPRECATED);
-			$this->module = $defaults[self::MODULE_KEY] . ':';
-			unset($defaults[self::MODULE_KEY]);
+			throw new Nette\DeprecatedException(__METHOD__ . '() parameter module is deprecated, use RouteList::withModule() instead.');
+		} elseif ($flags) {
+			trigger_error(__METHOD__ . '() parameter $flags is deprecated, use RouteList::add(..., $flags) instead.', E_USER_DEPRECATED);
 		}
 
 		$this->flags = $flags;
 		parent::__construct($defaults);
 	}
 
 
-	/**
-	 * Maps HTTP request to an array.
-	 */
-	public function match(Nette\Http\IRequest $httpRequest): ?array
-	{
-		$params = parent::match($httpRequest);
-		$presenter = $params[self::PRESENTER_KEY] ?? null;
-		if (is_string($presenter)) {
-			$params[self::PRESENTER_KEY] = $this->module . $presenter;
-		}
-
-		return $params;
-	}
-
-
 	/**
 	 * Constructs absolute URL from array.
 	 */
@@ -76,20 +58,17 @@ public function constructUrl(array $params, Nette\Http\UrlScript $refUrl): ?stri
 		if ($this->flags & self::ONE_WAY) {
 			return null;
 		}
-
-		if (strncmp($params[self::PRESENTER_KEY], $this->module, strlen($this->module)) !== 0) {
-			return null;
-		}
-		$params[self::PRESENTER_KEY] = substr($params[self::PRESENTER_KEY], strlen($this->module));
 		return parent::constructUrl($params, $refUrl);
 	}
 
 
-	/**
-	 * Returns flags.
-	 */
+	/** @deprecated */
 	public function getFlags(): int
 	{
+		trigger_error(__METHOD__ . '() is deprecated.', E_USER_DEPRECATED);
 		return $this->flags;
 	}
 }
+
+
+interface_exists(Nette\Application\IRouter::class);

src/Application/UI/Component.php

@@ -199,14 +199,6 @@ final public function getParameterId(string $name): string
 	}
 
 
-	/** @deprecated */
-	final public function getParam($name = null, $default = null)
-	{
-		trigger_error(__METHOD__ . '() is deprecated; use getParameter() or getParameters() instead.', E_USER_DEPRECATED);
-		return func_num_args() ? $this->getParameter($name, $default) : $this->getParameters();
-	}
-
-
 	/********************* interface ISignalReceiver ****************d*g**/
 
 
@@ -287,21 +279,11 @@ public function isLinkCurrent(string $destination = null, $args = []): bool
 	 * @param  array|mixed  $args
 	 * @throws Nette\Application\AbortException
 	 */
-	public function redirect(/*int $code, string */$destination, $args = []): void
+	public function redirect($destination, $args = []): void
 	{
-		if (is_numeric($destination)) {
-			trigger_error(__METHOD__ . '() first parameter $code is deprecated; use redirectPermanent() for 301 redirect.', E_USER_DEPRECATED);
-			[$code, $destination, $args] = func_get_args() + [null, null, []];
-			if (func_num_args() > 3 || !is_array($args)) {
-				$args = array_slice(func_get_args(), 2);
-			}
-		} else {
-			$code = null;
-			$args = func_num_args() < 3 && is_array($args) ? $args : array_slice(func_get_args(), 1);
-		}
-
+		$args = func_num_args() < 3 && is_array($args) ? $args : array_slice(func_get_args(), 1);
 		$presenter = $this->getPresenter();
-		$presenter->redirectUrl($presenter->createRequest($this, $destination, $args, 'redirect'), $code);
+		$presenter->redirectUrl($presenter->createRequest($this, $destination, $args, 'redirect'));
 	}
 
 

src/Application/UI/Control.php

@@ -15,7 +15,7 @@
 /**
  * Control is renderable Presenter component.
  *
- * @property-read ITemplate|Nette\Bridges\ApplicationLatte\Template|\stdClass $template
+ * @property-read ITemplate|Nette\Bridges\ApplicationLatte\DefaultTemplate|\stdClass $template
  */
 abstract class Control extends Component implements IRenderable
 {
@@ -51,10 +51,31 @@ final public function getTemplate(): ITemplate
 	}
 
 
-	protected function createTemplate(): ITemplate
+	/**
+	 * @param  string  $class
+	 */
+	protected function createTemplate(/*string $class = null*/): ITemplate
 	{
+		$class = func_num_args() ? func_get_arg(0) : $this->formatTemplateClass(); // back compatibility
 		$templateFactory = $this->templateFactory ?: $this->getPresenter()->getTemplateFactory();
-		return $templateFactory->createTemplate($this);
+		return $templateFactory->createTemplate($this, $class);
+	}
+
+
+	public function formatTemplateClass(): ?string
+	{
+		$class = preg_replace('#Presenter$|Control$#', 'Template', static::class);
+		if ($class === static::class || !class_exists($class)) {
+			return null;
+		} elseif (!is_a($class, ITemplate::class, true)) {
+			trigger_error(sprintf(
+				'%s: class %s was found but does not implement the %s, so it will not be used for the template.',
+				static::class, $class, ITemplate::class
+			), E_USER_NOTICE);
+			return null;
+		} else {
+			return $class;
+		}
 	}
 
 

src/Application/UI/Link.php

@@ -41,6 +41,15 @@ public function __construct(Component $component, string $destination, array $pa
 	}
 
 
+	/**
+	 * Returns link component.
+	 */
+	public function getComponent(): Component
+	{
+		return $this->component;
+	}
+
+
 	/**
 	 * Returns link destination.
 	 */
@@ -80,6 +89,15 @@ public function getParameters(): array
 	}
 
 
+	/**
+	 * Determines whether this links to the current page.
+	 */
+	public function isLinkCurrent(): bool
+	{
+		return $this->component->isLinkCurrent($this->destination, $this->params);
+	}
+
+
 	/**
 	 * Converts link to URL.
 	 */