Reorganize code

atk4 · Aug 25, 2023 · 8f8e522 · 8f8e522
1 parent 04720c5
commit 8f8e522
Showing 1 changed file with 47 additions and 27 deletions.
diff --git a/src/App.php b/src/App.php
@@ -698,39 +698,62 @@ public function stickyForget(string $name): void
      * @param bool                                     $useRequestUrl       Simply return $_SERVER['REQUEST_URI'] if needed
      * @param array<string, string>                    $extraRequestUrlArgs additional URL arguments, deleting sticky can delete them
      */
-    public function url($page = [], $useRequestUrl = false, $extraRequestUrlArgs = []): string
+    public function url($page = [], bool $useRequestUrl = false, array $extraRequestUrlArgs = []): string
     {
         if ($useRequestUrl) {
-            $page = $this->request->getQueryParams();
-            $page[0] = $this->getRequest()->getUri()->getPath();
+            $page = $this->urlGetCurrentRequestPage();
         }
 
         if (is_string($page)) {
-            $pageExploded = explode('?', $page, 2);
-            $page = [];
-            parse_str($pageExploded[1] ?? '', $page);
-            $page[0] = $pageExploded[0];
+            $page = $this->urlSplitStringPageIntoArray($page);
         }
 
-        $pagePath = $page[0] ?? $this->getRequestUrl();
+        $pagePath = $this->urlConstructPagePath($page[0] ?? $this->getRequestUrl());
+        unset($page[0]);
 
-        if (substr($pagePath, -1, 1) === '/') {
-            $pagePath = $pagePath . $this->urlBuildingPage;
-        } else {
-            // get initial part of the url
-            $pagePathPart = dirname($pagePath);
-            // remove dirname empty response
-            $pagePathPart = trim($pagePathPart, '.');
-            $pagePathPart = $pagePathPart === '' ? '' : $pagePathPart . '/';
-            // get filename
-            $pagePathFile = basename($pagePath, $this->urlBuildingExt);
-
-            $pagePath = str_replace('//', '/', $pagePathPart) . $pagePathFile;
+        $args = $this->urlMergeArguments($page, $extraRequestUrlArgs);
+
+        $pageQuery = http_build_query($args, '', '&', \PHP_QUERY_RFC3986);
+        return $pagePath . ($pageQuery ? '?' . $pageQuery : '');
+    }
+
+    private function urlGetCurrentRequestPage(): array
+    {
+        $request = $this->getRequest();
+        $page = $request->getQueryParams();
+        $page[0] = $request->getUri()->getPath();
+        return $page;
+    }
+
+    private function urlSplitStringPageIntoArray(string $page): array
+    {
+        $pageExploded = explode('?', $page, 2);
+        $arrayPage = [];
+        parse_str($pageExploded[1] ?? '', $arrayPage);
+        $arrayPage[0] = $pageExploded[0];
+        return $arrayPage;
+    }
+
+    private function urlConstructPagePath(string $pagePath): string
+    {
+        // Changed array string access to substr for PHP 7.4 compatibility
+        $lastChar = substr($pagePath, -1);
+        if ($lastChar === '/') {
+            return $pagePath . $this->urlBuildingPage . $this->urlBuildingExt;
         }
 
-        unset($page[0]);
-        $pagePath .= $this->urlBuildingExt;
+        $pagePathPart = rtrim(dirname($pagePath), '.');
+        $pagePathFile = basename($pagePath, $this->urlBuildingExt);
 
+        if ($pagePathPart !== '') {
+            $pagePathPart .= '/';
+        }
+
+        return str_replace('//', '/', $pagePathPart . $pagePathFile) . $this->urlBuildingExt;
+    }
+
+    private function urlMergeArguments(array $page, array $extraRequestUrlArgs): array
+    {
         $args = $extraRequestUrlArgs;
 
         // add sticky arguments
@@ -751,13 +774,10 @@ public function url($page = [], $useRequestUrl = false, $extraRequestUrlArgs = [
             }
         }
 
-        // put URL together
-        $pageQuery = http_build_query($args, '', '&', \PHP_QUERY_RFC3986);
-        $url = $pagePath . ($pageQuery ? '?' . $pageQuery : '');
-
-        return $url;
+        return $args;
     }
 
+
     /**
      * Build a URL that application can use for JS callbacks. Some framework integration will use a different routing
      * mechanism for NON-HTML response.