uses nette/routing 4.0

nette · Apr 28, 2023 · d89516e · d89516e
1 parent 08a6e52
commit d89516e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 9 deletions.
diff --git a/.phpstorm.meta.php b/.phpstorm.meta.php
@@ -4,9 +4,6 @@
 
 namespace PHPSTORM_META;
 
-expectedArguments(\Nette\Application\Routers\Route::__construct(), 2, \Nette\Routing\Router::ONE_WAY);
-expectedArguments(\Nette\Application\Routers\SimpleRouter::__construct(), 1, \Nette\Routing\Router::ONE_WAY);
-
 registerArgumentsSet('nette_http_codes_3xx',
 	\Nette\Http\IResponse::S300_MultipleChoices,
 	\Nette\Http\IResponse::S301_MovedPermanently,

diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
 		"php": ">=8.0 <8.3",
 		"nette/component-model": "^4.0",
 		"nette/http": "^4.0",
-		"nette/routing": "^3.0.2",
+		"nette/routing": "^4.0",
 		"nette/utils": "^4.0"
 	},
 	"suggest": {

diff --git a/src/Application/Routers/RouteList.php b/src/Application/Routers/RouteList.php
@@ -67,10 +67,10 @@ public function addRoute(
 		#[Language('TEXT')]
 		string $mask,
 		array|string|\Closure $metadata = [],
-		int $flags = 0,
+		bool $oneWay = false,
 	): static
 	{
-		$this->add(new Route($mask, $metadata), $flags);
+		$this->add(new Route($mask, $metadata), $oneWay);
 		return $this;
 	}
 

diff --git a/src/Bridges/ApplicationTracy/RoutingPanel.php b/src/Bridges/ApplicationTracy/RoutingPanel.php
@@ -82,7 +82,7 @@ private function analyse(
 		string $module = '',
 		?string $path = null,
 		int $level = -1,
-		int $flag = 0,
+		array $flag = [],
 	): void
 	{
 		if ($router instanceof Routing\RouteList) {
@@ -121,7 +121,7 @@ private function analyse(
 			return;
 		}
 
-		$matched = $flag & Routing\RouteList::ONE_WAY ? 'oneway' : 'no';
+		$matched = empty($flag['oneWay']) ? 'no' : 'oneway';
 		$params = $e = null;
 		try {
 			$params = $httpRequest

diff --git a/tests/Routers/RouteList.addRoute.phpt b/tests/Routers/RouteList.addRoute.phpt
@@ -12,7 +12,7 @@ require __DIR__ . '/Route.php';
 
 $list = new RouteList;
 $list->addRoute('foo', ['presenter' => 'foo'], RouteList::ONE_WAY);
-$list->addRoute('bar', ['presenter' => 'bar'], RouteList::ONE_WAY);
+$list->addRoute('bar', ['presenter' => 'bar'], oneWay: true);
 $list->addRoute('hello', ['presenter' => 'hello']);