Merge pull request #693 from skipperbent/v5-development

Version 5.4.1.2

src/Pecee/Http/Request.php

@@ -395,10 +395,6 @@ class Request
     {
         $this->url = $url;
 
-        if ($this->url->getHost() === null && $this->getHost() !== null) {
-            $this->url->setHost((string)$this->getHost());
-        }
-
         if ($this->isSecure() === true) {
             $this->url->setScheme('https');
         }

src/Pecee/Http/Url.php

@@ -144,10 +144,15 @@ class Url implements JsonSerializable
     /**
      * Get url host
      *
+     * @param bool $includeTrails Prepend // in front of hostname
      * @return string|null
      */
-    public function getHost(): ?string
+    public function getHost(bool $includeTrails = false): ?string
     {
+        if ((string)$this->host !== '' && $includeTrails === true) {
+            return '//' . $this->host;
+        }
+
         return $this->host;
     }
 
@@ -159,6 +164,11 @@ class Url implements JsonSerializable
      */
     public function setHost(string $host): self
     {
+        // Strip any potential ports from hostname
+        if (strpos($host, ':') !== false) {
+            $host = strstr($host, strrchr($host, ':'), true);
+        }
+
         $this->host = $host;
 
         return $this;
@@ -530,12 +540,12 @@ class Url implements JsonSerializable
      */
     public function jsonSerialize(): string
     {
-        return $this->getRelativeUrl();
+        return $this->getHost(true) . $this->getRelativeUrl();
     }
 
     public function __toString(): string
     {
-        return $this->getRelativeUrl();
+        return $this->getHost(true) . $this->getRelativeUrl();
     }
 
 }