Added GlobalState

src/ConfiguratorServer.php

@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Spiral\RoadRunner\Http;
+
+use function time;
+use function microtime;
+
+class ConfiguratorServer
+{
+    /**
+     * Returns altered copy of _SERVER variable. Sets ip-address,
+     * request-time and other values.
+     *
+     * @return non-empty-array<array-key|string, mixed|string>
+     */
+    public function configure(Request $request): array
+    {
+        $_SERVER['REQUEST_URI'] = $request->uri;
+        $_SERVER['REQUEST_TIME'] = time();
+        $_SERVER['REQUEST_TIME_FLOAT'] = microtime(true);
+        $_SERVER['REMOTE_ADDR'] = $request->getRemoteAddr();
+        $_SERVER['REQUEST_METHOD'] = $request->method;
+        $_SERVER['HTTP_USER_AGENT'] = '';
+
+        foreach ($request->headers as $key => $value) {
+            $key = \strtoupper(\str_replace('-', '_', $key));
+
+            if (\in_array($key, ['CONTENT_TYPE', 'CONTENT_LENGTH'])) {
+                $_SERVER[$key] = \implode(', ', $value);
+
+                continue;
+            }
+
+            $_SERVER['HTTP_' . $key] = \implode(', ', $value);
+        }
+
+        return $_SERVER;
+    }
+}

src/PSR7Worker.php

@@ -32,8 +32,6 @@ class PSR7Worker implements PSR7WorkerInterface
 
     private readonly HttpWorker $httpWorker;
 
-    private readonly array $originalServer;
-
     /**
      * @var string[] Valid values for HTTP protocol version
      */
@@ -44,9 +42,9 @@ public function __construct(
         private readonly ServerRequestFactoryInterface $requestFactory,
         private readonly StreamFactoryInterface $streamFactory,
         private readonly UploadedFileFactoryInterface $uploadsFactory,
+        private readonly ConfiguratorServer $configuratorServer = new ConfiguratorServer(),
     ) {
         $this->httpWorker = new HttpWorker($worker);
-        $this->originalServer = $_SERVER;
     }
 
     public function getWorker(): WorkerInterface
@@ -69,7 +67,7 @@ public function waitRequest(): ?ServerRequestInterface
             return null;
         }
 
-        $_SERVER = $this->configureServer($httpRequest);
+        $_SERVER = $this->configuratorServer->configure($httpRequest);
 
         return $this->mapRequest($httpRequest, $_SERVER);
     }
@@ -117,45 +115,6 @@ private function streamToGenerator(StreamInterface $stream): Generator
         }
     }
 
-    /**
-     * Returns altered copy of _SERVER variable. Sets ip-address,
-     * request-time and other values.
-     *
-     * @return non-empty-array<array-key|string, mixed|string>
-     */
-    protected function configureServer(Request $request): array
-    {
-        $server = $this->originalServer;
-
-        $server['REQUEST_URI'] = $request->uri;
-        $server['REQUEST_TIME'] = $this->timeInt();
-        $server['REQUEST_TIME_FLOAT'] = $this->timeFloat();
-        $server['REMOTE_ADDR'] = $request->getRemoteAddr();
-        $server['REQUEST_METHOD'] = $request->method;
-
-        $server['HTTP_USER_AGENT'] = '';
-        foreach ($request->headers as $key => $value) {
-            $key = \strtoupper(\str_replace('-', '_', $key));
-            if (\in_array($key, ['CONTENT_TYPE', 'CONTENT_LENGTH'])) {
-                $server[$key] = \implode(', ', $value);
-            } else {
-                $server['HTTP_' . $key] = \implode(', ', $value);
-            }
-        }
-
-        return $server;
-    }
-
-    protected function timeInt(): int
-    {
-        return \time();
-    }
-
-    protected function timeFloat(): float
-    {
-        return \microtime(true);
-    }
-
     /**
      * @throws \JsonException
      */