From bc258291257b2ec37bd0abb5e16f83debd967f43 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 25 Jun 2020 09:40:06 +0200
Subject: [PATCH] Don't normalize query string in PsrHttpFactory

---
 CHANGELOG.md               | 6 ++++++
 Factory/PsrHttpFactory.php | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77d5ed8..53663dd 100644
--- 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
index dfcfe73..80ec527 100644
--- 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()
         );