refactor: current_url()

_get_uri() is no longer used.

Author: kenjis

system/Helpers/url_helper.php

@@ -32,6 +32,8 @@
      *
      * @throws HTTPException            For invalid paths.
      * @throws InvalidArgumentException For invalid config.
+     *
+     * @deprecated No longer used.
      */
     function _get_uri(string $relativePath = '', ?App $config = null, bool $useConfig = false): URI
     {
@@ -224,7 +226,11 @@ function current_url(bool $returnObject = false, ?IncomingRequest $request = nul
         $routePath  = $request->getPath();
         $currentURI = $request->getUri();
 
+        $url = $request->getUri()->getBaseURL();
+
+        $config       = config('App');
         $relativePath = $routePath;
+
         // Append queries and fragments
         if ($query = $currentURI->getQuery()) {
             $relativePath .= '?' . $query;
@@ -233,7 +239,17 @@ function current_url(bool $returnObject = false, ?IncomingRequest $request = nul
             $relativePath .= '#' . $fragment;
         }
 
-        $uri = _get_uri($relativePath);
+        // Check for an index page
+        if ($config->indexPage !== '') {
+            $url .= $config->indexPage;
+
+            // Check if we need a separator
+            if ($relativePath !== '' && $relativePath[0] !== '/' && $relativePath[0] !== '?') {
+                $url .= '/';
+            }
+        }
+
+        $uri = new URI($url . $relativePath);
 
         return $returnObject ? $uri : URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath());
     }

tests/system/Helpers/URLHelper/CurrentUrlTest.php

@@ -63,6 +63,10 @@ public function testCurrentURLReturnsBasicURL()
 
         $this->config->baseURL = 'http://example.com/public';
 
+        // URI object are updated in IncomingRequest constructor.
+        $request = Services::incomingrequest($this->config);
+        Services::injectMock('request', $request);
+
         $this->assertSame('http://example.com/public/index.php/', current_url());
     }