bug #81 Don't normalize query string in PsrHttpFactory (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit e44f249afab4 · 2020-06-25T10:21:47.000+02:00
This PR was merged into the 2.0-dev branch. Discussion ---------- Don't normalize query string in PsrHttpFactory Fix #80 Commits ------- bc25829 Don't normalize query string in PsrHttpFactory
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+# 2.0.1 (2020-06-25)
+
+  * Don't normalize query string in PsrHttpFactory
+  * Fix conversion for HTTPS requests
+  * Fix populating default port and headers in HttpFoundationFactory
+
 # 2.0.0 (2020-01-02)
 
   * Remove DiactorosFactory
diff --git a/Factory/PsrHttpFactory.php b/Factory/PsrHttpFactory.php
@@ -48,9 +48,12 @@ public function __construct(ServerRequestFactoryInterface $serverRequestFactory,
      */
     public function createRequest(Request $symfonyRequest)
     {
+        $uri = $symfonyRequest->server->get('QUERY_STRING', '');
+        $uri = $symfonyRequest->getSchemeAndHttpHost().$symfonyRequest->getBaseUrl().$symfonyRequest->getPathInfo().('' !== $uri ? '?'.$uri : '');
+
         $request = $this->serverRequestFactory->createServerRequest(
             $symfonyRequest->getMethod(),
-            $symfonyRequest->getUri(),
+            $uri,
             $symfonyRequest->server->all()
         );
 
