Refactor Application to return Response from processRequest

.github/workflows/coding-style.yml

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

.github/workflows/tests.yml

@@ -22,9 +22,9 @@ jobs:
             - run: composer install --no-progress --prefer-dist
             - run: vendor/bin/tester tests -s -C
             - if: failure()
-              uses: actions/upload-artifact@v3
+              uses: actions/upload-artifact@v4
               with:
-                  name: output
+                  name: output-${{ matrix.php }}
                   path: tests/**/output
 
 
@@ -40,11 +40,6 @@ jobs:
 
             - run: composer update --no-progress --prefer-dist --prefer-lowest --prefer-stable
             - run: vendor/bin/tester tests -s -C
-            - if: failure()
-              uses: actions/upload-artifact@v3
-              with:
-                  name: output
-                  path: tests/**/output
 
 
     code_coverage:

composer.json

@@ -17,7 +17,7 @@
 	"require": {
 		"php": "8.1 - 8.4",
 		"nette/component-model": "^3.1",
-		"nette/http": "^3.3",
+		"nette/http": "^3.3.2",
 		"nette/routing": "^3.1",
 		"nette/utils": "^4.0"
 	},
@@ -26,12 +26,12 @@
 		"latte/latte": "Allows using Latte in templates"
 	},
 	"require-dev": {
-		"nette/tester": "^2.5",
+		"nette/tester": "^2.5.2",
 		"nette/di": "^3.2",
 		"nette/forms": "^3.2",
 		"nette/robot-loader": "^4.0",
 		"nette/security": "^3.2",
-		"latte/latte": "^2.10.2 || ^3.0.18",
+		"latte/latte": "^3.0.18",
 		"tracy/tracy": "^2.9",
 		"mockery/mockery": "^1.6@stable",
 		"phpstan/phpstan-nette": "^2.0@stable",
@@ -42,7 +42,7 @@
 		"nette/di": "<3.2",
 		"nette/forms": "<3.2",
 		"nette/schema": "<1.3",
-		"latte/latte": "<2.7.1 || >=3.0.0 <3.0.18 || >=3.1",
+		"latte/latte": "<3.0.18",
 		"tracy/tracy": "<2.9"
 	},
 	"autoload": {
@@ -58,7 +58,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "3.2-dev"
+			"dev-master": "4.0-dev"
 		}
 	}
 }

readme.md

