Merge pull request #257 from skjnldsv/patch-1

fix(request): properly compute absolute url

Author: phil-davis

lib/Request.php

@@ -109,10 +109,17 @@ public function setAbsoluteUrl(string $url): void
     public function getAbsoluteUrl(): string
     {
         if ((null === $this->absoluteUrl) || ('' === $this->absoluteUrl)) {
-            // Guessing we're a http endpoint.
-            $this->absoluteUrl = 'http://'.
-                ($this->getHeader('Host') ?? 'localhost').
-                $this->getUrl();
+            $url = $this->getUrl();
+            if (parse_url($url, PHP_URL_SCHEME)) {
+                // It's already an absolute URL
+                $this->absoluteUrl = $url;
+            } else {
+                $host = $this->getHeader('Host')
+                    ?? parse_url($url, PHP_URL_HOST)
+                    ?? 'localhost';
+                // Guessing we're a http endpoint.
+                $this->absoluteUrl = "http://$host$url";
+            }
         }
 
         return $this->absoluteUrl;

tests/HTTP/RequestTest.php

@@ -134,4 +134,18 @@ public function testToStringAuthorization(): void
                   .'foo';
         self::assertEquals($expected, (string) $request);
     }
+
+    public function testAbsoluteUrlHttp(): void
+    {
+        $request = new Request('GET', 'http://example.com/foo/bar?a=b&c=d');
+        self::assertEquals('http://example.com/foo/bar?a=b&c=d', $request->getAbsoluteUrl());
+    }
+
+    public function testAbsoluteUrlHttpHostPrevalence(): void
+    {
+        $request = new Request('GET', 'http://example.com/foo/bar?a=b&c=d', [
+            'Host' => 'example.org',
+        ]);
+        self::assertEquals('http://example.com/foo/bar?a=b&c=d', $request->getAbsoluteUrl());
+    }
 }