Simplify Uri generation

thephpleague · Jul 20, 2024 · 54795f4 · 54795f4
1 parent 81b2cf0
commit 54795f4
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/uri/Uri.php b/uri/Uri.php
@@ -227,10 +227,9 @@ private function __construct(
         $this->path = $this->formatPath($path);
         $this->query = Encoder::encodeQueryOrFragment($query);
         $this->fragment = Encoder::encodeQueryOrFragment($fragment);
-        $components = $this->toComponents();
         $this->userInfo = $this->formatUserInfo($this->user, $this->pass);
-        $this->authority = UriString::buildAuthority($components);
-        $this->uri = UriString::build($components);
+        $this->authority = UriString::buildAuthority($this->toComponents());
+        $this->uri = UriString::buildUri($this->scheme, $this->authority, $this->path, $this->query, $this->fragment);
 
         $this->assertValidState();
     }