refactor: remove adjustPathTrailingSlash()

codeigniter4 · Feb 25, 2023 · 9751854 · 9751854
1 parent e6648a9
commit 9751854
Showing 1 changed file with 2 additions and 20 deletions.
diff --git a/system/HTTP/SiteURI.php b/system/HTTP/SiteURI.php
@@ -384,7 +384,7 @@ public function baseUrl($relativePath = '', ?string $scheme = null): string
         return URI::createURIString(
             $uri->getScheme(),
             $uri->getAuthority(),
-            $this->adjustPathTrailingSlash($uri, $relativePath),
+            $uri->getPath(),
             $uri->getQuery(),
             $uri->getFragment()
         );
@@ -420,30 +420,12 @@ public function siteUrl($relativePath = '', ?string $scheme = null, ?App $config
 
         $uri = new self($config, $relativePath, $host, $scheme);
 
-        // Adjust path
-        $path = $this->adjustPathTrailingSlash($uri, $relativePath);
-        if ($config->indexPage !== '' && $relativePath === '') {
-            $path = rtrim($path, '/');
-        }
-
         return URI::createURIString(
             $uri->getScheme(),
             $uri->getAuthority(),
-            $path,
+            $uri->getPath(),
             $uri->getQuery(),
             $uri->getFragment()
         );
     }
-
-    private function adjustPathTrailingSlash(self $uri, string $relativePath): string
-    {
-        $parts = parse_url($this->getBaseURL() . $relativePath);
-        $path  = $parts['path'] ?? '';
-
-        if (substr($path, -1) === '/' && substr($uri->getPath(), -1) !== '/') {
-            return $uri->getPath() . '/';
-        }
-
-        return $uri->getPath();
-    }
 }