Return already qualified URLs as they are

Author: caendesilva

packages/framework/src/Foundation/Kernel/Hyperlinks.php

@@ -142,13 +142,15 @@ public function hasSiteUrl(): bool
      * @param  string  $path  An optional relative path suffix. Omit to return the base URL.
      *
      * @throws BaseUrlNotSetException If no site URL is set and no path is provided.
-     *
-     * TODO: Check if the URL is already qualified and return it as is.
      */
     public function url(string $path = ''): string
     {
         $path = $this->formatLink(trim($path, '/'));
 
+        if (str_starts_with($path, 'http')) {
+            return $path;
+        }
+
         if ($this->hasSiteUrl()) {
             return rtrim(rtrim(Config::getString('hyde.url'), '/')."/$path", '/');
         }

packages/framework/tests/Unit/Foundation/HyperlinksUrlPathHelpersTest.php

@@ -110,6 +110,51 @@ public function testQualifiedUrlAcceptsMultipleSchemes()
         $this->assertSame('http://example.com', $this->class->url());
     }
 
+    public function testQualifiedUrlHelperWithAlreadyQualifiedUrl()
+    {
+        $this->assertSame('https://example.com/foo', $this->class->url('https://example.com/foo'));
+        $this->assertSame('http://localhost/foo', $this->class->url('http://localhost/foo'));
+    }
+
+    public function testQualifiedUrlHelperWithAlreadyQualifiedUrlWhenSiteUrlIsSet()
+    {
+        $this->app['config']->set(['hyde.url' => 'https://example.com']);
+
+        $this->assertSame('https://example.com/foo', $this->class->url('https://example.com/foo'));
+        $this->assertSame('http://localhost/foo', $this->class->url('http://localhost/foo'));
+    }
+
+    public function testQualifiedUrlHelperWithAlreadyQualifiedUrlWhenSiteUrlIsSetToSomethingElse()
+    {
+        $this->app['config']->set(['hyde.url' => 'my-site.com']);
+
+        $this->assertSame('https://example.com/foo', $this->class->url('https://example.com/foo'));
+        $this->assertSame('http://localhost/foo', $this->class->url('http://localhost/foo'));
+    }
+
+    public function testQualifiedUrlHelperWithAlreadyQualifiedUrlStillFormatsPath()
+    {
+        $this->assertSame('https://example.com/foo/bar.html', $this->class->url('https://example.com/foo/bar.html'));
+        $this->assertSame('http://localhost/foo/bar.html', $this->class->url('http://localhost/foo/bar.html'));
+        $this->assertSame('http://localhost/foo/bar', $this->class->url('http://localhost/foo/bar/'));
+    }
+
+    public function testQualifiedUrlHelperWithAlreadyQualifiedUrlStillFormatsPathWhenSiteUrlIsSet()
+    {
+        $this->app['config']->set(['hyde.url' => 'https://example.com']);
+        $this->assertSame('https://example.com/foo/bar.html', $this->class->url('https://example.com/foo/bar.html'));
+        $this->assertSame('http://localhost/foo/bar.html', $this->class->url('http://localhost/foo/bar.html'));
+        $this->assertSame('http://localhost/foo/bar', $this->class->url('http://localhost/foo/bar/'));
+    }
+
+    public function testQualifiedUrlHelperWithAlreadyQualifiedUrlStillFormatsPathWithPrettyUrls()
+    {
+        $this->app['config']->set(['hyde.url' => 'https://example.com', 'hyde.pretty_urls' => true]);
+        $this->assertSame('https://example.com/foo/bar', $this->class->url('https://example.com/foo/bar.html'));
+        $this->assertSame('http://localhost/foo/bar', $this->class->url('http://localhost/foo/bar.html'));
+        $this->assertSame('http://localhost/foo/bar', $this->class->url('http://localhost/foo/bar/'));
+    }
+
     public function testQualifiedUrlThrowsExceptionWhenNoSiteUrlIsSet()
     {
         $this->withSiteUrl(null);