Fixing URL building from string

JustSteveKing · Oct 12, 2020 · 496765a · 496765a
1 parent 990affa
commit 496765a
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/Uri.php b/src/Uri.php
@@ -61,9 +61,15 @@ public static function fromString(string $uri): self
 
         $url = self::build()
             ->addScheme($uri['scheme'] ?? null)
-            ->addHost($uri['host'] ?? null)
-            ->addPath($uri['path'] ?? null)
-            ->addQuery(isset($uri['query']) ? $uri['query'] : null);
+            ->addHost($uri['host'] ?? null);
+
+        if (isset($uri['path'])) {
+            $url->addPath($uri['path'] ?? null);
+        }
+
+        if (isset($uri['query'])) {
+            $url->addQuery(isset($uri['query']) ? $uri['query'] : null);
+        }
 
         $fragment = parse_url($original, PHP_URL_FRAGMENT);