Casting null values to empty "" in Uri various getter methods.

Defaulting to null values in UriFactory if no scheme or host was provided.
nimbly · Oct 18, 2022 · d36fe0b · d36fe0b
1 parent c773fc8
commit d36fe0b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/Factory/UriFactory.php b/src/Factory/UriFactory.php
@@ -26,16 +26,15 @@ public function createUri(string $uri = ""): UriInterface
 	 */
 	public static function createFromString(string $uri): Uri
 	{
-		// Parse the URI
 		$uriPart = \parse_url($uri);
 
 		if( $uriPart === false ){
 			throw new RuntimeException("Malformed URL string.");
 		}
 
 		return new Uri(
-			!empty($uriPart["scheme"]) ? \strtolower($uriPart["scheme"]) : "http",
-			!empty($uriPart["host"]) ? \strtolower($uriPart["host"]) : "",
+			!empty($uriPart["scheme"]) ? \strtolower($uriPart["scheme"]) : null,
+			!empty($uriPart["host"]) ? \strtolower($uriPart["host"]) : null,
 			$uriPart["path"] ?? null,
 			!empty($uriPart["port"]) ? $uriPart["port"] : null,
 			$uriPart["user"] ?? null,

diff --git a/src/Uri.php b/src/Uri.php
@@ -24,7 +24,7 @@ public function __construct(
 	 */
 	public function getScheme(): string
 	{
-		return $this->scheme;
+		return $this->scheme ?? "";
 	}
 
 	/**
@@ -40,7 +40,7 @@ public function getAuthority(): string
 			"%s:%s@%s:%s",
 			$this->username ?? "",
 			$this->password ?? "",
-			$this->host,
+			$this->host ?? "",
 			$this->port ?? ""
 		);
 	}
@@ -68,7 +68,7 @@ public function getUserInfo(): string
 	 */
 	public function getHost(): string
 	{
-		return $this->host;
+		return $this->host ?? "";
 	}
 
 	/**