Server parameters are now filled in ServerRequest. Removed envs from it.

phpstreamserver · Feb 14, 2024 · 34e1c80 · 34e1c80
1 parent 77d9d4d
commit 34e1c80
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 8 deletions.
diff --git a/src/Server/Http/Psr7/ServerRequest.php b/src/Server/Http/Psr7/ServerRequest.php
@@ -30,7 +30,6 @@ public function __construct(HttpRequestStream $requestStream, string $method, st
         $this->method = $method;
         $this->uri = new Uri($uri);
         $this->protocol = $protocol;
-        $this->serverParams = $serverParams;
         $this->setHeaders($requestStream->getHeaders());
         \parse_str($this->uri->getQuery(), $this->queryParams);
         $this->cookieParams = $requestStream->getHeaderOptions('Cookie');
@@ -39,6 +38,22 @@ public function __construct(HttpRequestStream $requestStream, string $method, st
         if (!$this->hasHeader('Host')) {
             $this->updateHostFromUri();
         }
+
+        $this->serverParams = [...$serverParams, ...[
+            'SERVER_NAME' => $this->uri->getHost(),
+            'SERVER_PROTOCOL' => 'HTTP/' . $this->getProtocolVersion(),
+            'REQUEST_URI' => $this->uri->getPath(),
+            'QUERY_STRING' => $this->uri->getQuery(),
+            'REQUEST_METHOD' => $this->getMethod(),
+        ]];
+
+        if ($this->serverParams['QUERY_STRING'] !== '') {
+            $this->serverParams['REQUEST_URI'] .= '?' . $this->serverParams['QUERY_STRING'];
+        }
+
+        if ($this->uri->getScheme() === 'https') {
+            $this->serverParams['HTTPS'] = 'on';
+        }
     }
 
     public function getServerParams(): array

diff --git a/src/Server/Http/Request.php b/src/Server/Http/Request.php
@@ -5,6 +5,7 @@
 namespace Luzrain\PhpRunner\Server\Http;
 
 use Luzrain\PhpRunner\Exception\HttpException;
+use Luzrain\PhpRunner\PhpRunner;
 use Luzrain\PhpRunner\Server\Http\Psr7\HttpRequestStream;
 use Luzrain\PhpRunner\Server\Http\Psr7\ServerRequest;
 use Psr\Http\Message\ServerRequestInterface;
@@ -95,7 +96,7 @@ public function isCompleted(): bool
         return $this->isCompleted;
     }
 
-    public function getPsrServerRequest(string $serverAddr, string $serverPort, string $remoteAddr, string $remotePort): ServerRequestInterface
+    public function getPsrServerRequest(string $serverAddr, int $serverPort, string $remoteAddr, int $remotePort): ServerRequestInterface
     {
         if (!$this->isCompleted()) {
             throw new \LogicException('ServerRequest cannot be created until request is complete');
@@ -106,12 +107,13 @@ public function getPsrServerRequest(string $serverAddr, string $serverPort, stri
             method: $this->method,
             uri: $this->uri,
             protocol: $this->version,
-            serverParams: [...$_SERVER, ...[
-                'SERVER_ADDR' => $serverAddr,
-                'SERVER_PORT' => $serverPort,
+            serverParams: [
                 'REMOTE_ADDR' => $remoteAddr,
                 'REMOTE_PORT' => $remotePort,
-            ]],
+                'SERVER_ADDR' => $serverAddr,
+                'SERVER_PORT' => $serverPort,
+                'SERVER_SOFTWARE' => PhpRunner::VERSION_STRING,
+            ],
         );
     }
 }
diff --git a/src/Server/Protocols/Http.php b/src/Server/Protocols/Http.php
@@ -48,9 +48,9 @@ public function decode(ConnectionInterface $connection, string $buffer): ServerR
             if ($this->request->isCompleted()) {
                 $this->psrRequest = $this->request->getPsrServerRequest(
                     serverAddr: $connection->getLocalIp(),
-                    serverPort: (string) $connection->getLocalPort(),
+                    serverPort: $connection->getLocalPort(),
                     remoteAddr: $connection->getRemoteIp(),
-                    remotePort: (string) $connection->getRemotePort(),
+                    remotePort: $connection->getRemotePort(),
                 );
                 return $this->psrRequest;
             }