Merge pull request #34 expose HTTP_HOST

Author: roxblnfk

src/GlobalState.php

@@ -35,6 +35,13 @@ public static function enrichServerVars(Request $request): array
         $server['REQUEST_METHOD'] = $request->method;
         $server['HTTP_USER_AGENT'] = '';
 
+        $parts = \parse_url($request->uri);
+
+        if (isset($parts['host'])) {
+            $server['HTTP_HOST'] = isset($parts['port'])
+                ? $parts['host'] . ':' . $parts['port']
+                : $parts['host'];
+        }
         foreach ($request->headers as $key => $value) {
             $key = \strtoupper(\str_replace('-', '_', $key));
 

tests/Unit/GlobalStateTest.php

@@ -0,0 +1,71 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Spiral\RoadRunner\Tests\Http\Unit;
+
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
+use Spiral\RoadRunner\Http\GlobalState;
+use Spiral\RoadRunner\Http\Request;
+
+final class GlobalStateTest extends TestCase
+{
+    /**
+     * @return iterable<array{0: Request, 1: array<array-key, mixed>}>
+     */
+    public static function enrichServerVarsDataProvider(): iterable
+    {
+        yield [
+            new Request(),
+            [
+                'REQUEST_URI'        => 'http://localhost',
+                'REMOTE_ADDR'        => '127.0.0.1',
+                'REQUEST_METHOD'     => 'GET',
+                'HTTP_USER_AGENT'    => '',
+                'HTTP_HOST'          => 'localhost',
+            ],
+        ];
+
+        yield [
+            new Request(uri: 'https://roadrunner.dev'),
+            [
+                'REQUEST_URI'        => 'https://roadrunner.dev',
+                'REMOTE_ADDR'        => '127.0.0.1',
+                'REQUEST_METHOD'     => 'GET',
+                'HTTP_USER_AGENT'    => '',
+                'HTTP_HOST'          => 'roadrunner.dev',
+            ],
+        ];
+
+        yield [
+            new Request(uri: 'https://roadrunner.dev:8080'),
+            [
+                'REQUEST_URI'        => 'https://roadrunner.dev:8080',
+                'REMOTE_ADDR'        => '127.0.0.1',
+                'REQUEST_METHOD'     => 'GET',
+                'HTTP_USER_AGENT'    => '',
+                'HTTP_HOST'          => 'roadrunner.dev:8080',
+            ],
+        ];
+    }
+
+    /**
+     * @param array<array-key, mixed> $expected
+     */
+    #[DataProvider('enrichServerVarsDataProvider')]
+    public function testEnrichServerVars(Request $request, array $expected): void
+    {
+        $_SERVER = [];
+
+        $server = GlobalState::enrichServerVars($request);
+
+        $this->assertArrayHasKey('REQUEST_TIME', $server);
+        $this->assertArrayHasKey('REQUEST_TIME_FLOAT', $server);
+
+        unset($server['REQUEST_TIME']);
+        unset($server['REQUEST_TIME_FLOAT']);
+
+        $this->assertEquals($server, $expected);
+    }
+}

tests/Unit/PSR7WorkerTest.php

@@ -44,6 +44,7 @@ public function testStateServerLeak(): void
                     'HTTP_USER_AGENT' => '',
                     'CONTENT_TYPE' => 'application/html',
                     'HTTP_CONNECTION' => 'keep-alive',
+                    'HTTP_HOST' =>   'localhost',
                 ],
             ],
             [
@@ -56,6 +57,7 @@ public function testStateServerLeak(): void
                     'REQUEST_METHOD' => 'GET',
                     'HTTP_USER_AGENT' => '',
                     'CONTENT_TYPE' => 'application/json',
+                    'HTTP_HOST' =>   'localhost',
                 ],
             ],
         ];