support for PHP 8.5

Author: dg

.github/workflows/tests.yml

@@ -7,7 +7,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php: ['8.1', '8.2', '8.3', '8.4']
+                php: ['8.1', '8.2', '8.3', '8.4', '8.5']
 
             fail-fast: false
 

composer.json

@@ -15,7 +15,7 @@
 		}
 	],
 	"require": {
-		"php": "8.1 - 8.4",
+		"php": "8.1 - 8.5",
 		"nette/http": "^3.2 || ~4.0.0",
 		"nette/utils": "^4.0"
 	},

readme.md

@@ -14,7 +14,7 @@ The router is responsible for everything about URLs so that you no longer have t
 - a few notes about SEO redirection
 - and we'll show you how to write your own router
 
-It requires PHP version 8.1 and supports PHP up to 8.4.
+It requires PHP version 8.1 and supports PHP up to 8.5.
 
 Documentation can be found on the [website](https://doc.nette.org/routing).
 

src/Routing/Route.php

@@ -235,8 +235,8 @@ public function match(Nette\Http\IRequest $httpRequest): ?array
 			}
 		}
 
-		if (isset($this->metadata[null][self::FilterIn])) {
-			$params = $this->metadata[null][self::FilterIn]($params);
+		if (isset($this->metadata[''][self::FilterIn])) {
+			$params = $this->metadata[''][self::FilterIn]($params);
 			if ($params === null) {
 				return null;
 			}
@@ -297,7 +297,7 @@ public function constructUrl(array $params, Nette\Http\UrlScript $refUrl): ?stri
 
 	private function preprocessParams(array &$params): bool
 	{
-		$filter = $this->metadata[null][self::FilterOut] ?? null;
+		$filter = $this->metadata[''][self::FilterOut] ?? null;
 		if ($filter) {
 			$params = $filter($params);
 			if ($params === null) {

src/Routing/RouteList.php

@@ -116,7 +116,7 @@ public function constructUrl(array $params, Nette\Http\UrlScript $refUrl): ?stri
 			$this->warmupCache();
 		}
 
-		$key = $params[$this->cacheKey] ?? null;
+		$key = $params[$this->cacheKey ?? ''] ?? null;
 		if (!is_scalar($key) || !isset($this->ranks[$key])) {
 			$key = '*';
 		}
@@ -167,7 +167,7 @@ public function warmupCache(): void
 		$ranks = ['*' => []];
 
 		foreach ($routers as [$router, $params]) {
-			$value = $params[$this->cacheKey] ?? null;
+			$value = $params[$this->cacheKey ?? ''] ?? null;
 			$values = $value === null
 				? array_keys($ranks)
 				: [is_scalar($value) ? $value : '*'];

tests/Route/filter.global.phpt

@@ -14,7 +14,7 @@ require __DIR__ . '/../bootstrap.php';
 
 
 $route = new Route('<presenter>', [
-	null => [
+	'' => [
 		Route::FilterIn => function (array $arr) {
 			if (substr($arr['presenter'], 0, 3) !== 'abc') {
 				return null;
@@ -48,7 +48,7 @@ Assert::null(testRouteOut($route, ['presenter' => 'cde']));
 
 
 $route = new Route('<lang>/<presenter>/<action>', [
-	null => [
+	'' => [
 		Route::FilterIn => function (array $arr) {
 			if ($arr['presenter'] !== 'abc-cs') {
 				return null;