fix query params set with withQueryParams

kdubuc · Mar 22, 2024 · 0bb97d5 · 0bb97d5
1 parent cd9cee3
commit 0bb97d5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/QueryStringParser.php b/src/QueryStringParser.php
@@ -25,7 +25,7 @@ public function process(ServerRequestInterface $server_request, RequestHandlerIn
     {
         // Parse a query string into an associative array using Guzzle
         // Handles duplicates fields.
-        $params = Query::parse($server_request->getUri()->getQuery());
+        $params = Query::parse($server_request->getUri()->getQuery()) + $server_request->getQueryParams();
 
         // Build the new query string
         $query_string = http_build_query($params);

diff --git a/tests/QueryStringParserTest.php b/tests/QueryStringParserTest.php
@@ -16,6 +16,10 @@ public function testKeepDuplicates()
 
         $server_request = new ServerRequest('GET', '/api?foo=bar&foo=baz', [], null, '1.1', []);
 
+        $server_request = $server_request->withQueryParams([
+            'key' => 'value',
+        ]);
+
         $handler = new class() implements RequestHandlerInterface {
             public $server_request;
 
@@ -29,7 +33,7 @@ public function handle(ServerRequestInterface $server_request) : ResponseInterfa
 
         $middleware->process($server_request, $handler);
 
-        $this->assertSame('foo[0]=bar&foo[1]=baz', urldecode($handler->server_request->getUri()->getQuery()));
-        $this->assertSame(['foo' => ['bar', 'baz']], $handler->server_request->getQueryParams());
+        $this->assertSame('foo[0]=bar&foo[1]=baz&key=value', urldecode($handler->server_request->getUri()->getQuery()));
+        $this->assertSame(['foo' => ['bar', 'baz'], 'key' => 'value'], $handler->server_request->getQueryParams());
     }
 }