Merge pull request #8 from legionth/use-arguments-variable-in-callback

Use arguments variable in callback instead of query parameters
legionth · Feb 14, 2019 · 297ba46 · 297ba46
2 parents 6142a3a + 640922b
commit 297ba46
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -59,16 +59,16 @@ the request to following endpoint.
 To add dynamic values in the REST API definition the operator `:` can be used
 
 ```php
-$server->post('/say/:word', function (\Psr\Http\Message\ServerRequestInterface $request, callable $next) {
-    $word = $request->getQueryParams()['word'];
+$server->post('/say/:word', function (\Psr\Http\Message\ServerRequestInterface $request, callable $next, array $parameters) {
+    $word = $parameters['word'];
 
     return new \React\Http\Response(200, array(), 'You said: ' . $word);
 });
 ```
 
 Now a HTTP client can call the address e.g. `http://localhost:8080/say/hello`.
-The key `word` and value `hello` will be stored in query parameters of the
-PSR-7 request.
+The key `word` and value `hello` will be stored in the third
+parameter of the callback function.
 
 There is no type check her that can validate which API should be used.
 `/say/:word` and`/say/:number` would be the same. In this case the order of your API

diff --git a/examples/01-define-api.php b/examples/01-define-api.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../vendor/autoload.php';
+require __DIR__ . '/../vendor/autoload.php';
 
 $loop = \React\EventLoop\Factory::create();
 
@@ -10,8 +10,8 @@
     return new \React\Http\Response(200, array(), 'hello');
 });
 
-$server->post('/say/:word', function (\Psr\Http\Message\ServerRequestInterface $request, callable $next) {
-    $word = $request->getQueryParams()['word'];
+$server->post('/say/:word', function (\Psr\Http\Message\ServerRequestInterface $request, callable $next, array $arguments) {
+    $word = $arguments['word'];
 
     return new \React\Http\Response(200, array(), 'You said: ' . $word);
 });

diff --git a/src/Server.php b/src/Server.php
@@ -103,19 +103,17 @@ private function createRestfulFunction($httpMethod, $path, $function)
                     return $next($request);
                 }
 
-                $queryParams = $request->getQueryParams();
+                $argument = array();
 
                 foreach ($pathArray as $id => $valueName) {
                     $position = strpos($valueName, ':');
                     if (0 === $position) {
                         $valueName = substr($valueName, 1);
-                        $queryParams[$valueName] = $requestPathArray[$id];
+                        $argument[$valueName] = $requestPathArray[$id];
                     }
                 }
 
-                $request = $request->withQueryParams($queryParams);
-
-                return $function($request, $next);
+                return $function($request, $next, $argument);
             }
 
             return $next($request);

diff --git a/tests/ServerTest.php b/tests/ServerTest.php
@@ -59,16 +59,16 @@ public function testCreateGetEndpointOnTestServerAndSendRequest()
         $this->assertSame('example.com', $requestAssertion->getHeaderLine('Host'));
     }
 
-    public function testCreatePostEndpointOnTestServerAndSendRequestWithQueryParameter()
+    public function testCreatePostEndpointOnTestServerAndSendRequestWithAdditionalParameter()
     {
         $requestAssertion = null;
         $idAssertion = null;
 
         $server = new Server();
 
-        $server->post('/user/add/:id', function (ServerRequestInterface $request, callable $next) use (&$requestAssertion, &$idAssertion) {
+        $server->post('/user/add/:id', function (ServerRequestInterface $request, callable $next, array $paramters) use (&$requestAssertion, &$idAssertion) {
             $requestAssertion = $request;
-            $idAssertion = $request->getQueryParams()['id'];
+            $idAssertion = $paramters['id'];
         });
 
         $server->listen($this->socket);
@@ -86,18 +86,18 @@ public function testCreatePostEndpointOnTestServerAndSendRequestWithQueryParamet
         $this->assertEquals('10', $idAssertion);
     }
 
-    public function testCreatePutEndpointOnTestServerAndSendRequestWithQueryParameters()
+    public function testCreatePutEndpointOnTestServerAndSendRequestWithParameters()
     {
         $requestAssertion = null;
         $idAssertion = null;
         $nameAssertion = null;
 
         $server = new Server();
 
-        $server->put('/user/add/:id/group/:name', function (ServerRequestInterface $request, callable $next) use (&$requestAssertion, &$idAssertion, &$nameAssertion) {
+        $server->put('/user/add/:id/group/:name', function (ServerRequestInterface $request, callable $next, array $parameters) use (&$requestAssertion, &$idAssertion, &$nameAssertion) {
             $requestAssertion = $request;
-            $idAssertion = $request->getQueryParams()['id'];
-            $nameAssertion = $request->getQueryParams()['name'];
+            $idAssertion = $parameters['id'];
+            $nameAssertion = $parameters['name'];
         });
 
         $server->listen($this->socket);