fix conversion for https requests

4rthem · 4rthem · commit d336c735f5d0 · 2020-04-02T10:41:57.000+02:00
diff --git a/Factory/HttpFoundationFactory.php b/Factory/HttpFoundationFactory.php
@@ -52,6 +52,10 @@ public function createRequest(ServerRequestInterface $psrRequest, bool $streamed
             $server['SERVER_PORT'] = $uri->getPort();
             $server['REQUEST_URI'] = $uri->getPath();
             $server['QUERY_STRING'] = $uri->getQuery();
+
+            if ('https' === $uri->getScheme()) {
+                $server['HTTPS'] = 'on';
+            }
         }
 
         $server['REQUEST_METHOD'] = $psrRequest->getMethod();
diff --git a/Tests/Functional/CovertTest.php b/Tests/Functional/CovertTest.php
@@ -139,17 +139,24 @@ public function requestProvider()
             'Content'
         );
 
-        $psr7Request = (new Psr7Request('POST', 'http://tnyholm.se/foo/?bar=biz'))
-            ->withQueryParams(['bar' => 'biz']);
+        $psr7Requests = [
+            (new Psr7Request('POST', 'http://tnyholm.se/foo/?bar=biz'))
+                ->withQueryParams(['bar' => 'biz']),
+            new Psr7Request('GET', 'https://hey-octave.com/'),
+            new Psr7Request('GET', 'https://hey-octave.com:443/'),
+            new Psr7Request('GET', 'https://hey-octave.com:4242/'),
+            new Psr7Request('GET', 'http://hey-octave.com:80/'),
+        ];
 
         $nyholmFactory = new Psr17Factory();
         $psr17Factory = new PsrHttpFactory($nyholmFactory, $nyholmFactory, $nyholmFactory, $nyholmFactory);
         $symfonyFactory = new HttpFoundationFactory();
 
-        return [
+        return array_merge([
             [$sfRequest, $psr17Factory, $symfonyFactory],
-            [$psr7Request, $symfonyFactory, $psr17Factory],
-        ];
+        ], array_map(function ($psr7Request) use ($symfonyFactory, $psr17Factory) {
+            return [$psr7Request, $symfonyFactory, $psr17Factory];
+        }, $psr7Requests));
     }
 
     /**
