Improve URI internal codebase

thephpleague · Jun 30, 2024 · ef0c29f · ef0c29f
1 parent 2b3e47d
commit ef0c29f
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/Uri.php b/Uri.php
@@ -716,16 +716,16 @@ private static function fetchRequestUri(array $server): array
     private function setAuthority(): ?string
     {
         $authority = null;
-        if (null !== $this->userInfo) {
-            $authority = $this->userInfo.'@';
+        if (null !== $this->host) {
+            $authority = $this->host;
         }
 
-        if (null !== $this->host) {
-            $authority .= $this->host;
+        if (null !== $this->userInfo) {
+            $authority = $this->userInfo.'@'.$authority;
         }
 
         if (null !== $this->port) {
-            $authority .= ':'.$this->port;
+            return $authority.':'.$this->port;
         }
 
         return $authority;