refactor: extract _get_uri() function

Author: kenjis

system/Helpers/url_helper.php

@@ -26,21 +26,23 @@
      *
      * @internal Outside the framework this should not be used directly.
      *
-     * @param string   $relativePath URI path relative to baseURL. May include queries or fragments
-     * @param App|null $config       Alternative Config to use
-     * @param bool     $useConfig    Whether to use the Config baseURL
+     * @param array|string $relativePath URI string or array of URI segments
+     * @param App|null     $config       Alternative Config to use
+     * @param bool         $indexPage    Whether to add the $indexPage value
      *
      * @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
+    function _get_uri($relativePath = '', ?App $config = null, bool $indexPage = false): URI
     {
-        $config ??= config('App');
+        $appConfig = null;
+        if ($config === null) {
+            $appConfig = config('App');
+        }
 
-        if ($config->baseURL === '') {
-            throw new InvalidArgumentException('_get_uri() requires a valid baseURL.');
+        // Convert array of segments to a string
+        if (is_array($relativePath)) {
+            $relativePath = implode('/', $relativePath);
         }
 
         // If a full URI was passed then convert it
@@ -57,20 +59,21 @@ function _get_uri(string $relativePath = '', ?App $config = null, bool $useConfi
 
         $relativePath = URI::removeDotSegments($relativePath);
 
-        // Build the full URL based on $config and $relativePath
         $request = Services::request();
 
-        /** @var App $config */
-        if ($useConfig) {
-            $url = rtrim($config->baseURL, '/ ') . '/';
-        } else {
+        if ($config === null) {
             $url = $request instanceof CLIRequest
-                ? rtrim($config->baseURL, '/ ') . '/'
+                ? rtrim($appConfig->baseURL, '/ ') . '/'
+                // Use the current baseURL for multiple domain support
                 : $request->getUri()->getBaseURL();
+
+            $config = $appConfig;
+        } else {
+            $url = rtrim($config->baseURL, '/ ') . '/';
         }
 
         // Check for an index page
-        if ($config->indexPage !== '') {
+        if ($indexPage && $config->indexPage !== '') {
             $url .= $config->indexPage;
 
             // Check if we need a separator
@@ -79,16 +82,7 @@ function _get_uri(string $relativePath = '', ?App $config = null, bool $useConfi
             }
         }
 
-        $url .= $relativePath;
-
-        $uri = new URI($url);
-
-        // Check if the baseURL scheme needs to be coerced into its secure version
-        if ($config->forceGlobalSecureRequests && $uri->getScheme() === 'http') {
-            $uri->setScheme('https');
-        }
-
-        return $uri;
+        return new URI($url . $relativePath);
     }
 }
 
@@ -107,50 +101,12 @@ function site_url($relativePath = '', ?string $scheme = null, ?App $config = nul
             $appConfig = config('App');
         }
 
-        // Convert array of segments to a string
-        if (is_array($relativePath)) {
-            $relativePath = implode('/', $relativePath);
-        }
-
-        // If a full URI was passed then convert it
-        if (strpos($relativePath, '://') !== false) {
-            $full         = new URI($relativePath);
-            $relativePath = URI::createURIString(
-                null,
-                null,
-                $full->getPath(),
-                $full->getQuery(),
-                $full->getFragment()
-            );
-        }
-
-        $relativePath = URI::removeDotSegments($relativePath);
-
-        $request = Services::request();
+        $uri = _get_uri($relativePath, $config, true);
 
         if ($config === null) {
-            $url = $request instanceof CLIRequest
-                ? rtrim($appConfig->baseURL, '/ ') . '/'
-                // Use the current baseURL for multiple domain support
-                : $request->getUri()->getBaseURL();
-
             $config = $appConfig;
-        } else {
-            $url = rtrim($config->baseURL, '/ ') . '/';
         }
 
-        // 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);
-
         // Check if the baseURL scheme needs to be coerced into its secure version
         if ($config->forceGlobalSecureRequests && $uri->getScheme() === 'http') {
             $uri->setScheme('https');
@@ -176,29 +132,7 @@ function site_url($relativePath = '', ?string $scheme = null, ?App $config = nul
      */
     function base_url($relativePath = '', ?string $scheme = null): string
     {
-        // Convert array of segments to a string
-        if (is_array($relativePath)) {
-            $relativePath = implode('/', $relativePath);
-        }
-
-        // If a full URI was passed then convert it
-        if (strpos($relativePath, '://') !== false) {
-            $full         = new URI($relativePath);
-            $relativePath = URI::createURIString(
-                null,
-                null,
-                $full->getPath(),
-                $full->getQuery(),
-                $full->getFragment()
-            );
-        }
-
-        $relativePath = URI::removeDotSegments($relativePath);
-
-        $request        = Services::request();
-        $currentBaseURL = $request->getUri()->getBaseURL();
-
-        $uri = new URI($currentBaseURL . $relativePath);
+        $uri = _get_uri($relativePath);
 
         return URI::createURIString(
             $scheme ?? $uri->getScheme(),