fix: remove parameter $relative which does not work

Author: kenjis

system/Helpers/url_helper.php

@@ -183,15 +183,14 @@ function previous_url(bool $returnObject = false)
     /**
      * URL String
      *
-     * Returns the path part of the current URL
-     *
-     * @param bool $relative Whether the resulting path should be relative to baseURL
+     * Returns the path part (relative to baseURL) of the current URL
      */
-    function uri_string(bool $relative = false): string
+    function uri_string(): string
     {
-        return $relative
-            ? ltrim(Services::request()->getPath(), '/')
-            : Services::request()->getUri()->getPath();
+        // The value of Services::request()->getUri()->getPath() is overridden
+        // by IncomingRequest constructor. If we use it here, the current tests
+        // in CurrentUrlTest will fail.
+        return ltrim(Services::request()->getPath(), '/');
     }
 }
 
@@ -583,7 +582,7 @@ function url_is(string $path): bool
     {
         // Setup our regex to allow wildcards
         $path        = '/' . trim(str_replace('*', '(\S)*', $path), '/ ');
-        $currentPath = '/' . trim(uri_string(true), '/ ');
+        $currentPath = '/' . trim(uri_string(), '/ ');
 
         return (bool) preg_match("|^{$path}$|", $currentPath, $matches);
     }

tests/system/Helpers/URLHelper/CurrentUrlTest.php

@@ -163,7 +163,7 @@ public function testCurrentURLWithPortInSubfolder()
         $this->assertSame(8080, $uri->getPort());
     }
 
-    public function testUriStringAbsolute()
+    public function testUriString()
     {
         $_SERVER['HTTP_HOST']   = 'example.com';
         $_SERVER['REQUEST_URI'] = '/assets/image.jpg';
@@ -183,18 +183,7 @@ private function setService(string $uri): void
         Services::injectMock('request', $request);
     }
 
-    public function testUriStringRelative()
-    {
-        $_SERVER['HTTP_HOST']   = 'example.com';
-        $_SERVER['REQUEST_URI'] = '/assets/image.jpg';
-
-        $uri = 'http://example.com/assets/image.jpg';
-        $this->setService($uri);
-
-        $this->assertSame('assets/image.jpg', uri_string(true));
-    }
-
-    public function testUriStringNoTrailingSlashAbsolute()
+    public function testUriStringNoTrailingSlash()
     {
         $_SERVER['HTTP_HOST']   = 'example.com';
         $_SERVER['REQUEST_URI'] = '/assets/image.jpg';
@@ -207,33 +196,12 @@ public function testUriStringNoTrailingSlashAbsolute()
         $this->assertSame('assets/image.jpg', uri_string());
     }
 
-    public function testUriStringNoTrailingSlashRelative()
-    {
-        $_SERVER['HTTP_HOST']   = 'example.com';
-        $_SERVER['REQUEST_URI'] = '/assets/image.jpg';
-
-        $this->config->baseURL = 'http://example.com';
-
-        $uri = 'http://example.com/assets/image.jpg';
-        $this->setService($uri);
-
-        $this->assertSame('assets/image.jpg', uri_string(true));
-    }
-
-    public function testUriStringEmptyAbsolute()
+    public function testUriStringEmpty()
     {
         $uri = 'http://example.com/';
         $this->setService($uri);
 
-        $this->assertSame('/', uri_string());
-    }
-
-    public function testUriStringEmptyRelative()
-    {
-        $uri = 'http://example.com/';
-        $this->setService($uri);
-
-        $this->assertSame('', uri_string(true));
+        $this->assertSame('', uri_string());
     }
 
     public function testUriStringSubfolderAbsolute()
@@ -260,7 +228,7 @@ public function testUriStringSubfolderRelative()
         $uri = 'http://example.com/subfolder/assets/image.jpg';
         $this->setService($uri);
 
-        $this->assertSame('assets/image.jpg', uri_string(true));
+        $this->assertSame('assets/image.jpg', uri_string());
     }
 
     public function urlIsProvider()