fix Get param

Fohn-Group · Jun 13, 2024 · dac2900 · dac2900
1 parent f7db0e5
commit dac2900
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 20 deletions.
diff --git a/app-test/_unit-test/table-filter.php b/app-test/_unit-test/table-filter.php
@@ -11,7 +11,7 @@
 
 require_once __DIR__ . '/../init-ui.php';
 
-if ($locale = Ui::getQueryParamValue('locale')) {
+if ($locale = Ui::service()->getQueryParamValue('locale')) {
     \Fohn\Ui\Component\Utils::requireFLatPickrLocale(\Fohn\Ui\Service\Ui::page(), $locale);
 }
 

diff --git a/src/Callback/Request.php b/src/Callback/Request.php
@@ -113,23 +113,23 @@ protected function assertSafeRequest(): void
      */
     public function isTriggered(): bool
     {
-        return (Ui::getQueryParamValue($this->urlTrigger) !== null) && $this->getTriggeredValue() === $this->type;
+        return (Ui::service()->getQueryParamValue($this->urlTrigger) !== null) && $this->getTriggeredValue() === $this->type;
     }
 
     /**
      * Return callback triggered value.
      */
     public function getTriggeredValue(): string
     {
-        return Ui::getQueryParamValue($this->urlTrigger) ?? '';
+        return Ui::service()->getQueryParamValue($this->urlTrigger) ?? '';
     }
 
     /**
      * Only current callback can terminate.
      */
     public function canTerminate(): bool
     {
-        return (Ui::getQueryParamValue(static::URL_QUERY_TARGET) !== null) && Ui::getQueryParamValue(static::URL_QUERY_TARGET) === $this->urlTrigger;
+        return (Ui::service()->getQueryParamValue(static::URL_QUERY_TARGET) !== null) && Ui::service()->getQueryParamValue(static::URL_QUERY_TARGET) === $this->urlTrigger;
     }
 
     /**
@@ -177,7 +177,7 @@ protected function getUrlArguments(): array
 
     public static function assertNoCallbackRunning(): void
     {
-        if ($v = Ui::getQueryParamValue(static::URL_QUERY_TARGET) !== null) {
+        if ($v = Ui::service()->getQueryParamValue(static::URL_QUERY_TARGET) !== null) {
             throw (new Exception('Callback requested, but never reached. You may be missing some arguments in request URL.'))
                 ->addMoreInfo('callback requested', $v);
         }

diff --git a/src/Service/Ui.php b/src/Service/Ui.php
@@ -171,17 +171,9 @@ public static function serverRequest(): ServerRequestInterface
         return static::service()->serverRequest;
     }
 
-    public static function getQueryParamValue(string $param): ?string
+    public function getQueryParamValue(string $param): ?string
     {
-        return static::service()->returnQueryParamValue($param);
-    }
-
-    protected function returnQueryParamValue(string $param): ?string
-    {
-        $params = [];
-        parse_str(static::service()->serverRequest()->getUri()->getQuery(), $params);
-
-        return $params[$param] ?? null;
+        return $_GET[$param] ?? null;
     }
 
     /**
@@ -452,7 +444,7 @@ public static function copyView(View $view): View
      */
     public static function viewDump(View $view, string $dumpWhen, bool $includeJs = true): void
     {
-        if (self::getQueryParamValue(self::DUMP_PARAM_NAME) === $dumpWhen) {
+        if (static::service()->getQueryParamValue(self::DUMP_PARAM_NAME) === $dumpWhen) {
             static::app()->terminateHtml(static::service()->getDumpPageHtml($view, $includeJs));
         }
     }

diff --git a/src/Service/UiInterface.php b/src/Service/UiInterface.php
@@ -40,7 +40,7 @@ public static function page(): Page;
 
     public static function serverRequest(): ServerRequestInterface;
 
-    public static function getQueryParamValue(string $param): ?string;
+    public function getQueryParamValue(string $param): ?string;
 
     public static function timezone(string $timezone = null): string;
 

diff --git a/src/View.php b/src/View.php
@@ -473,7 +473,7 @@ private function getStickyArgs(): array
      */
     public function stickyGet(string $name, string $newValue = null): ?string
     {
-        $this->stickyArgs[$name] = Ui::getQueryParamValue($name) ?? $newValue;
+        $this->stickyArgs[$name] = Ui::service()->getQueryParamValue($name) ?? $newValue;
 
         return $this->stickyArgs[$name];
     }

diff --git a/tests/Callback/CallbackTest.php b/tests/Callback/CallbackTest.php
@@ -7,6 +7,7 @@
 
 namespace Fohn\Ui\Tests\Callback;
 
+use Fohn\Ui\AppTest\UiAppTest;
 use Fohn\Ui\Callback\Ajax;
 use Fohn\Ui\Callback\Data;
 use Fohn\Ui\Callback\Generic;
@@ -15,14 +16,14 @@
 use Fohn\Ui\Callback\ServerEvent;
 use Fohn\Ui\HtmlTemplate;
 use Fohn\Ui\Js\Js;
-use Fohn\Ui\Tests\UiTestService;
+use Fohn\Ui\Service\Ui;
 use Fohn\Ui\View;
 
 class CallbackTest extends \PHPUnit\Framework\TestCase
 {
     protected function setUp(): void
     {
-        $ui = UiTestService::service();
+        $ui = Ui::service();
         $ui->setApp(new MockApp(['registerShutdown' => false]));
     }