@@ -2,7 +2,7 @@ Nette Application MVC
 =====================
 
 [![Downloads this Month](https://img.shields.io/packagist/dm/nette/application.svg)](https://packagist.org/packages/nette/application)
-[![Tests](https://github.com/nette/application/actions/workflows/tests.yml/badge.svg?branch=v3.2)](https://github.com/nette/application/actions)
+[![Tests](https://github.com/nette/application/actions/workflows/tests.yml/badge.svg?branch=master)](https://github.com/nette/application/actions)
 [![Latest Stable Version](https://poser.pugx.org/nette/application/v/stable)](https://github.com/nette/application/releases)
 [![License](https://img.shields.io/badge/license-New%20BSD-blue.svg)](https://github.com/nette/application/blob/master/license.md)
 

src/Application/Application.php

@@ -12,6 +12,7 @@
 use Nette;
 use Nette\Routing\Router;
 use Nette\Utils\Arrays;
+use function count, is_string, str_starts_with, strcasecmp;
 
 
 /**
@@ -73,15 +74,15 @@ public function run(): void
 	{
 		try {
 			Arrays::invoke($this->onStartup, $this);
-			$this->processRequest($this->createInitialRequest());
+			$this->processRequest($this->createInitialRequest())->send($this->httpRequest, $this->httpResponse);
 			Arrays::invoke($this->onShutdown, $this);
 
 		} catch (\Throwable $e) {
 			$this->sendHttpCode($e);
 			Arrays::invoke($this->onError, $this, $e);
 			if ($this->catchExceptions && ($req = $this->createErrorRequest($e))) {
 				try {
-					$this->processRequest($req);
+					$this->processRequest($req)->send($this->httpRequest, $this->httpResponse);
 					Arrays::invoke($this->onShutdown, $this, $e);
 					return;
 
@@ -120,7 +121,7 @@ public function createInitialRequest(): Request
 	}
 
 
-	public function processRequest(Request $request): void
+	public function processRequest(Request $request): Response
 	{
 		process:
 		if (count($this->requests) > $this->maxLoop) {
@@ -155,7 +156,7 @@ public function processRequest(Request $request): void
 		}
 
 		Arrays::invoke($this->onResponse, $this, $response);
-		$response->send($this->httpRequest, $this->httpResponse);
+		return $response;
 	}
 
 

src/Application/Helpers.php

@@ -10,6 +10,7 @@
 namespace Nette\Application;
 
 use Nette;
+use function class_parents, class_uses, strrpos, substr;
 
 
 /**

src/Application/LinkGenerator.php

@@ -12,6 +12,7 @@
 use Nette\Http\UrlScript;
 use Nette\Routing\Router;
 use Nette\Utils\Reflection;
+use function array_intersect_key, array_key_exists, http_build_query, is_string, is_subclass_of, parse_str, preg_match, rtrim, str_contains, str_ends_with, strcasecmp, strlen, strncmp, strtr, substr, trigger_error, urldecode;
 
 
 /**
@@ -242,6 +243,7 @@ public static function parseDestination(string $destination): array
 		}
 
 		if (!empty($matches['query'])) {
+			trigger_error("Link format is obsolete, use arguments instead of query string in '$destination'.", E_USER_DEPRECATED);
 			parse_str(substr($matches['query'], 1), $args);
 		}
 

src/Application/MicroPresenter.php

@@ -15,6 +15,7 @@
 use Nette\Application\Responses;
 use Nette\Http;
 use Nette\Routing\Router;
+use function is_array, is_object, is_string;
 
 
 /**
@@ -22,7 +23,7 @@
  */
 final class MicroPresenter implements Application\IPresenter
 {
 	private ?Application\Request $request;
 
 
 	public function __construct(
@@ -91,7 +92,7 @@
 
 		if (is_array($response)) {
 			[$templateSource, $templateParams] = $response;
 			$response = $this->createTemplate()->setParameters($templateParams);
 			if (!$templateSource instanceof \SplFileInfo) {
 				$response->getLatte()->setLoader(new Latte\Loaders\StringLoader);
 			}

src/Application/PresenterFactory.php

@@ -10,6 +10,7 @@
 namespace Nette\Application;
 
 use Nette;
+use function array_shift, class_exists, count, explode, is_array, is_string, preg_match, strtr;
 
 
 /**
@@ -19,7 +20,7 @@ class PresenterFactory implements IPresenterFactory
 {
 	/** @var array[] of module => splited mask */
 	private array $mapping = [
-		'*' => ['', '*Module\\', '*Presenter'],
+		'*' => ['App\Presentation\\', '*\\', '**Presenter'],
 		'Nette' => ['NetteModule\\', '*\\', '*Presenter'],
 	];
 

src/Application/Request.php

@@ -10,16 +10,17 @@
 namespace Nette\Application;
 
 use Nette;
+use function func_num_args, strcasecmp;
 
 
 /**
  * Presenter request.
  *
- * @property string $presenterName
- * @property array $parameters
- * @property array $post
- * @property array $files
- * @property string|null $method
+ * @property-deprecated string $presenterName
+ * @property-deprecated array $parameters
+ * @property-deprecated array $post
+ * @property-deprecated array $files
+ * @property-deprecated string|null $method
  */
 final class Request
 {

src/Application/Responses/FileResponse.php

@@ -10,6 +10,7 @@
 namespace Nette\Application\Responses;
 
 use Nette;
+use function strlen;
 
 
 /**

src/Application/Routers/CliRouter.php

@@ -10,6 +10,7 @@
 namespace Nette\Application\Routers;
 
 use Nette;
+use function is_array;
 
 
 /**

src/Application/Routers/Route.php

@@ -10,6 +10,7 @@
 namespace Nette\Application\Routers;
 
 use Nette;
+use function is_string, lcfirst, preg_replace, rawurlencode, str_replace, strlen, strncmp, strrpos, strtolower, strtr, substr, ucwords;
 
 
 /**
@@ -84,8 +85,8 @@
 			return null;
 		}
 
 		$presenter = $params[self::PresenterKey] ?? null;
 		if (isset($this->getMetadata()[self::ModuleKey], $params[self::ModuleKey]) && is_string($presenter)) {
 			$params[self::PresenterKey] = $params[self::ModuleKey] . ':' . $params[self::PresenterKey];
 		}
 
@@ -187,6 +188,3 @@
 		return $s;
 	}
 }
-
-
-interface_exists(Nette\Application\IRouter::class);

src/Application/Routers/RouteList.php

@@ -11,12 +11,13 @@
 
 use JetBrains\PhpStorm\Language;
 use Nette;
+use function count, is_int, is_string, strlen, strncmp, substr;
 
 
 /**
  * The router broker.
  */
 class RouteList extends Nette\Routing\RouteList implements Nette\Routing\Router, \ArrayAccess
 {
 	private const PresenterKey = 'presenter';
 
@@ -75,7 +76,7 @@
 
 	public function withModule(string $module): static
 	{
 		$router = new static;
 		$router->module = $module . ':';
 		$router->parent = $this;
 		$this->add($router);
@@ -95,6 +96,13 @@
 	 */
 	public function offsetSet($index, $router): void
 	{
+		if ($router instanceof Route) {
+			trigger_error('Usage `$router[] = new Route(...)` is deprecated, use `$router->addRoute(...)`.', E_USER_DEPRECATED);
+		} else {
+			$class = getclass($router);
+			trigger_error("Usage `\$router[] = new $class` is deprecated, use `\$router->add(new $class)`.", E_USER_DEPRECATED);
+		}
+
 		if ($index === null) {
 			$this->add($router);
 		} else {
@@ -109,6 +117,7 @@
 	 */
 	public function offsetGet($index): Nette\Routing\Router
 	{
+		trigger_error('Usage `$route = $router[...]` is deprecated, use `$router->getRouters()`.', E_USER_DEPRECATED);
 		if (!$this->offsetExists($index)) {
 			throw new Nette\OutOfRangeException('Offset invalid or out of range');
 		}
@@ -122,7 +131,8 @@
 	 */
 	public function offsetExists($index): bool
 	{
+		trigger_error('Usage `isset($router[...])` is deprecated.', E_USER_DEPRECATED);
 		return is_int($index) && $index >= 0 && $index < count($this->getRouters());
 	}
 
 
@@ -132,13 +142,11 @@
 	 */
 	public function offsetUnset($index): void
 	{
+		trigger_error('Usage `unset($router[$index])` is deprecated, use `$router->modify($index, null)`.', E_USER_DEPRECATED);
 		if (!$this->offsetExists($index)) {
 			throw new Nette\OutOfRangeException('Offset invalid or out of range');
 		}
 
 		$this->modify($index, null);
 	}
 }
-
-
-interface_exists(Nette\Application\IRouter::class);

src/Application/Routers/SimpleRouter.php

@@ -11,6 +11,7 @@
 
 use Nette;
 use Nette\Application;
+use function is_string;
 
 
 /**
@@ -38,6 +39,3 @@ public function __construct(array|string $defaults = [])
 		parent::__construct($defaults);
 	}
 }
-
-
-interface_exists(Nette\Application\IRouter::class);

src/Application/UI/AccessPolicy.php

@@ -12,6 +12,7 @@
 use Nette;
 use Nette\Application\Attributes;
 use Nette\Utils\Reflection;
+use function array_map, implode, in_array, str_starts_with, strtoupper;
 
 
 /**