Fix issue with double ports

Author: Robin de Graaf

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Parable Http
 
+## 0.3.1
+_Fixes_
+- `Uri` could not deal with double ports, i.e. `devvoh.com:8000:8000` and would set `devvoh.com:8000` as the host, causing issues. This is now fixed. The host is no longer allowed to have port numbers in it.
+
 ## 0.3.0
 
 _Changes_

src/Uri.php

@@ -62,6 +62,14 @@ public static function setPropertiesFromArray(self $uri, array $values): self
         $uri->query = $values['query'] ?? null;
         $uri->fragment = $values['fragment'] ?? null;
 
+        if ($uri->host !== null) {
+            $portPosition = strpos($uri->host, ':');
+
+            if ($portPosition !== false) {
+                $uri->host = substr_replace($uri->host, '', $portPosition);
+            }
+        }
+
         if ($uri->path !== null) {
             $uri->path = ltrim($uri->path, '/');
         }
@@ -73,7 +81,7 @@ public function getUriString(): string
     {
         $restUri = $this->getUriRestString();
 
-        if (strlen($restUri) > 0 && !in_array(substr($restUri, 0, 1), ['?', '#'])) {
+        if (strlen($restUri) > 0 && !in_array($restUri[0], ['?', '#'])) {
             $restUri = '/' . ltrim($restUri, '/');
         }
 

tests/UriTest.php

@@ -80,6 +80,14 @@ public function testPortIsIgnoredWhenDefaultForSchemeHttps(): void
         self::assertSame('https://devvoh.com', $uri->getUriString());
     }
 
+    public function testDoublePortIsFixed(): void
+    {
+        $uri = new Uri('https://devvoh.com:8000:8000');
+
+        self::assertSame(8000, $uri->getPort());
+        self::assertSame('https://devvoh.com:8000', $uri->getUriString());
+    }
+
     public function testGetPath(): void
     {
         self::assertSame('parable', $this->uri->getPath());