Build up request URI in parts for greater compatibility (#31)

Author: Greg Bowler

src/ServerInfo.php

@@ -136,7 +136,36 @@ public function getScriptName():string {
 	 * The URI which was given in order to access this page.
 	 */
 	public function getRequestUri():UriInterface {
-		return new Uri($this->server["REQUEST_URI"]);
+		$uri = new Uri();
+
+		if(isset($this->server["HTTPS"])) {
+			$uri = $uri->withScheme("https");
+		}
+		else {
+			$uri = $uri->withScheme("http");
+		}
+
+		if(isset($this->server["HTTP_HOST"])) {
+			$uri = $uri->withHost(
+				strtok($this->server["HTTP_HOST"], ":")
+			);
+		}
+
+		if(isset($this->server["SERVER_PORT"])) {
+			$uri = $uri->withPort((int)$this->server["SERVER_PORT"]);
+		}
+
+		if(isset($this->server["REQUEST_URI"])) {
+			$uri = $uri->withPath(
+				strtok($this->server["REQUEST_URI"], "?")
+			);
+		}
+
+		if(isset($this->server["QUERY_STRING"])) {
+			$uri = $uri->withQuery($this->server["QUERY_STRING"]);
+		}
+
+		return $uri;
 	}
 
 	public function getFullUri():UriInterface {

test/unit/ServerInfoTest.php

@@ -117,7 +117,11 @@ public function testGetScriptName() {
 
 	public function testGetRequestUri() {
 		$sut = new ServerInfo(self::getServerArray());
-		self::assertEquals("/example?key1=value1&key2=value2", $sut->getRequestUri());
+
+		self::assertEquals(
+			"http://localhost/example?key1=value1&key2=value2",
+			$sut->getRequestUri()
+		);
 	}
 
 	public function testNullFields() {