bug #87 Fix populating server params from URI in HttpFoundationFactory (nicolas-grekas)

This PR was merged into the 2.0-dev branch.

Discussion
----------

Fix populating server params from URI in HttpFoundationFactory

Fix  #82

Commits
-------

66095a5 Fix populating server params from URI in HttpFoundationFactory

Author: nicolas-grekas

Factory/HttpFoundationFactory.php

@@ -53,14 +53,18 @@ public function createRequest(ServerRequestInterface $psrRequest, bool $streamed
             $server['REQUEST_URI'] = $uri->getPath();
             $server['QUERY_STRING'] = $uri->getQuery();
 
+            if ('' !== $server['QUERY_STRING']) {
+                $server['REQUEST_URI'] .= '?'.$server['QUERY_STRING'];
+            }
+
             if ('https' === $uri->getScheme()) {
                 $server['HTTPS'] = 'on';
             }
         }
 
         $server['REQUEST_METHOD'] = $psrRequest->getMethod();
 
-        $server = array_replace($server, $psrRequest->getServerParams());
+        $server = array_replace($psrRequest->getServerParams(), $server);
 
         $parsedBody = $psrRequest->getParsedBody();
         $parsedBody = \is_array($parsedBody) ? $parsedBody : [];

Tests/Functional/CovertTest.php

@@ -133,8 +133,8 @@ public function requestProvider()
                 'SERVER_NAME' => 'dunglas.fr',
                 'SERVER_PORT' => null,
                 'HTTP_X_SYMFONY' => '2.8',
-                'REQUEST_URI' => '/testCreateRequest?bar[baz]=42&foo=1',
-                'QUERY_STRING' => 'foo=1&bar[baz]=42',
+                'REQUEST_URI' => '/testCreateRequest?foo=1&bar%5Bbaz%5D=42',
+                'QUERY_STRING' => 'foo=1&bar%5Bbaz%5D=42',
             ],
             'Content'
         );