Skip to content

Commit 606d8cb

Browse files
committed
Added the route name to the request attributes
1 parent 1f0f777 commit 606d8cb

2 files changed

Lines changed: 11 additions & 4 deletions

File tree

src/ServerMiddleware/RoutingMiddleware.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ public function process(
2525

2626
if ($routeMatch->isMatch()) {
2727
// Register Controller to the request object
28+
$request = $request->withAttribute("route", $routeMatch->getName());
2829
$request = $request->withAttribute(
2930
"controller",
3031
$routeMatch->getController(),

tests/Unit/ServerMiddleware/RoutingMiddlewareTest.php

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
$request2 = Mockery::mock(ServerRequestInterface::class);
3030
$request3 = Mockery::mock(ServerRequestInterface::class);
3131
$request4 = Mockery::mock(ServerRequestInterface::class);
32+
$request5 = Mockery::mock(ServerRequestInterface::class);
3233
$response = Mockery::mock(ResponseInterface::class);
3334
$requestHandler = Mockery::mock(RequestHandlerInterface::class);
3435

@@ -42,22 +43,27 @@
4243

4344
$request1
4445
->shouldReceive("withAttribute")
45-
->with("controller", $controller)
46+
->with("route", $name)
4647
->andReturn($request2);
4748

4849
$request2
4950
->shouldReceive("withAttribute")
50-
->with("v1", $attributes["v1"])
51+
->with("controller", $controller)
5152
->andReturn($request3);
5253

5354
$request3
5455
->shouldReceive("withAttribute")
55-
->with("v2", $attributes["v2"])
56+
->with("v1", $attributes["v1"])
5657
->andReturn($request4);
5758

59+
$request4
60+
->shouldReceive("withAttribute")
61+
->with("v2", $attributes["v2"])
62+
->andReturn($request5);
63+
5864
$requestHandler
5965
->shouldReceive("handle")
60-
->with($request4)
66+
->with($request5)
6167
->andReturn($response);
6268

6369
expect($this->middleware->process($request1, $requestHandler))->toBe(

0 commit comments

Comments
 (0)