feature: request factory creates uri with all parts (#183)

* feature: request factory creates uri with all parts

* test: fix existing tests

* stan: cast int properly

Author: Greg Bowler

src/RequestFactory.php

@@ -52,6 +52,26 @@ public function createServerRequestFromGlobalState(
 		$uri = new Uri($server["REQUEST_URI"] ?? null);
 		$headers = new RequestHeaders();
 
+		if($secure = $server["HTTPS"] ?? null) {
+			$uri = $uri->withScheme("https");
+		}
+		else {
+			$uri = $uri->withScheme("http");
+		}
+
+		if($port = $server["SERVER_PORT"] ?? null) {
+			$uri = $uri->withPort((int)$port);
+		}
+
+		if($host = $server["HTTP_HOST"] ?? null) {
+			$host = strtok($host, ":");
+			$uri = $uri->withHost($host);
+		}
+
+		if($query = $server["QUERY_STRING"] ?? null) {
+			$uri = $uri->withQuery($query);
+		}
+
 		foreach($server as $key => $value) {
 			if(str_starts_with($key, "HTTP_")) {
 				$headerKey = substr($key, strlen("HTTP_"));

test/phpunit/RequestFactoryTest.php

@@ -48,6 +48,22 @@ public function testCreateServerRequestFromGlobals_uri():void {
 		self::assertEquals("/path/to/somewhere", $request->getUri()->getPath());
 	}
 
+	public function testCreateServerRequestFromGlobals_uri_withAllParts():void {
+		$sut = new RequestFactory();
+		$request = $sut->createServerRequestFromGlobalState([
+			"REQUEST_METHOD" => "POST",
+			"REQUEST_URI" => "/path/to/somewhere/",
+			"SERVER_PORT" => 8080,
+			"HTTP_HOST" => "localhost:8080",
+			"QUERY_STRING" => "example=123",
+		], [], [], []);
+
+		self::assertSame(
+			"http://localhost:8080/path/to/somewhere/?example=123",
+			(string)$request->getUri()
+		);
+	}
+
 	public function testCreateServerRequestFromGlobals_header():void {
 		$sut = new RequestFactory();
 		$request = $sut->createServerRequestFromGlobalState([