Patch

Fix URI host, authority and path method

Author: Wazabii

Env.php

@@ -13,7 +13,6 @@ class Env
     private $data = array();
     private $set = array();
     private $drop = array();
-    //private $readOnly = false;
 
     public function __construct(?string $file = null)
     {
@@ -22,7 +21,6 @@ public function __construct(?string $file = null)
         }
     }
 
-
     public function loadEnvFile(string $file): void
     {
         $this->fileData = parse_ini_file($file);
@@ -122,10 +120,12 @@ public function putenvArray(array $array): self
     private function put(array $data, bool $overwrite = false)
     {
         foreach ($data as $key => $value) {
+            /*
             if (!$overwrite && getenv($key) !== false) {
                 throw new InvalidArgumentException("The Environmental variable \"{$key}\" already exists. " .
                     "It's recommended to make every variable unique.", 1);
             }
+            */
             $_ENV[$key] = $value;
             if (is_array($value)) {
                 $value = json_encode($value);

Uri.php

@@ -120,7 +120,6 @@ public function getAuthority(): string
                 $this->authority .= ":{$port}";
             }
         }
-
         return $this->authority;
     }
 
@@ -139,7 +138,7 @@ public function getUserInfo(): string
                 $this->encoded['pass'] = $pass;
             }
 
-            if (!is_null($user)) {
+            if (is_string($user) && !empty($user)) {
                 $this->userInfo .= "{$user}";
                 if (!is_null($pass)) {
                     $this->userInfo .= ":{$pass}";
@@ -156,8 +155,13 @@ public function getUserInfo(): string
     public function getHost(): string
     {
         if ($val = $this->getUniquePart("host")) {
+            if(($pos = strpos($val, ":")) !== false) {
+                $val = substr($val, 0, $pos);
+            }
             $this->encoded['host'] = Format\Str::value($val)->tolower()->get();
         }
+
+
         return (string)$this->encoded['host'];
     }
 
@@ -196,6 +200,7 @@ public function getPath(): string
     {
         if ($val = $this->getUniquePart("path")) {
             $this->encoded['path'] = Format\Str::value($val)->toggleUrlencode(['%2F'], ['/'])->get();
+            if($this->encoded['path']) $this->encoded['path'] = "/".ltrim($this->encoded['path'], "/");
         }
         return (string)$this->encoded['path'];
     }

Url.php

@@ -59,6 +59,7 @@ public function withType(null|string|array $type = null): self
             $type = [];
         }
 
+
         $inst = clone $this;
         $parts = $vars = array();
         foreach ($inst->parts as $sel => $row) {
@@ -256,8 +257,13 @@ public function getRootDir(string $path = "", bool $endSlash = false): string
         if ($scheme = $this->getScheme()) {
             $url .= "{$scheme}:";
         }
-        if ($authority = $this->getHost()) {
-            $url .= "//{$authority}";
+        if ($host = $this->getHost()) {
+            $url .= "//{$host}";
+        }
+        
+        // Do not show standard ports becouse they are not needed.
+        if (($port = $this->getPort()) && $port !== 80 && $port !== 443) {
+            $url .= ":{$port}";
         }
 
         if ($dir = $this->getDirPath()) {