Move parameters group into current route

src/CurrentRoute.php

@@ -5,7 +5,7 @@
 namespace Yiisoft\Router;
 
 use Psr\Http\Message\UriInterface;
-use RuntimeException;
+use LogicException;
 
 /**
  * Holds information about current route e.g. matched last.
@@ -24,6 +24,11 @@ final class CurrentRoute implements CurrentRouteInterface
      */
     private ?UriInterface $uri = null;
 
+    /**
+     * Current Route parameters
+     */
+    private array $parameters = [];
+
     /**
      * Returns the current route name.
      *
@@ -63,7 +68,7 @@ public function setRoute(RouteParametersInterface $route): void
             $this->route = $route;
             return;
         }
-        throw new RuntimeException('Can not set route since it was already set.');
+        throw new LogicException('Can not set route since it was already set.');
     }
 
     /**
@@ -75,6 +80,25 @@ public function setUri(UriInterface $uri): void
             $this->uri = $uri;
             return;
         }
-        throw new RuntimeException('Can not set URI since it was already set.');
+        throw new LogicException('Can not set URI since it was already set.');
+    }
+
+    public function getParameters(): array
+    {
+        return $this->parameters;
+    }
+
+    public function getParameter(string $name, $default = null): ?string
+    {
+        return $this->parameters[$name] ?? $default;
+    }
+
+    public function setParameters(array $parameters)
+    {
+        if ($this->parameters === []) {
+            $this->parameters = $parameters;
+            return;
+        }
+        throw new LogicException('Can not set parameters since it was already set.');
     }
 }

src/CurrentRouteInterface.php

@@ -28,4 +28,21 @@ public function getRoute(): ?RouteParametersInterface;
      * @return UriInterface|null The current URI.
      */
     public function getUri(): ?UriInterface;
+
+    /**
+     * Returns the current route parameters.
+     *
+     * @return array
+     */
+    public function getParameters(): array;
+
+    /**
+     * Returns the current route parameter.
+     *
+     * @param string $name
+     * @param mixed $default
+     *
+     * @return mixed
+     */
+    public function getParameter(string $name, $default = null);
 }

src/Middleware/Router.php

@@ -56,10 +56,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
         }
 
         $this->currentRoute->setRoute($result->route());
-
-        foreach ($result->parameters() as $parameter => $value) {
-            $request = $request->withAttribute($parameter, $value);
-        }
+        $this->currentRoute->setParameters($result->parameters());
 
         return $result->withDispatcher($this->dispatcher)->process($request, $handler);
     }

tests/CurrentRouteTest.php

@@ -4,6 +4,7 @@
 
 namespace Yiisoft\Router\Tests;
 
+use LogicException;
 use Nyholm\Psr7\Uri;
 use PHPUnit\Framework\TestCase;
 use Yiisoft\Router\CurrentRoute;
@@ -37,4 +38,74 @@ public function testGetCurrentUri(): void
 
         $this->assertSame($uri, $currentRoute->getUri());
     }
+
+    public function testGetParameters(): void
+    {
+        $parameters = [
+            'test' => 'test',
+            'foo' => 'bar',
+        ];
+        $currentRoute = new CurrentRoute();
+        $currentRoute->setParameters($parameters);
+
+        $this->assertSame($parameters, $currentRoute->getParameters());
+    }
+
+    public function testGetParameter(): void
+    {
+        $parameters = [
+            'test' => 'test',
+            'foo' => 'bar',
+        ];
+        $currentRoute = new CurrentRoute();
+        $currentRoute->setParameters($parameters);
+
+        $this->assertSame('bar', $currentRoute->getParameter('foo'));
+    }
+
+    public function testGetParameterWithDefault()
+    {
+        $currentRoute = new CurrentRoute();
+        $currentRoute->setParameters(['test' => 1]);
+
+        $this->assertSame('bar', $currentRoute->getParameter('foo', 'bar'));
+    }
+
+    public function testGetParameterWithNonExist()
+    {
+        $currentRoute = new CurrentRoute();
+        $currentRoute->setParameters(['test' => 1]);
+
+        $this->assertNull($currentRoute->getParameter('foo'));
+    }
+
+    public function testSetRouteTwice()
+    {
+        $this->expectException(LogicException::class);
+        $this->expectExceptionMessage('Can not set route since it was already set.');
+
+        $currentRoute = new CurrentRoute();
+        $currentRoute->setRoute(Route::get('')->name('test'));
+        $currentRoute->setRoute(Route::get('/home')->name('home'));
+    }
+
+    public function testSetUriTwice()
+    {
+        $this->expectException(LogicException::class);
+        $this->expectExceptionMessage('Can not set URI since it was already set.');
+
+        $currentRoute = new CurrentRoute();
+        $currentRoute->setUri(new Uri(''));
+        $currentRoute->setUri(new Uri('home'));
+    }
+
+    public function testSetParametersTwice()
+    {
+        $this->expectException(LogicException::class);
+        $this->expectExceptionMessage('Can not set parameters since it was already set.');
+
+        $currentRoute = new CurrentRoute();
+        $currentRoute->setParameters(['foo' => 'bar']);
+        $currentRoute->setParameters(['id' => 1]);
+    }
 }

tests/Middleware/RouterTest.php

@@ -118,6 +118,16 @@ public function testGetCurrentUri(): void
         $this->assertSame($request->getUri(), $currentRoute->getUri());
     }
 
+    public function testGetParameters(): void
+    {
+        $currentRoute = new CurrentRoute();
+        $request = new ServerRequest('GET', '/');
+
+        $this->processWithRouter($request, $currentRoute);
+
+        $this->assertSame(['parameter' => 'value'], $currentRoute->getParameters());
+    }
+
     private function getMatcher(): UrlMatcherInterface
     {
         $middleware = $this->createRouteMiddleware();