fix(helpers-urlcomp): handle base_urls without schemes

roots · Aug 30, 2020 · 8fea81d · 8fea81d
1 parent a493f1c
commit 8fea81d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/helpers.php b/src/helpers.php
@@ -33,11 +33,15 @@ function compare_base_url($base_url, $input_url, $strict_scheme = true)
 
     $base_url = parse_url($base_url);
 
-    if (!isset($input_url['scheme'])) {
-        $input_url['scheme'] = $base_url['scheme'];
+    if (!isset($base_url['host'])) {
+        return false;
+    }
+
+    if (!$strict_scheme || !isset($input_url['scheme']) || !isset($base_url['scheme'])) {
+        $input_url['scheme'] = $base_url['scheme'] = 'soil';
     }
 
-    if ($strict_scheme && ($base_url['scheme'] !== $input_url['scheme'])) {
+    if (($base_url['scheme'] !== $input_url['scheme'])) {
         return false;
     }
 

diff --git a/tests/Unit/Helpers/UrlCompareTest.php b/tests/Unit/Helpers/UrlCompareTest.php
@@ -21,13 +21,19 @@ public function it_should_handle_relative_urls()
     {
         $this->assertTrue(compare_base_url('https://example.test', '/'));
         $this->assertTrue(compare_base_url('https://example.test', '/foobar'));
+
+        $this->assertTrue(compare_base_url('/', '/foobar'));
+        $this->assertFalse(compare_base_url('/foobar', 'https://example.test/foobar'));
     }
 
     /** @test */
     public function it_should_handle_url_without_scheme()
     {
         $this->assertFalse(compare_base_url('https://example.test', '//foobar.test'));
         $this->assertTrue(compare_base_url('https://example.test', '//example.test'));
+
+        $this->assertFalse(compare_base_url('//foobar.test', 'https://example.test'));
+        $this->assertFalse(compare_base_url('//foobar.test', 'http://example.test'));
     }
 
     /** @test */