Merge pull request #84 from juherr/master

Author: mnapoli

src/ControllerInvoker.php

@@ -36,7 +36,7 @@ public function __invoke(
     ): ResponseInterface {
         // Inject the request and response by parameter name
         $parameters = [
-            'request'  => $request,
+            'request'  => self::injectRouteArguments($request, $routeArguments),
             'response' => $response,
         ];
         // Inject the route arguments by name
@@ -46,4 +46,13 @@ public function __invoke(
 
         return $this->invoker->call($callable, $parameters);
     }
+
+    private static function injectRouteArguments(ServerRequestInterface $request, array $routeArguments): ServerRequestInterface
+    {
+        $requestWithArgs = $request;
+        foreach ($routeArguments as $key => $value) {
+            $requestWithArgs = $requestWithArgs->withAttribute($key, $value);
+        }
+        return $requestWithArgs;
+    }
 }

tests/RoutingTest.php

@@ -44,6 +44,21 @@ public function injects_route_placeholder()
         $this->assertEquals('Hello matt', (string) $response->getBody());
     }
 
+    /**
+     * @test
+     */
+    public function injects_route_placeholder_from_request()
+    {
+        $app = Bridge::create();
+        $app->get('/{name}', function ($request, $response) {
+            $response->getBody()->write('Hello ' . $request->getAttribute('name'));
+            return $response;
+        });
+
+        $response = $app->handle(RequestFactory::create('/matt'));
+        $this->assertEquals('Hello matt', (string) $response->getBody());
+    }
+
     /**
      * @test
      */