atk4 · mvorisek · Sep 30, 2023 · Aug 23, 2023 · Aug 25, 2023 · Aug 25, 2023
diff --git a/demos/_includes/ReloadTest.php b/demos/_includes/ReloadTest.php
@@ -17,7 +17,7 @@ protected function init(): void
         $label = Label::addTo($this, ['Testing...', 'detail' => '', 'class.red' => true]);
         $reload = new JsReload($this, [$this->name => 'ok']);
 
-        if (isset($_GET[$this->name])) {
+        if ($this->getApp()->hasRequestQueryParam($this->name)) {
             $label->class[] = 'green';
             $label->content = 'Reload success';
         } else {

diff --git a/demos/_includes/ViewTester.php b/demos/_includes/ViewTester.php
@@ -22,7 +22,7 @@ protected function init(): void
         $label = Label::addTo($this, ['CallBack', 'detail' => 'fail', 'class.red' => true]);
         $reload = new JsReload($this, [$this->name => 'ok']);
 
-        if (isset($_GET[$this->name])) {
+        if ($this->getApp()->hasRequestQueryParam($this->name)) {
             $label->class[] = 'green';
             $label->detail = 'success';
         } else {

diff --git a/demos/_unit-test/callback-nested.php b/demos/_unit-test/callback-nested.php
@@ -28,7 +28,7 @@
 $loader->set(static function (Loader $p) use ($m) {
     Header::addTo($p, ['Loader-1', 'size' => 4]);
 
-    if (isset($_GET['err_main_loader'])) {
+    if ($p->getApp()->hasRequestQueryParam('err_main_loader')) {
         throw new Exception('Exception from Main Loader');
     }
 
@@ -39,9 +39,9 @@
     $loaderSub->set(static function (Loader $p) use ($m) {
         Header::addTo($p, ['Loader-2', 'size' => 4]);
 
-        if (isset($_GET['err_sub_loader'])) {
+        if ($p->getApp()->hasRequestQueryParam('err_sub_loader')) {
             throw new Exception('Exception from Sub Loader');
-        } elseif (isset($_GET['err_sub_loader2'])) {
+        } elseif ($p->getApp()->hasRequestQueryParam('err_sub_loader2')) {
             throw new \Error('Exception II from Sub Loader');
         }
 

diff --git a/demos/_unit-test/stream.php b/demos/_unit-test/stream.php
@@ -128,7 +128,7 @@ public function getMetadata($key = null)
     }
 });
 
-$sizeBytes = $_GET['size_mb'] * 1024 * 1024;
+$sizeBytes = (int) $app->getRequestQueryParam('size_mb') * 1024 * 1024;
 
 $stream = new $hugePseudoStreamClass(static function (int $pos) {
     return "\n\0" . str_repeat($pos . ',', 1024);

diff --git a/demos/basic/label.php b/demos/basic/label.php
@@ -29,7 +29,7 @@
 $del = Label::addTo($app, ['Zoe', 'image' => 'https://fomantic-ui.com/images/avatar/small/ade.jpg', 'iconRight' => 'delete']);
 $del->on('click', '.delete', $del->js()->fadeOut());
 
-$val = isset($_GET['toggle']) && $_GET['toggle'];
+$val = $app->hasRequestQueryParam('toggle') && $app->getRequestQueryParam('toggle');
 $toggle = Label::addTo($app, ['icon' => 'toggle ' . ($val ? 'on' : 'off')])->set('Value: ' . $val);
 $toggle->on('click', new JsReload($toggle, ['toggle' => $val ? null : 1]));
 

diff --git a/demos/collection/multitable.php b/demos/collection/multitable.php
@@ -32,7 +32,7 @@ public function setModel(Model $model, array $route = []): void
         $table = Table::addTo($this->addColumn(), ['header' => false, 'class.very basic selectable' => true])->setStyle('cursor', 'pointer');
         $table->setModel($model, [$model->titleField]);
 
-        $selections = explode(',', $_GET[$this->name] ?? '');
+        $selections = explode(',', $this->getApp()->tryGetRequestQueryParam($this->name) ?? '');
 
         if ($selections[0]) {
             $table->js(true)->find('tr[data-id=' . $selections[0] . ']')->addClass('active');

diff --git a/demos/collection/table.php b/demos/collection/table.php
@@ -14,7 +14,7 @@
 /** @var \Atk4\Ui\App $app */
 require_once __DIR__ . '/../init-app.php';
 
-if ($_GET['id'] ?? null) {
+if ($app->tryGetRequestQueryParam('id')) {
     $app->layout->js(true, new JsToast('Details link is in simulation mode.'));
 }
 

diff --git a/demos/form/form3.php b/demos/form/form3.php
@@ -29,7 +29,7 @@
     ->on('click', new JsReload($seg, ['m' => 'stat']));
 
 $form = Form::addTo($seg, ['layout' => [Form\Layout\Columns::class]]);
-$modelClass = ['country' => Country::class, 'file' => File::class][$_GET['m'] ?? ''] ?? Stat::class;
+$modelClass = ['country' => Country::class, 'file' => File::class][$app->tryGetRequestQueryParam('m')] ?? Stat::class;
 $form->setModel((new $modelClass($app->db))->loadAny());
 
 $form->onSubmit(static function (Form $form) {

diff --git a/demos/init-app.php b/demos/init-app.php
@@ -31,6 +31,23 @@
 ]);
 $app->title = 'Agile UI Demo v' . $app->version;
 
+unset($_SERVER);
+unset($_GET);
+unset($_POST);
+unset($_FILES);
+if (isset($_COOKIE)) { // @phpstan-ignore-line https://github.com/phpstan/phpstan/issues/9953
+    $sessionCookieName = function_exists('session_name') ? session_name() : false;
+    foreach (array_keys($_COOKIE) as $k) {
+        if ($k !== $sessionCookieName) {
+            unset($_COOKIE[$k]);
+        }
+    }
+    if ($_COOKIE === []) {
+        unset($_COOKIE);
+    }
+}
+unset($_SESSION);
+
 if ($app->callExit !== true) {
     $app->stickyGet('APP_CALL_EXIT');
 }
@@ -85,7 +102,7 @@ public static function get_class(\Closure $createAnonymousClassFx): string
 $demosUrl = $rootUrl . 'demos/';
 
 // allow custom layout override
-$app->initLayout([!isset($_GET['layout']) ? Layout\Maestro::class : $app->stickyGet('layout')]);
+$app->initLayout([!$app->hasRequestQueryParam('layout') ? Layout\Maestro::class : $app->stickyGet('layout')]);
 
 $layout = $app->layout;
 if ($layout instanceof Layout\NavigableInterface) {

diff --git a/demos/interactive/jssortable.php b/demos/interactive/jssortable.php
@@ -36,8 +36,8 @@
 
 $sortable = JsSortable::addTo($view, ['container' => 'ul', 'draggable' => 'li', 'dataLabel' => 'name']);
 
-$sortable->onReorder(static function (array $order, string $src, int $pos, int $oldPos) {
-    if ($_GET['btn'] ?? null) {
+$sortable->onReorder(static function (array $order, string $src, int $pos, int $oldPos) use ($app) {
+    if ($app->tryGetRequestQueryParam('btn')) {
         return new JsToast(implode(' - ', $order));
     }
 

diff --git a/demos/interactive/loader.php b/demos/interactive/loader.php
@@ -40,7 +40,7 @@
     $loader->set(static function (Loader $p) {
         // you may pass arguments to the loader, in this case it's "color"
         sleep(1);
-        $color = $_GET['color'];
+        $color = $p->getApp()->getRequestQueryParam('color');
         Header::addTo($p, ['Loader #1b - ' . $color]);
         LoremIpsum::addTo(View::addTo($p, ['ui' => $color . ' segment']), ['size' => 1]);
 

diff --git a/demos/interactive/loader2.php b/demos/interactive/loader2.php
@@ -30,6 +30,6 @@
 
 $countryLoader->set(static function (Loader $p) {
     Form::addTo($p)->setModel(
-        (new Country($p->getApp()->db))->load($_GET['id'])
+        (new Country($p->getApp()->db))->load($p->getApp()->getRequestQueryParam('id'))
     );
 });
diff --git a/demos/interactive/modal.php b/demos/interactive/modal.php
@@ -98,7 +98,7 @@
 // when $vp2Modal->jsShow() is activate, it will dynamically add this content to it
 $vp2Modal->set(static function (View $p) use ($vp3Modal) {
     ViewTester::addTo($p);
-    Message::addTo($p, [$_GET['color'] ?? 'No color'])->text->addParagraph('This text is loaded using a second modal.');
+    Message::addTo($p, [$p->getApp()->tryGetRequestQueryParam('color') ?? 'No color'])->text->addParagraph('This text is loaded using a second modal.');
     Button::addTo($p)->set('Third modal')
         ->on('click', $vp3Modal->jsShow());
 });
@@ -179,8 +179,8 @@
 $stepModal->set(static function (View $p) use ($session, $previousAction, $nextAction) {
     $page = $session->recall('page', 1);
     $success = $session->recall('success', false);
-    if (isset($_GET['move'])) {
-        $move = $_GET['move'];
+    if ($p->getApp()->hasRequestQueryParam('move')) {
+        $move = $p->getApp()->getRequestQueryParam('move');
         if ($move === 'next' && $success) {
             ++$page;
         } elseif ($move === 'previous' && $page > 1) {

diff --git a/demos/interactive/popup.php b/demos/interactive/popup.php
@@ -52,8 +52,8 @@ protected function init(): void
         $this->tRow->set('descr', 'click on link to remove item');
 
         // We link to ourselves with this special GET argument to indicate that item must be removed.
-        if (isset($_GET[$this->name . '_remove'])) {
-            $this->removeItem($_GET['id']);
+        if ($this->getApp()->hasRequestQueryParam($this->name . '_remove')) {
+            $this->removeItem($this->getApp()->getRequestQueryParam('id'));
 
             // redirect again, since we don't want this to stay in the URL
             $this->getApp()->redirect([$this->name . '_remove' => false]);
@@ -242,8 +242,8 @@ public function linkCart(View $cart, JsExpressionable $jsAction = null): void
 $signup->stickyGet('logged');
 $signup->set(static function (View $pop) {
     // content of the popup will be different depending on this condition.
-    if (isset($_GET['logged'])) {
-        Message::addTo($pop, ['You are already logged in as ' . $_GET['logged']]);
+    if ($pop->getApp()->hasRequestQueryParam('logged')) {
+        Message::addTo($pop, ['You are already logged in as ' . $pop->getApp()->getRequestQueryParam('logged')]);
         Button::addTo($pop, ['Logout', 'class.primary' => true, 'icon' => 'sign out'])
             ->link($pop->getApp()->url());
     } else {

diff --git a/demos/interactive/tabs.php b/demos/interactive/tabs.php
@@ -35,7 +35,7 @@
 // dynamic tab
 $tabs->addTab('Dynamic Lorem Ipsum', static function (VirtualPage $vp) {
     Message::addTo($vp, ['Every time you come to this tab, you will see a different text']);
-    LoremIpsum::addTo($vp, ['size' => (int) ($_GET['size'] ?? 1)]);
+    LoremIpsum::addTo($vp, ['size' => (int) ($vp->getApp()->tryGetRequestQueryParam('size') ?? 1)]);
 }, ['apiSettings' => ['data' => ['size' => random_int(1, 4)]]]);
 
 // modal tab

diff --git a/demos/interactive/virtual.php b/demos/interactive/virtual.php
@@ -24,8 +24,8 @@
 $virtualPage = VirtualPage::addTo($app->layout, ['urlTrigger' => 'in']);
 
 // add content to virtual page
-if (isset($_GET['p_id'])) {
-    Header::addTo($virtualPage, [$_GET['p_id']])->addClass('__atk-behat-test-car');
+if ($app->hasRequestQueryParam('p_id')) {
+    Header::addTo($virtualPage, [$app->getRequestQueryParam('p_id')])->addClass('__atk-behat-test-car');
 }
 LoremIpsum::addTo($virtualPage, ['size' => 1]);
 $virtualPageButton = Button::addTo($virtualPage, ['Back', 'icon' => 'left arrow']);
@@ -74,7 +74,7 @@
 
 Button::addTo($bar)->set('Simulate slow load')
     ->on('click', new JsModal('My Popup Title', $virtualPage->getJsUrl('cut') . '&slow=true'));
-if (isset($_GET['slow'])) {
+if ($app->hasRequestQueryParam('slow')) {
     sleep(1);
 }
 
@@ -89,7 +89,7 @@
 
 $frame = VirtualPage::addTo($app);
 $frame->set(static function (VirtualPage $p) {
-    Header::addTo($p, ['Clicked row with ID = ' . ($_GET['id'] ?? '')]);
+    Header::addTo($p, ['Clicked row with ID = ' . $p->getApp()->tryGetRequestQueryParam('id')]);
 });
 
 $table->onRowClick(new JsModal('Row Clicked', $frame, ['id' => $table->jsRow()->data('id')]));
diff --git a/demos/interactive/wizard.php b/demos/interactive/wizard.php
@@ -47,8 +47,8 @@
 // and set a custom JS action or even set a different link. You can use recall()
 // to access some values that were recorded on another steps.
 $wizard->addStep(['Select Model', 'description' => '"Country" or "Stat"', 'icon' => 'table'], static function (Wizard $wizard) {
-    if (isset($_GET['name'])) {
-        $wizard->memorize('model', $_GET['name']);
+    if ($wizard->getApp()->hasRequestQueryParam('name')) {
+        $wizard->memorize('model', $wizard->getApp()->getRequestQueryParam('name'));
         $wizard->getApp()->redirect($wizard->urlNext());
     }
 

diff --git a/demos/javascript/js.php b/demos/javascript/js.php
@@ -30,7 +30,7 @@
 Button::addTo($app, ['Redirect'])
     ->on('click', null, $app->jsRedirect(['foo' => 'bar']));
 
-if (isset($_GET['foo']) && $_GET['foo'] === 'bar') {
+if ($app->hasRequestQueryParam('foo') && $app->getRequestQueryParam('foo') === 'bar') {
     $app->redirect(['foo' => 'baz']);
 }
 

diff --git a/demos/javascript/reloading.php b/demos/javascript/reloading.php
@@ -50,7 +50,7 @@
 // reloading with argument
 Header::addTo($app, ['We can pass argument to reloader']);
 
-$v = View::addTo($app, ['ui' => 'segment'])->set($_GET['val'] ?? 'No value');
+$v = View::addTo($app, ['ui' => 'segment'])->set($app->tryGetRequestQueryParam('val') ?? 'No value');
 
 Button::addTo($app, ['Set value to "hello"'])
     ->on('click', new JsReload($v, ['val' => 'hello']));

diff --git a/demos/layout/layout-panel.php b/demos/layout/layout-panel.php
@@ -50,7 +50,7 @@
 
 $view = View::addTo($app, ['ui' => 'segment']);
 $text = Text::addTo($view);
-$text->set($_GET['txt'] ?? 'Not Complete');
+$text->set($app->tryGetRequestQueryParam('txt') ?? 'Not Complete');
 
 $panel1->onOpen(static function (Panel\Content $p) use ($view) {
     $panel = View::addTo($p, ['ui' => 'basic segment']);

diff --git a/demos/others/sticky2.php b/demos/others/sticky2.php
@@ -19,29 +19,29 @@
 
 // This demo shows a local impact of a sticky parameters
 
-if (isset($_GET['name'])) {
+if ($app->hasRequestQueryParam('name')) {
     // IMPORTANT: because this is an optional frame, I have to specify it's unique shortName explicitly, othrewise
     // the name for a second frame will be affected by presence of GET['name'] parameter
     $frame = View::addTo($app, ['ui' => 'red segment', 'shortName' => 'fr1']);
     $frame->stickyGet('name');
 
     // frame will generate URL with sticky parameter
-    Label::addTo($frame, ['Name:', 'detail' => $_GET['name'], 'class.black' => true])->link($frame->url());
+    Label::addTo($frame, ['Name:', 'detail' => $app->getRequestQueryParam('name'), 'class.black' => true])->link($frame->url());
 
     // app still generates URL without localized sticky
     Label::addTo($frame, ['Reset', 'iconRight' => 'close', 'class.black' => true])->link($app->url());
     View::addTo($frame, ['ui' => 'hidden divider']);
 
     // nested interactive elements will respect lockal sticky get
     Button::addTo($frame, ['Triggering callback here will inherit color'])
-        ->on('click', static function () {
-            return new JsToast('Color was = ' . $_GET['name']);
+        ->on('click', static function () use ($app) {
+            return new JsToast('Color was = ' . $app->getRequestQueryParam('name'));
         });
 
     // next we have loader, which will dynamically load console which will dynamically output "success" message
     Loader::addTo($frame)->set(static function (Loader $p) {
         Console::addTo($p)->set(static function (Console $console) {
-            $console->output('success!, color is still ' . $_GET['name']);
+            $console->output('success!, color is still ' . $console->getApp()->getRequestQueryParam('name'));
         });
     });
 }
@@ -53,7 +53,7 @@
 $frame = View::addTo($app, ['ui' => 'green segment']);
 Button::addTo($frame, ['does not inherit sticky get'])
     ->on('click', static function () use ($app) {
-        return new JsToast('$_GET = ' . $app->encodeJson($_GET));
+        return new JsToast('$_GET = ' . $app->encodeJson($app->getRequest()->getQueryParams()));
     });
 
 Header::addTo($app, ['Use of View::url()']);

diff --git a/demos/tutorial/intro.php b/demos/tutorial/intro.php
@@ -94,7 +94,7 @@
 
         View::addTo($seg, ['ui' => 'divider']);
 
-        $count = $_GET['count'] ?? 1;
+        $count = $seg->getApp()->tryGetRequestQueryParam('count') ?? 1;
         for ($i = 1; $i <= $count; ++$i) {
             Button::addTo($seg, [(string) $i]);
         }

diff --git a/docs/app.md b/docs/app.md
@@ -268,12 +268,12 @@ to provide a simple way to redirect for users who are not familiar with JavaScri
 so well. Example:
 
 ```
-if (!isset($_GET['age'])) {
+if (!$app->hasRequestQueryParam('age')) {
     $app->redirect(['age' => 18]);
 }
 
 Button::addTo($app, ['Increase age'])
-    ->on('click', $app->jsRedirect(['age' => $_GET['age'] + 1]));
+    ->on('click', $app->jsRedirect(['age' => $app->getRequestQueryParam('age') + 1]));
 ```
 
 No much magic in these methods.

diff --git a/docs/core.md b/docs/core.md
@@ -81,8 +81,8 @@ Agile UI implements advanced approach allowing any View object that you add into
 declare "sticky GET arguments". Here is example:
 
 ```
-if (isset($_GET['message'])) {
-    Message::addTo($app)->set($_GET['message']);
+if ($app->hasRequestQueryParam('message')) {
+    Message::addTo($app)->set($app->getRequestQueryParam('message'));
 }
 
 Button::addTo($app, ['Trigger message'])->link(['message' => 'Hello World']);
@@ -96,7 +96,7 @@ In Agile UI you can request that some $_GET arguments are preserved and included
 
 ```
 if ($this->getApp()->stickyGet('message')) {
-    Message::addTo($app)->set($_GET['message']);
+    Message::addTo($app)->set($app->getRequestQueryParam('message'));
 }
 
 Button::addTo($app, ['Trigger message'])->link(['message' => 'Hello World']);

diff --git a/docs/js.md b/docs/js.md
@@ -216,7 +216,7 @@ The following code is safe:
 
 ```
 $b = new Button();
-$b->js(true)->text($_GET['button_text']);
+$b->js(true)->text($app->getRequestQueryParam('button_text'));
 ```
 
 Any malicious input through the GET arguments will be encoded as JS string before being included as an

diff --git a/docs/quickstart.md b/docs/quickstart.md
@@ -256,8 +256,8 @@ $grid->menu->addItem('Complete Selected',
     ])
 );
 
-if (isset($_GET['delete'])) {
-    foreach (explode(',', $_GET['delete']) as $id) {
+if ($app->hasRequestQueryParam('delete')) {
+    foreach (explode(',', $app->getRequestQueryParam('delete')) as $id) {
         $grid->model->delete($id);
     }
 }

diff --git a/docs/render.md b/docs/render.md
@@ -133,11 +133,11 @@ class MyView extends View
     {
         parent::init();
 
-        if ($_GET[$this->name]) {
+        if ($this->getApp()->getRequestQueryParam($this->name)) {
             \Atk4\Ui\Label::addTo($this, [
                 'Secret info is',
                 'class.big red' => true,
-                'detail' => $_GET[$this->name],
+                'detail' => $this->getApp()->getRequestQueryParam($this->name),
             ]);
         }
 

diff --git a/docs/rightpanel.md b/docs/rightpanel.md
@@ -50,7 +50,7 @@ $button->js(true)->data('btn', '1');
 $button->on('click', $panel->jsOpen(['btn'], 'orange'));
 
 $panel->onOpen(function (Panel\Content $p) {
-    $buttonNumber = $_GET['btn'] ?? null;
+    $buttonNumber = $p->getApp()->tryGetRequestQueryParam('btn');
     $text = 'You loaded panel content using button #' . $buttonNumber;
     Message::addTo($p, ['Panel 1', 'text' => $text]);
 });