From 342bfb4ae3d21bbc5aac699bc7e209fcd9a97295 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Fri, 15 Sep 2023 10:49:47 +0200 Subject: [PATCH 01/10] fix URL for non properly configured $_SERVER --- src/App.php | 9 +++++---- tests/CallbackTest.php | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/App.php b/src/App.php index f7e2df42d6..4243b849e3 100644 --- a/src/App.php +++ b/src/App.php @@ -670,16 +670,17 @@ public function url($page = [], array $extraRequestUrlArgs = []): string } else { // use current page by default $requestUrl = $request->getUri()->getPath(); - if (substr($requestUrl, -1, 1) === '/') { + if ($requestUrl === '') { // TODO path must always start with '/' + $requestUrl = '/'; + } + if (substr($requestUrl, -1) === '/') { $pagePath = $this->urlBuildingIndexPage; } else { $pagePath = basename($requestUrl, $this->urlBuildingExt); } } unset($page[0]); - if ($pagePath) { - $pagePath .= $this->urlBuildingExt; - } + $pagePath .= $this->urlBuildingExt; } $args = $extraRequestUrlArgs; diff --git a/tests/CallbackTest.php b/tests/CallbackTest.php index f4cc4bf8cd..b4eaacf158 100644 --- a/tests/CallbackTest.php +++ b/tests/CallbackTest.php @@ -89,8 +89,8 @@ public function testViewUrlCallback(): void $this->simulateCallbackTriggering($cbApp); $this->simulateCallbackTriggering($cb); - $expectedUrlCbApp = '?' . Callback::URL_QUERY_TRIGGER_PREFIX . 'aa=callback&' . Callback::URL_QUERY_TARGET . '=aa'; - $expectedUrlCb = '?' . /* Callback::URL_QUERY_TRIGGER_PREFIX . 'aa=1&' . */ Callback::URL_QUERY_TRIGGER_PREFIX . 'bb=callback&' . Callback::URL_QUERY_TARGET . '=bb'; + $expectedUrlCbApp = 'index.php?' . Callback::URL_QUERY_TRIGGER_PREFIX . 'aa=callback&' . Callback::URL_QUERY_TARGET . '=aa'; + $expectedUrlCb = 'index.php?' . /* Callback::URL_QUERY_TRIGGER_PREFIX . 'aa=1&' . */ Callback::URL_QUERY_TRIGGER_PREFIX . 'bb=callback&' . Callback::URL_QUERY_TARGET . '=bb'; self::assertSame($expectedUrlCbApp, $cbApp->getUrl()); self::assertSame($expectedUrlCb, $cb->getUrl()); From 008e43fb39d8125df2a18cb442c9c891005bad01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Fri, 15 Sep 2023 00:13:29 +0200 Subject: [PATCH 02/10] merge URL params from request API (instead of $_GET) --- src/App.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/App.php b/src/App.php index 4243b849e3..d3ff292897 100644 --- a/src/App.php +++ b/src/App.php @@ -686,9 +686,10 @@ public function url($page = [], array $extraRequestUrlArgs = []): string $args = $extraRequestUrlArgs; // add sticky arguments + $queryParams = $this->getRequest()->getQueryParams(); foreach ($this->stickyGetArguments as $k => $v) { - if ($v && isset($_GET[$k])) { - $args[$k] = $_GET[$k]; + if ($v && isset($queryParams[$k])) { + $args[$k] = $queryParams[$k]; } else { unset($args[$k]); } From 8fadf94237b0d4f8ecc63b9a14a38b519075ac53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Fri, 15 Sep 2023 00:30:21 +0200 Subject: [PATCH 03/10] stricter URL query concat --- src/App.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/App.php b/src/App.php index d3ff292897..0a452f6c9f 100644 --- a/src/App.php +++ b/src/App.php @@ -704,11 +704,9 @@ public function url($page = [], array $extraRequestUrlArgs = []): string } } - // put URL together $pageQuery = http_build_query($args, '', '&', \PHP_QUERY_RFC3986); - $url = $pagePath . ($pageQuery ? '?' . $pageQuery : ''); - return $url; + return $pagePath . ($pageQuery !== '' ? '?' . $pageQuery : ''); } /** From d4afbbd77cc379529dfff9863ce90cd4de133035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Fri, 15 Sep 2023 00:41:27 +0200 Subject: [PATCH 04/10] convert page string to array and then process the same way --- src/App.php | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/src/App.php b/src/App.php index 0a452f6c9f..3ea509b620 100644 --- a/src/App.php +++ b/src/App.php @@ -657,31 +657,30 @@ public function stickyForget(string $name): void */ public function url($page = [], array $extraRequestUrlArgs = []): string { - $request = $this->getRequest(); - - $pagePath = ''; if (is_string($page)) { $pageExploded = explode('?', $page, 2); - $pagePath = $pageExploded[0]; parse_str($pageExploded[1] ?? '', $page); + $page[0] = $pageExploded[0]; + } + + $request = $this->getRequest(); + + if (isset($page[0])) { + $pagePath = $page[0]; } else { - if (isset($page[0])) { - $pagePath = $page[0]; + // use current page by default + $requestUrl = $request->getUri()->getPath(); + if ($requestUrl === '') { // TODO path must always start with '/' + $requestUrl = '/'; + } + if (substr($requestUrl, -1) === '/') { + $pagePath = $this->urlBuildingIndexPage; } else { - // use current page by default - $requestUrl = $request->getUri()->getPath(); - if ($requestUrl === '') { // TODO path must always start with '/' - $requestUrl = '/'; - } - if (substr($requestUrl, -1) === '/') { - $pagePath = $this->urlBuildingIndexPage; - } else { - $pagePath = basename($requestUrl, $this->urlBuildingExt); - } + $pagePath = basename($requestUrl, $this->urlBuildingExt); } - unset($page[0]); - $pagePath .= $this->urlBuildingExt; } + unset($page[0]); + $pagePath .= $this->urlBuildingExt; $args = $extraRequestUrlArgs; From df0c7d448fc2d2fa6f86f4650f46408384006b0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Fri, 15 Sep 2023 00:52:20 +0200 Subject: [PATCH 05/10] extract $page[0] into $pagePage early --- src/App.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/App.php b/src/App.php index 3ea509b620..7f7a21f79b 100644 --- a/src/App.php +++ b/src/App.php @@ -660,14 +660,15 @@ public function url($page = [], array $extraRequestUrlArgs = []): string if (is_string($page)) { $pageExploded = explode('?', $page, 2); parse_str($pageExploded[1] ?? '', $page); - $page[0] = $pageExploded[0]; + $pagePath = $pageExploded[0] !== '' ? $pageExploded[0] : null; + } else { + $pagePath = $page[0] ?? null; + unset($page[0]); } $request = $this->getRequest(); - if (isset($page[0])) { - $pagePath = $page[0]; - } else { + if ($pagePath === null) { // use current page by default $requestUrl = $request->getUri()->getPath(); if ($requestUrl === '') { // TODO path must always start with '/' @@ -679,7 +680,6 @@ public function url($page = [], array $extraRequestUrlArgs = []): string $pagePath = basename($requestUrl, $this->urlBuildingExt); } } - unset($page[0]); $pagePath .= $this->urlBuildingExt; $args = $extraRequestUrlArgs; From 28c3f3ebdf42db684a72f0bc3e5789721e4ab3bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Fri, 15 Sep 2023 01:25:36 +0200 Subject: [PATCH 06/10] rm dirname in App::createRequestPathFromLocalPath() for phpunit --- src/App.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.php b/src/App.php index 7f7a21f79b..ffbaceef7c 100644 --- a/src/App.php +++ b/src/App.php @@ -612,7 +612,7 @@ protected function createRequestPathFromLocalPath(string $localPath): string if (\PHP_SAPI === 'cli') { // for phpunit $requestUrlPath = '/'; $requestLocalPath = \Closure::bind(static function () { - return dirname((new ExceptionRenderer\Html(new \Exception()))->getVendorDirectory()); + return (new ExceptionRenderer\Html(new \Exception()))->getVendorDirectory(); }, null, ExceptionRenderer\Html::class)(); } else { $request = \Symfony\Component\HttpFoundation\Request::createFromGlobals(); From b492b5ed22ad3bed238b4e4639cb30ff052ce834 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Fri, 15 Sep 2023 01:41:22 +0200 Subject: [PATCH 07/10] unwrap Symfony call to stress $_GET/$_SERVER global vars --- src/App.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.php b/src/App.php index ffbaceef7c..e8cfd495ee 100644 --- a/src/App.php +++ b/src/App.php @@ -615,7 +615,7 @@ protected function createRequestPathFromLocalPath(string $localPath): string return (new ExceptionRenderer\Html(new \Exception()))->getVendorDirectory(); }, null, ExceptionRenderer\Html::class)(); } else { - $request = \Symfony\Component\HttpFoundation\Request::createFromGlobals(); + $request = new \Symfony\Component\HttpFoundation\Request($_GET, [], [], [], [], $_SERVER); $requestUrlPath = $request->getBasePath(); $requestLocalPath = realpath($request->server->get('SCRIPT_FILENAME')); } From 9f67fd06c070188880fcb896881d04c3045d46fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Fri, 15 Sep 2023 01:59:48 +0200 Subject: [PATCH 08/10] $_GET in App::createRequestPathFromLocalPath() is not needed/used --- src/App.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.php b/src/App.php index e8cfd495ee..5ca66868a9 100644 --- a/src/App.php +++ b/src/App.php @@ -615,7 +615,7 @@ protected function createRequestPathFromLocalPath(string $localPath): string return (new ExceptionRenderer\Html(new \Exception()))->getVendorDirectory(); }, null, ExceptionRenderer\Html::class)(); } else { - $request = new \Symfony\Component\HttpFoundation\Request($_GET, [], [], [], [], $_SERVER); + $request = new \Symfony\Component\HttpFoundation\Request([], [], [], [], [], $_SERVER); $requestUrlPath = $request->getBasePath(); $requestLocalPath = realpath($request->server->get('SCRIPT_FILENAME')); } From ed8fac4b18f93c61b8ef06abe24779e4e706b59b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Fri, 15 Sep 2023 11:03:01 +0200 Subject: [PATCH 09/10] refactor for cleaness --- src/App.php | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/App.php b/src/App.php index 5ca66868a9..68cfdc4e23 100644 --- a/src/App.php +++ b/src/App.php @@ -669,15 +669,14 @@ public function url($page = [], array $extraRequestUrlArgs = []): string $request = $this->getRequest(); if ($pagePath === null) { - // use current page by default - $requestUrl = $request->getUri()->getPath(); - if ($requestUrl === '') { // TODO path must always start with '/' - $requestUrl = '/'; + $pagePath = $request->getUri()->getPath(); + if ($pagePath === '') { // TODO path must always start with '/' + $pagePath = '/'; } - if (substr($requestUrl, -1) === '/') { + if (substr($pagePath, -1) === '/') { $pagePath = $this->urlBuildingIndexPage; } else { - $pagePath = basename($requestUrl, $this->urlBuildingExt); + $pagePath = basename($pagePath, $this->urlBuildingExt); } } $pagePath .= $this->urlBuildingExt; @@ -685,10 +684,10 @@ public function url($page = [], array $extraRequestUrlArgs = []): string $args = $extraRequestUrlArgs; // add sticky arguments - $queryParams = $this->getRequest()->getQueryParams(); + $requestQueryParams = $request->getQueryParams(); foreach ($this->stickyGetArguments as $k => $v) { - if ($v && isset($queryParams[$k])) { - $args[$k] = $queryParams[$k]; + if ($v && isset($requestQueryParams[$k])) { + $args[$k] = $requestQueryParams[$k]; } else { unset($args[$k]); } From 6c902ddbb46435c0f33d3a06a1a70fdcfc01a4ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Fri, 15 Sep 2023 12:03:36 +0200 Subject: [PATCH 10/10] do not add ext if basename part contains dot --- src/App.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/App.php b/src/App.php index 68cfdc4e23..0ee5de37ba 100644 --- a/src/App.php +++ b/src/App.php @@ -679,7 +679,9 @@ public function url($page = [], array $extraRequestUrlArgs = []): string $pagePath = basename($pagePath, $this->urlBuildingExt); } } - $pagePath .= $this->urlBuildingExt; + if (!str_contains(basename($pagePath), '.')) { + $pagePath .= $this->urlBuildingExt; + } $args = $extraRequestUrlArgs;