diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 88f01a870e..0d3b32c7f1 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -1709,7 +1709,6 @@
Config::getInstance()
-
@@ -1756,7 +1755,6 @@
-
@@ -2012,7 +2010,6 @@
$importPlugin == null
-
@@ -2069,7 +2066,6 @@
-
@@ -3196,7 +3192,6 @@
-
@@ -3206,7 +3201,6 @@
-
@@ -3276,11 +3270,9 @@
-
-
$rowsToDelete
@@ -3365,7 +3357,6 @@
-
@@ -3376,7 +3367,6 @@
$row
-
@@ -3438,12 +3428,10 @@
-
-
@@ -3679,7 +3667,6 @@
$insertErrors
-
@@ -3729,7 +3716,6 @@
$mimeMap[$columnName]
-
diff --git a/src/Controllers/Export/ExportController.php b/src/Controllers/Export/ExportController.php
index c7dea8ce7f..154471e6b1 100644
--- a/src/Controllers/Export/ExportController.php
+++ b/src/Controllers/Export/ExportController.php
@@ -61,7 +61,6 @@ final class ExportController extends AbstractController
$GLOBALS['table_select'] ??= null;
$GLOBALS['time_start'] ??= null;
$GLOBALS['charset'] ??= null;
- $GLOBALS['active_page'] ??= null;
$GLOBALS['table_data'] ??= null;
/** @var array $postParams */
@@ -300,7 +299,6 @@ final class ExportController extends AbstractController
$GLOBALS['message'] = Message::error(
__('No tables found in database.'),
);
- $GLOBALS['active_page'] = Url::getFromRoute('/database/export');
/** @var DatabaseExportController $controller */
$controller = ContainerBuilder::getContainer()->get(DatabaseExportController::class);
$controller($request);
diff --git a/src/Controllers/Import/ImportController.php b/src/Controllers/Import/ImportController.php
index 0f7b464f71..8aedfa27a8 100644
--- a/src/Controllers/Import/ImportController.php
+++ b/src/Controllers/Import/ImportController.php
@@ -94,7 +94,6 @@ final class ImportController extends AbstractController
$GLOBALS['import_file_name'] ??= null;
$GLOBALS['import_notice'] ??= null;
$GLOBALS['read_multiply'] ??= null;
- $GLOBALS['active_page'] ??= null;
$GLOBALS['charset_of_file'] = $request->getParsedBodyParam('charset_of_file');
$GLOBALS['format'] = $request->getParsedBodyParam('format', '');
@@ -773,7 +772,6 @@ final class ImportController extends AbstractController
$this->response->setRequestStatus(false);
$this->response->addJSON('message', Message::error($GLOBALS['msg']));
} else {
- $GLOBALS['active_page'] = $GLOBALS['goto'];
/** @psalm-suppress UnresolvableInclude */
include ROOT_PATH . $GLOBALS['goto'];
}
diff --git a/src/Controllers/Table/AddFieldController.php b/src/Controllers/Table/AddFieldController.php
index 251429c7f8..98a20194c6 100644
--- a/src/Controllers/Table/AddFieldController.php
+++ b/src/Controllers/Table/AddFieldController.php
@@ -50,7 +50,6 @@ class AddFieldController extends AbstractController
{
$GLOBALS['errorUrl'] ??= null;
$GLOBALS['message'] ??= null;
- $GLOBALS['active_page'] ??= null;
/** @var string|null $numberOfFields */
$numberOfFields = $request->getParsedBodyParam('num_fields');
@@ -183,8 +182,6 @@ class AddFieldController extends AbstractController
return;
}
- $GLOBALS['active_page'] = Url::getFromRoute('/table/structure');
-
$this->addScriptFiles(['vendor/jquery/jquery.uitablefilter.js']);
if (! $this->checkParameters(['server', 'db', 'table'])) {
diff --git a/src/Controllers/Table/ChangeRowsController.php b/src/Controllers/Table/ChangeRowsController.php
index 93804cbd41..19bc922a48 100644
--- a/src/Controllers/Table/ChangeRowsController.php
+++ b/src/Controllers/Table/ChangeRowsController.php
@@ -8,7 +8,6 @@ use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
-use PhpMyAdmin\Url;
use function __;
use function array_values;
@@ -26,7 +25,6 @@ final class ChangeRowsController extends AbstractController
public function __invoke(ServerRequest $request): void
{
- $GLOBALS['active_page'] ??= null;
$GLOBALS['where_clause'] ??= null;
$rowsToDelete = $request->getParsedBodyParam('rows_to_delete');
@@ -50,8 +48,6 @@ final class ChangeRowsController extends AbstractController
$GLOBALS['where_clause'] = array_values($rowsToDelete);
}
- $GLOBALS['active_page'] = Url::getFromRoute('/table/change');
-
($this->changeController)($request);
}
}
diff --git a/src/Controllers/Table/DeleteRowsController.php b/src/Controllers/Table/DeleteRowsController.php
index 020583aa73..a0104d206a 100644
--- a/src/Controllers/Table/DeleteRowsController.php
+++ b/src/Controllers/Table/DeleteRowsController.php
@@ -16,7 +16,6 @@ use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Sql;
use PhpMyAdmin\Template;
use PhpMyAdmin\Transformations;
-use PhpMyAdmin\Url;
use PhpMyAdmin\Util;
use PhpMyAdmin\Utils\ForeignKey;
@@ -38,7 +37,6 @@ final class DeleteRowsController extends AbstractController
$GLOBALS['goto'] ??= null;
$GLOBALS['disp_message'] ??= null;
$GLOBALS['disp_query'] ??= null;
- $GLOBALS['active_page'] ??= null;
$multBtn = $_POST['mult_btn'] ?? '';
$selected = $_POST['selected'] ?? [];
@@ -83,8 +81,6 @@ final class DeleteRowsController extends AbstractController
$GLOBALS['sql_query'] = $request->getParsedBodyParam('original_sql_query', '');
}
- $GLOBALS['active_page'] = Url::getFromRoute('/sql');
-
$this->response->addHTML($sql->executeQueryAndSendQueryResponse(
null,
false,
diff --git a/src/Controllers/Table/ExportRowsController.php b/src/Controllers/Table/ExportRowsController.php
index dbffa5c30e..32a11a8af2 100644
--- a/src/Controllers/Table/ExportRowsController.php
+++ b/src/Controllers/Table/ExportRowsController.php
@@ -8,7 +8,6 @@ use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
-use PhpMyAdmin\Url;
use function __;
use function array_values;
@@ -26,7 +25,6 @@ final class ExportRowsController extends AbstractController
public function __invoke(ServerRequest $request): void
{
- $GLOBALS['active_page'] ??= null;
$GLOBALS['single_table'] ??= null;
$GLOBALS['where_clause'] ??= null;
@@ -49,8 +47,6 @@ final class ExportRowsController extends AbstractController
$GLOBALS['where_clause'] = array_values($_POST['rows_to_delete']);
}
- $GLOBALS['active_page'] = Url::getFromRoute('/table/export');
-
($this->exportController)($request);
}
}
diff --git a/src/Controllers/Table/ReplaceController.php b/src/Controllers/Table/ReplaceController.php
index eb6a746c86..94d882c6d8 100644
--- a/src/Controllers/Table/ReplaceController.php
+++ b/src/Controllers/Table/ReplaceController.php
@@ -68,7 +68,6 @@ final class ReplaceController extends AbstractController
$GLOBALS['errorUrl'] ??= null;
$GLOBALS['unsaved_values'] ??= null;
- $GLOBALS['active_page'] ??= null;
$GLOBALS['disp_query'] ??= null;
$GLOBALS['disp_message'] ??= null;
$GLOBALS['query'] ??= null;
@@ -478,7 +477,6 @@ final class ReplaceController extends AbstractController
private function moveBackToCallingScript(string $gotoInclude, ServerRequest $request): void
{
- $GLOBALS['active_page'] = $gotoInclude;
if ($gotoInclude === '/sql') {
($this->sqlController)($request);
diff --git a/src/Controllers/Table/Structure/BrowseController.php b/src/Controllers/Table/Structure/BrowseController.php
index 2f64aa37cb..65e9d111fc 100644
--- a/src/Controllers/Table/Structure/BrowseController.php
+++ b/src/Controllers/Table/Structure/BrowseController.php
@@ -11,7 +11,6 @@ use PhpMyAdmin\ParseAnalyze;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Sql;
use PhpMyAdmin\Template;
-use PhpMyAdmin\Url;
use PhpMyAdmin\Util;
use function __;
@@ -44,7 +43,6 @@ final class BrowseController extends AbstractController
*/
private function displayTableBrowseForSelectedColumns(string $goto): void
{
- $GLOBALS['active_page'] = Url::getFromRoute('/sql');
$fields = [];
foreach ($_POST['selected_fld'] as $sval) {
$fields[] = Util::backquote($sval);
diff --git a/tests/classes/Controllers/Table/ChangeRowsControllerTest.php b/tests/classes/Controllers/Table/ChangeRowsControllerTest.php
index 865566f625..2a10abad7e 100644
--- a/tests/classes/Controllers/Table/ChangeRowsControllerTest.php
+++ b/tests/classes/Controllers/Table/ChangeRowsControllerTest.php
@@ -23,7 +23,6 @@ class ChangeRowsControllerTest extends AbstractTestCase
DatabaseInterface::$instance = $this->createDatabaseInterface();
Current::$server = 2;
- $GLOBALS['active_page'] = null;
$GLOBALS['where_clause'] = null;
$_POST = [];
}
@@ -38,8 +37,6 @@ class ChangeRowsControllerTest extends AbstractTestCase
(new ChangeRowsController(new ResponseRenderer(), new Template(), $mock))($request);
- /** @psalm-suppress InvalidArrayOffset */
- $this->assertSame('index.php?route=/table/change&server=2&lang=en', $GLOBALS['active_page']);
/** @psalm-suppress InvalidArrayOffset */
$this->assertSame([], $GLOBALS['where_clause']);
}
@@ -58,8 +55,6 @@ class ChangeRowsControllerTest extends AbstractTestCase
$this->assertSame(['message' => 'No row selected.'], $response->getJSONResult());
$this->assertFalse($response->hasSuccessState());
/** @psalm-suppress InvalidArrayOffset */
- $this->assertNull($GLOBALS['active_page']);
- /** @psalm-suppress InvalidArrayOffset */
$this->assertNull($GLOBALS['where_clause']);
}
@@ -73,8 +68,6 @@ class ChangeRowsControllerTest extends AbstractTestCase
(new ChangeRowsController(new ResponseRenderer(), new Template(), $mock))($request);
- /** @psalm-suppress InvalidArrayOffset */
- $this->assertSame('index.php?route=/table/change&server=2&lang=en', $GLOBALS['active_page']);
/** @psalm-suppress InvalidArrayOffset */
$this->assertSame(['row1', 'row2'], $GLOBALS['where_clause']);
}
diff --git a/tests/classes/Controllers/Table/ExportRowsControllerTest.php b/tests/classes/Controllers/Table/ExportRowsControllerTest.php
index f005ed41f5..fd7e6e84ba 100644
--- a/tests/classes/Controllers/Table/ExportRowsControllerTest.php
+++ b/tests/classes/Controllers/Table/ExportRowsControllerTest.php
@@ -23,7 +23,6 @@ class ExportRowsControllerTest extends AbstractTestCase
DatabaseInterface::$instance = $this->createDatabaseInterface();
Current::$server = 2;
- $GLOBALS['active_page'] = null;
$GLOBALS['single_table'] = null;
$GLOBALS['where_clause'] = null;
$_POST = [];
@@ -42,8 +41,6 @@ class ExportRowsControllerTest extends AbstractTestCase
$controller,
))($this->createStub(ServerRequest::class));
- /** @psalm-suppress InvalidArrayOffset */
- $this->assertSame('index.php?route=/table/export&server=2&lang=en', $GLOBALS['active_page']);
/** @psalm-suppress InvalidArrayOffset */
$this->assertTrue($GLOBALS['single_table']);
/** @psalm-suppress InvalidArrayOffset */
@@ -67,8 +64,6 @@ class ExportRowsControllerTest extends AbstractTestCase
$this->assertSame(['message' => 'No row selected.'], $response->getJSONResult());
$this->assertFalse($response->hasSuccessState());
/** @psalm-suppress InvalidArrayOffset */
- $this->assertNull($GLOBALS['active_page']);
- /** @psalm-suppress InvalidArrayOffset */
$this->assertNull($GLOBALS['single_table']);
/** @psalm-suppress InvalidArrayOffset */
$this->assertNull($GLOBALS['where_clause']);
@@ -88,8 +83,6 @@ class ExportRowsControllerTest extends AbstractTestCase
$controller,
))($this->createStub(ServerRequest::class));
- /** @psalm-suppress InvalidArrayOffset */
- $this->assertSame('index.php?route=/table/export&server=2&lang=en', $GLOBALS['active_page']);
/** @psalm-suppress InvalidArrayOffset */
$this->assertTrue($GLOBALS['single_table']);
/** @psalm-suppress InvalidArrayOffset */