bug #30 Fix the request target in PSR7 Request (mtibben)

fabpot · fabpot · commit c2b757934f2d · 2017-12-18T16:31:44.000-08:00
This PR was squashed before being merged into the 1.0-dev branch (closes #30). Discussion ---------- Fix the request target in PSR7 Request The request target is not being preserved correctly when using this library. This is because the query string is normalized, and we're not populating the PSR-7 request with the actual request target. This is important for things like http signatures which uses the request target as an input to sign a request. Commits ------- 94fcfa5 Fix the request target in PSR7 Request
diff --git a/Factory/DiactorosFactory.php b/Factory/DiactorosFactory.php
@@ -55,7 +55,7 @@ public function createRequest(Request $symfonyRequest)
         $request = new ServerRequest(
             $server,
             DiactorosRequestFactory::normalizeFiles($this->getFiles($symfonyRequest->files->all())),
-            $symfonyRequest->getUri(),
+            $symfonyRequest->getSchemeAndHttpHost().$symfonyRequest->getRequestUri(),
             $symfonyRequest->getMethod(),
             $body,
             $headers
@@ -65,6 +65,7 @@ public function createRequest(Request $symfonyRequest)
             ->withCookieParams($symfonyRequest->cookies->all())
             ->withQueryParams($symfonyRequest->query->all())
             ->withParsedBody($symfonyRequest->request->all())
+            ->withRequestTarget($symfonyRequest->getRequestUri())
         ;
 
         foreach ($symfonyRequest->attributes->all() as $key => $value) {
diff --git a/Tests/Factory/DiactorosFactoryTest.php b/Tests/Factory/DiactorosFactoryTest.php
@@ -69,6 +69,8 @@ public function testCreateRequest()
                 'REQUEST_METHOD' => 'POST',
                 'HTTP_HOST' => 'dunglas.fr',
                 'HTTP_X_SYMFONY' => '2.8',
+                'REQUEST_URI' => '/testCreateRequest?foo=1&bar[baz]=42',
+                'QUERY_STRING' => 'foo=1&bar[baz]=42',
             ),
             'Content'
         );
@@ -81,6 +83,9 @@ public function testCreateRequest()
         $this->assertEquals('1', $queryParams['foo']);
         $this->assertEquals('42', $queryParams['bar']['baz']);
 
+        $requestTarget = $psrRequest->getRequestTarget();
+        $this->assertEquals('/testCreateRequest?foo=1&bar[baz]=42', $requestTarget);
+
         $parsedBody = $psrRequest->getParsedBody();
         $this->assertEquals('Kévin Dunglas', $parsedBody['twitter']['@dunglas']);
         $this->assertEquals('Les-Tilleuls.coop', $parsedBody['twitter']['@coopTilleuls']);
