Merge pull request #43 from sunrise-php/release/v2.0.2

release v2.0.2
sunrise-php · Jan 6, 2020 · e74eb26 · e74eb26
2 parents bb89159 + e9c8398
commit e74eb26
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/Route.php b/src/Route.php
@@ -34,6 +34,13 @@
 class Route implements RouteInterface
 {
 
+    /**
+     * Server Request attribute name for the route instance
+     *
+     * @var string
+     */
+    public const ATTR_NAME_FOR_ROUTE = '@route';
+
     /**
      * Server Request attribute name for the route name
      *
@@ -287,6 +294,7 @@ public function withAddedAttributes(array $attributes) : RouteInterface
      */
     public function handle(ServerRequestInterface $request) : ResponseInterface
     {
+        $request = $request->withAttribute(self::ATTR_NAME_FOR_ROUTE, $this);
         $request = $request->withAttribute(self::ATTR_NAME_FOR_ROUTE_NAME, $this->name);
 
         foreach ($this->attributes as $key => $value) {

diff --git a/tests/RouteTest.php b/tests/RouteTest.php
@@ -277,7 +277,11 @@ public function testHandle() : void
         $this->assertTrue($route->getMiddlewares()[2]->isRunned());
         $this->assertTrue($route->getRequestHandler()->isRunned());
 
-        $expectedAttributes = [Route::ATTR_NAME_FOR_ROUTE_NAME => $route->getName()];
+        $expectedAttributes = [
+            Route::ATTR_NAME_FOR_ROUTE => $route,
+            Route::ATTR_NAME_FOR_ROUTE_NAME => $route->getName(),
+        ];
+
         $expectedAttributes += $route->getAttributes();
 
         $this->assertSame($expectedAttributes, $route->getRequestHandler()->getAttributes());