diff options
author | Maurício Meneghini Fauth <mauricio@fauth.dev> | 2022-07-28 07:00:08 +0300 |
---|---|---|
committer | Maurício Meneghini Fauth <mauricio@fauth.dev> | 2022-07-28 07:00:08 +0300 |
commit | 3c618c22a9a717212742dd9a6d01d5277f3ba5b1 (patch) | |
tree | 6cd45de79354d23f78f29f40f3a794193ed6d671 /libraries | |
parent | b0c4426a43e82decacf60cbd14f8b318482add69 (diff) |
Add ServerRequest parameter to all controllers
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
Diffstat (limited to 'libraries')
124 files changed, 268 insertions, 144 deletions
diff --git a/libraries/classes/Controllers/ChangeLogController.php b/libraries/classes/Controllers/ChangeLogController.php index c37ed3e334..b1b96813df 100644 --- a/libraries/classes/Controllers/ChangeLogController.php +++ b/libraries/classes/Controllers/ChangeLogController.php @@ -7,6 +7,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers; +use PhpMyAdmin\Http\ServerRequest; + use function __; use function array_keys; use function file_get_contents; @@ -21,7 +23,7 @@ use function substr; class ChangeLogController extends AbstractController { - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $this->response->disable(); $this->response->getHeader()->sendHttpHeaders(); diff --git a/libraries/classes/Controllers/CollationConnectionController.php b/libraries/classes/Controllers/CollationConnectionController.php index e11fe462bd..a61c7b98f8 100644 --- a/libraries/classes/Controllers/CollationConnectionController.php +++ b/libraries/classes/Controllers/CollationConnectionController.php @@ -5,6 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers; use PhpMyAdmin\Config; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; use PhpMyAdmin\Url; @@ -20,7 +21,7 @@ final class CollationConnectionController extends AbstractController $this->config = $config; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $this->config->setUserValue( null, diff --git a/libraries/classes/Controllers/Database/CentralColumns/PopulateColumnsController.php b/libraries/classes/Controllers/Database/CentralColumns/PopulateColumnsController.php index 82ba9142a0..8bec9c24e5 100644 --- a/libraries/classes/Controllers/Database/CentralColumns/PopulateColumnsController.php +++ b/libraries/classes/Controllers/Database/CentralColumns/PopulateColumnsController.php @@ -6,6 +6,7 @@ namespace PhpMyAdmin\Controllers\Database\CentralColumns; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\Database\CentralColumns; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; @@ -23,7 +24,7 @@ final class PopulateColumnsController extends AbstractController $this->centralColumns = $centralColumns; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $columns = $this->centralColumns->getColumnsNotInCentralList($GLOBALS['db'], $_POST['selectedTable']); $this->render('database/central_columns/populate_columns', ['columns' => $columns]); diff --git a/libraries/classes/Controllers/Database/CentralColumnsController.php b/libraries/classes/Controllers/Database/CentralColumnsController.php index 166e0312cf..189714be32 100644 --- a/libraries/classes/Controllers/Database/CentralColumnsController.php +++ b/libraries/classes/Controllers/Database/CentralColumnsController.php @@ -9,6 +9,7 @@ namespace PhpMyAdmin\Controllers\Database; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\Database\CentralColumns; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; @@ -33,7 +34,7 @@ class CentralColumnsController extends AbstractController $this->centralColumns = $centralColumns; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['message'] = $GLOBALS['message'] ?? null; $GLOBALS['pos'] = $GLOBALS['pos'] ?? null; diff --git a/libraries/classes/Controllers/Database/DataDictionaryController.php b/libraries/classes/Controllers/Database/DataDictionaryController.php index aaf7cd4cde..58de43960a 100644 --- a/libraries/classes/Controllers/Database/DataDictionaryController.php +++ b/libraries/classes/Controllers/Database/DataDictionaryController.php @@ -7,6 +7,7 @@ namespace PhpMyAdmin\Controllers\Database; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Index; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; @@ -40,7 +41,7 @@ class DataDictionaryController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $this->checkParameters(['db'], true); diff --git a/libraries/classes/Controllers/Database/DesignerController.php b/libraries/classes/Controllers/Database/DesignerController.php index 196a7fb482..cd72be8c5d 100644 --- a/libraries/classes/Controllers/Database/DesignerController.php +++ b/libraries/classes/Controllers/Database/DesignerController.php @@ -7,6 +7,7 @@ namespace PhpMyAdmin\Controllers\Database; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\Database\Designer; use PhpMyAdmin\Database\Designer\Common as DesignerCommon; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; use PhpMyAdmin\Url; @@ -36,7 +37,7 @@ class DesignerController extends AbstractController $this->designerCommon = $designerCommon; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['script_display_field'] = $GLOBALS['script_display_field'] ?? null; $GLOBALS['tab_column'] = $GLOBALS['tab_column'] ?? null; diff --git a/libraries/classes/Controllers/Database/EventsController.php b/libraries/classes/Controllers/Database/EventsController.php index 8d00302f17..a72b034a46 100644 --- a/libraries/classes/Controllers/Database/EventsController.php +++ b/libraries/classes/Controllers/Database/EventsController.php @@ -7,6 +7,7 @@ namespace PhpMyAdmin\Controllers\Database; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\Database\Events; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; use PhpMyAdmin\Url; @@ -33,7 +34,7 @@ final class EventsController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['tables'] = $GLOBALS['tables'] ?? null; $GLOBALS['num_tables'] = $GLOBALS['num_tables'] ?? null; diff --git a/libraries/classes/Controllers/Database/ExportController.php b/libraries/classes/Controllers/Database/ExportController.php index b7b9dac817..76444c327a 100644 --- a/libraries/classes/Controllers/Database/ExportController.php +++ b/libraries/classes/Controllers/Database/ExportController.php @@ -8,6 +8,7 @@ use PhpMyAdmin\Config\PageSettings; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\Export; use PhpMyAdmin\Export\Options; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\Plugins; use PhpMyAdmin\ResponseRenderer; @@ -38,7 +39,7 @@ final class ExportController extends AbstractController $this->exportOptions = $exportOptions; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['sub_part'] = $GLOBALS['sub_part'] ?? null; $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; diff --git a/libraries/classes/Controllers/Database/ImportController.php b/libraries/classes/Controllers/Database/ImportController.php index 605ddb593a..2755939d3c 100644 --- a/libraries/classes/Controllers/Database/ImportController.php +++ b/libraries/classes/Controllers/Database/ImportController.php @@ -9,6 +9,7 @@ use PhpMyAdmin\Config\PageSettings; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Encoding; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Import; use PhpMyAdmin\Import\Ajax; use PhpMyAdmin\Message; @@ -34,7 +35,7 @@ final class ImportController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['tables'] = $GLOBALS['tables'] ?? null; $GLOBALS['num_tables'] = $GLOBALS['num_tables'] ?? null; diff --git a/libraries/classes/Controllers/Database/MultiTableQuery/QueryController.php b/libraries/classes/Controllers/Database/MultiTableQuery/QueryController.php index 45c311a33e..aa76eee435 100644 --- a/libraries/classes/Controllers/Database/MultiTableQuery/QueryController.php +++ b/libraries/classes/Controllers/Database/MultiTableQuery/QueryController.php @@ -6,10 +6,11 @@ namespace PhpMyAdmin\Controllers\Database\MultiTableQuery; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\Database\MultiTableQuery; +use PhpMyAdmin\Http\ServerRequest; final class QueryController extends AbstractController { - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $params = [ 'sql_query' => $_POST['sql_query'], diff --git a/libraries/classes/Controllers/Database/MultiTableQuery/TablesController.php b/libraries/classes/Controllers/Database/MultiTableQuery/TablesController.php index ff46491517..c4725b94bd 100644 --- a/libraries/classes/Controllers/Database/MultiTableQuery/TablesController.php +++ b/libraries/classes/Controllers/Database/MultiTableQuery/TablesController.php @@ -6,6 +6,7 @@ namespace PhpMyAdmin\Controllers\Database\MultiTableQuery; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Query\Generator as QueryGenerator; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; @@ -23,7 +24,7 @@ final class TablesController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $params = [ 'tables' => $_GET['tables'] ?? [], diff --git a/libraries/classes/Controllers/Database/MultiTableQueryController.php b/libraries/classes/Controllers/Database/MultiTableQueryController.php index a0fab2f292..9e269cf944 100644 --- a/libraries/classes/Controllers/Database/MultiTableQueryController.php +++ b/libraries/classes/Controllers/Database/MultiTableQueryController.php @@ -7,6 +7,7 @@ namespace PhpMyAdmin\Controllers\Database; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\Database\MultiTableQuery; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; @@ -24,7 +25,7 @@ class MultiTableQueryController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $this->addScriptFiles([ 'database/multi_table_query.js', diff --git a/libraries/classes/Controllers/Database/Operations/CollationController.php b/libraries/classes/Controllers/Database/Operations/CollationController.php index 422241be66..9e97ccb38f 100644 --- a/libraries/classes/Controllers/Database/Operations/CollationController.php +++ b/libraries/classes/Controllers/Database/Operations/CollationController.php @@ -6,6 +6,7 @@ namespace PhpMyAdmin\Controllers\Database\Operations; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\Operations; use PhpMyAdmin\ResponseRenderer; @@ -34,7 +35,7 @@ final class CollationController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; diff --git a/libraries/classes/Controllers/Database/OperationsController.php b/libraries/classes/Controllers/Database/OperationsController.php index b3e64cdde7..93ed7f380f 100644 --- a/libraries/classes/Controllers/Database/OperationsController.php +++ b/libraries/classes/Controllers/Database/OperationsController.php @@ -11,6 +11,7 @@ use PhpMyAdmin\ConfigStorage\RelationCleanup; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Html\Generator; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\Operations; use PhpMyAdmin\Plugins; @@ -62,7 +63,7 @@ class OperationsController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['server'] = $GLOBALS['server'] ?? null; $GLOBALS['move'] = $GLOBALS['move'] ?? null; diff --git a/libraries/classes/Controllers/Database/PrivilegesController.php b/libraries/classes/Controllers/Database/PrivilegesController.php index bc2f3ab4b4..ae0ff11d0a 100644 --- a/libraries/classes/Controllers/Database/PrivilegesController.php +++ b/libraries/classes/Controllers/Database/PrivilegesController.php @@ -10,6 +10,7 @@ namespace PhpMyAdmin\Controllers\Database; use PhpMyAdmin\CheckUserPrivileges; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Server\Privileges; @@ -43,7 +44,7 @@ class PrivilegesController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['text_dir'] = $GLOBALS['text_dir'] ?? null; diff --git a/libraries/classes/Controllers/Database/QueryByExampleController.php b/libraries/classes/Controllers/Database/QueryByExampleController.php index a0833bf4f5..3cb8996788 100644 --- a/libraries/classes/Controllers/Database/QueryByExampleController.php +++ b/libraries/classes/Controllers/Database/QueryByExampleController.php @@ -9,6 +9,7 @@ use PhpMyAdmin\ConfigStorage\RelationCleanup; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\Database\Qbe; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Operations; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\SavedSearches; @@ -39,7 +40,7 @@ class QueryByExampleController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['savedSearchList'] = $GLOBALS['savedSearchList'] ?? null; $GLOBALS['savedSearch'] = $GLOBALS['savedSearch'] ?? null; diff --git a/libraries/classes/Controllers/Database/RoutinesController.php b/libraries/classes/Controllers/Database/RoutinesController.php index 8c0e4ed2a3..b75b6ace84 100644 --- a/libraries/classes/Controllers/Database/RoutinesController.php +++ b/libraries/classes/Controllers/Database/RoutinesController.php @@ -9,6 +9,7 @@ use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\Database\Routines; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\DbTableExists; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; use PhpMyAdmin\Url; @@ -39,7 +40,7 @@ class RoutinesController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['tables'] = $GLOBALS['tables'] ?? null; $GLOBALS['num_tables'] = $GLOBALS['num_tables'] ?? null; diff --git a/libraries/classes/Controllers/Database/SearchController.php b/libraries/classes/Controllers/Database/SearchController.php index 329437d405..112f98dc73 100644 --- a/libraries/classes/Controllers/Database/SearchController.php +++ b/libraries/classes/Controllers/Database/SearchController.php @@ -8,6 +8,7 @@ use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\Database\Search; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Html\Generator; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; use PhpMyAdmin\Url; @@ -26,7 +27,7 @@ class SearchController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; diff --git a/libraries/classes/Controllers/Database/SqlAutoCompleteController.php b/libraries/classes/Controllers/Database/SqlAutoCompleteController.php index f7fab89a75..1d20f2b4c7 100644 --- a/libraries/classes/Controllers/Database/SqlAutoCompleteController.php +++ b/libraries/classes/Controllers/Database/SqlAutoCompleteController.php @@ -6,6 +6,7 @@ namespace PhpMyAdmin\Controllers\Database; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; @@ -25,7 +26,7 @@ class SqlAutoCompleteController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['sql_autocomplete'] = true; if ($GLOBALS['cfg']['EnableAutocompleteForTablesAndColumns']) { diff --git a/libraries/classes/Controllers/Database/SqlController.php b/libraries/classes/Controllers/Database/SqlController.php index 70965dbb88..43f28085ed 100644 --- a/libraries/classes/Controllers/Database/SqlController.php +++ b/libraries/classes/Controllers/Database/SqlController.php @@ -6,6 +6,7 @@ namespace PhpMyAdmin\Controllers\Database; use PhpMyAdmin\Config\PageSettings; use PhpMyAdmin\Controllers\AbstractController; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\SqlQueryForm; use PhpMyAdmin\Template; @@ -28,7 +29,7 @@ class SqlController extends AbstractController $this->sqlQueryForm = $sqlQueryForm; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['goto'] = $GLOBALS['goto'] ?? null; $GLOBALS['back'] = $GLOBALS['back'] ?? null; diff --git a/libraries/classes/Controllers/Database/SqlFormatController.php b/libraries/classes/Controllers/Database/SqlFormatController.php index bce4072ad1..e468687e68 100644 --- a/libraries/classes/Controllers/Database/SqlFormatController.php +++ b/libraries/classes/Controllers/Database/SqlFormatController.php @@ -5,6 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Database; use PhpMyAdmin\Controllers\AbstractController; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\SqlParser\Utils\Formatter; use function strlen; @@ -14,7 +15,7 @@ use function strlen; */ class SqlFormatController extends AbstractController { - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $params = ['sql' => $_POST['sql'] ?? null]; $query = strlen((string) $params['sql']) > 0 ? $params['sql'] : ''; diff --git a/libraries/classes/Controllers/Database/Structure/AddPrefixController.php b/libraries/classes/Controllers/Database/Structure/AddPrefixController.php index d46765faaf..4f10de7532 100644 --- a/libraries/classes/Controllers/Database/Structure/AddPrefixController.php +++ b/libraries/classes/Controllers/Database/Structure/AddPrefixController.php @@ -5,12 +5,13 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Database\Structure; use PhpMyAdmin\Controllers\AbstractController; +use PhpMyAdmin\Http\ServerRequest; use function __; final class AddPrefixController extends AbstractController { - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $selected = $_POST['selected_tbl'] ?? []; diff --git a/libraries/classes/Controllers/Database/Structure/AddPrefixTableController.php b/libraries/classes/Controllers/Database/Structure/AddPrefixTableController.php index b893e9c62a..1a4136ee18 100644 --- a/libraries/classes/Controllers/Database/Structure/AddPrefixTableController.php +++ b/libraries/classes/Controllers/Database/Structure/AddPrefixTableController.php @@ -7,6 +7,7 @@ namespace PhpMyAdmin\Controllers\Database\Structure; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\Controllers\Database\StructureController; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; @@ -33,7 +34,7 @@ final class AddPrefixTableController extends AbstractController $this->structureController = $structureController; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['message'] = $GLOBALS['message'] ?? null; @@ -58,6 +59,6 @@ final class AddPrefixTableController extends AbstractController $_POST['message'] = $GLOBALS['message']; } - ($this->structureController)(); + ($this->structureController)($request); } } diff --git a/libraries/classes/Controllers/Database/Structure/CentralColumns/AddController.php b/libraries/classes/Controllers/Database/Structure/CentralColumns/AddController.php index b1c925463f..6437943513 100644 --- a/libraries/classes/Controllers/Database/Structure/CentralColumns/AddController.php +++ b/libraries/classes/Controllers/Database/Structure/CentralColumns/AddController.php @@ -8,6 +8,7 @@ use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\Controllers\Database\StructureController; use PhpMyAdmin\Database\CentralColumns; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; @@ -33,7 +34,7 @@ final class AddController extends AbstractController $this->structureController = $structureController; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['message'] = $GLOBALS['message'] ?? null; @@ -53,6 +54,6 @@ final class AddController extends AbstractController unset($_POST['submit_mult']); - ($this->structureController)(); + ($this->structureController)($request); } } diff --git a/libraries/classes/Controllers/Database/Structure/CentralColumns/MakeConsistentController.php b/libraries/classes/Controllers/Database/Structure/CentralColumns/MakeConsistentController.php index 92c5181cff..253ba17036 100644 --- a/libraries/classes/Controllers/Database/Structure/CentralColumns/MakeConsistentController.php +++ b/libraries/classes/Controllers/Database/Structure/CentralColumns/MakeConsistentController.php @@ -8,6 +8,7 @@ use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\Controllers\Database\StructureController; use PhpMyAdmin\Database\CentralColumns; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; @@ -33,7 +34,7 @@ final class MakeConsistentController extends AbstractController $this->structureController = $structureController; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['message'] = $GLOBALS['message'] ?? null; @@ -53,6 +54,6 @@ final class MakeConsistentController extends AbstractController unset($_POST['submit_mult']); - ($this->structureController)(); + ($this->structureController)($request); } } diff --git a/libraries/classes/Controllers/Database/Structure/CentralColumns/RemoveController.php b/libraries/classes/Controllers/Database/Structure/CentralColumns/RemoveController.php index fa2bc28ab0..e313dc970d 100644 --- a/libraries/classes/Controllers/Database/Structure/CentralColumns/RemoveController.php +++ b/libraries/classes/Controllers/Database/Structure/CentralColumns/RemoveController.php @@ -8,6 +8,7 @@ use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\Controllers\Database\StructureController; use PhpMyAdmin\Database\CentralColumns; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; @@ -33,7 +34,7 @@ final class RemoveController extends AbstractController $this->structureController = $structureController; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['message'] = $GLOBALS['message'] ?? null; @@ -53,6 +54,6 @@ final class RemoveController extends AbstractController unset($_POST['submit_mult']); - ($this->structureController)(); + ($this->structureController)($request); } } diff --git a/libraries/classes/Controllers/Database/Structure/ChangePrefixFormController.php b/libraries/classes/Controllers/Database/Structure/ChangePrefixFormController.php index 4ea01e9171..d25253b868 100644 --- a/libraries/classes/Controllers/Database/Structure/ChangePrefixFormController.php +++ b/libraries/classes/Controllers/Database/Structure/ChangePrefixFormController.php @@ -5,12 +5,13 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Database\Structure; use PhpMyAdmin\Controllers\AbstractController; +use PhpMyAdmin\Http\ServerRequest; use function __; final class ChangePrefixFormController extends AbstractController { - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $selected = $_POST['selected_tbl'] ?? []; $submitMult = $_POST['submit_mult'] ?? ''; diff --git a/libraries/classes/Controllers/Database/Structure/CopyFormController.php b/libraries/classes/Controllers/Database/Structure/CopyFormController.php index d1c802f21a..a85421f77d 100644 --- a/libraries/classes/Controllers/Database/Structure/CopyFormController.php +++ b/libraries/classes/Controllers/Database/Structure/CopyFormController.php @@ -5,12 +5,13 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Database\Structure; use PhpMyAdmin\Controllers\AbstractController; +use PhpMyAdmin\Http\ServerRequest; use function __; final class CopyFormController extends AbstractController { - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['dblist'] = $GLOBALS['dblist'] ?? null; diff --git a/libraries/classes/Controllers/Database/Structure/CopyTableController.php b/libraries/classes/Controllers/Database/Structure/CopyTableController.php index f67e0c7cf3..6844c70305 100644 --- a/libraries/classes/Controllers/Database/Structure/CopyTableController.php +++ b/libraries/classes/Controllers/Database/Structure/CopyTableController.php @@ -6,6 +6,7 @@ namespace PhpMyAdmin\Controllers\Database\Structure; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\Controllers\Database\StructureController; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\Operations; use PhpMyAdmin\ResponseRenderer; @@ -33,7 +34,7 @@ final class CopyTableController extends AbstractController $this->structureController = $structureController; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['message'] = $GLOBALS['message'] ?? null; @@ -66,6 +67,6 @@ final class CopyTableController extends AbstractController $_POST['message'] = $GLOBALS['message']; } - ($this->structureController)(); + ($this->structureController)($request); } } diff --git a/libraries/classes/Controllers/Database/Structure/CopyTableWithPrefixController.php b/libraries/classes/Controllers/Database/Structure/CopyTableWithPrefixController.php index 50b9fbcc21..e34e74b944 100644 --- a/libraries/classes/Controllers/Database/Structure/CopyTableWithPrefixController.php +++ b/libraries/classes/Controllers/Database/Structure/CopyTableWithPrefixController.php @@ -6,6 +6,7 @@ namespace PhpMyAdmin\Controllers\Database\Structure; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\Controllers\Database\StructureController; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Table; @@ -29,7 +30,7 @@ final class CopyTableWithPrefixController extends AbstractController $this->structureController = $structureController; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['message'] = $GLOBALS['message'] ?? null; @@ -61,6 +62,6 @@ final class CopyTableWithPrefixController extends AbstractController $_POST['message'] = $GLOBALS['message']; } - ($this->structureController)(); + ($this->structureController)($request); } } diff --git a/libraries/classes/Controllers/Database/Structure/DropFormController.php b/libraries/classes/Controllers/Database/Structure/DropFormController.php index 1cd46ee229..16fcc7171f 100644 --- a/libraries/classes/Controllers/Database/Structure/DropFormController.php +++ b/libraries/classes/Controllers/Database/Structure/DropFormController.php @@ -6,6 +6,7 @@ namespace PhpMyAdmin\Controllers\Database\Structure; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; use PhpMyAdmin\Util; @@ -26,7 +27,7 @@ final class DropFormController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $selected = $_POST['selected_tbl'] ?? []; diff --git a/libraries/classes/Controllers/Database/Structure/DropTableController.php b/libraries/classes/Controllers/Database/Structure/DropTableController.php index afeff13d2a..591503ae91 100644 --- a/libraries/classes/Controllers/Database/Structure/DropTableController.php +++ b/libraries/classes/Controllers/Database/Structure/DropTableController.php @@ -8,6 +8,7 @@ use PhpMyAdmin\ConfigStorage\RelationCleanup; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\Controllers\Database\StructureController; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; @@ -42,7 +43,7 @@ final class DropTableController extends AbstractController $this->structureController = $structureController; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['message'] = $GLOBALS['message'] ?? null; @@ -61,7 +62,7 @@ final class DropTableController extends AbstractController unset($_POST['mult_btn']); - ($this->structureController)(); + ($this->structureController)($request); return; } @@ -126,6 +127,6 @@ final class DropTableController extends AbstractController unset($_POST['mult_btn']); - ($this->structureController)(); + ($this->structureController)($request); } } diff --git a/libraries/classes/Controllers/Database/Structure/EmptyFormController.php b/libraries/classes/Controllers/Database/Structure/EmptyFormController.php index 8609b5935c..1bee1f224f 100644 --- a/libraries/classes/Controllers/Database/Structure/EmptyFormController.php +++ b/libraries/classes/Controllers/Database/Structure/EmptyFormController.php @@ -5,6 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Database\Structure; use PhpMyAdmin\Controllers\AbstractController; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Util; use PhpMyAdmin\Utils\ForeignKey; @@ -13,7 +14,7 @@ use function htmlspecialchars; final class EmptyFormController extends AbstractController { - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $selected = $_POST['selected_tbl'] ?? []; diff --git a/libraries/classes/Controllers/Database/Structure/EmptyTableController.php b/libraries/classes/Controllers/Database/Structure/EmptyTableController.php index 79285b6e65..0674cf963f 100644 --- a/libraries/classes/Controllers/Database/Structure/EmptyTableController.php +++ b/libraries/classes/Controllers/Database/Structure/EmptyTableController.php @@ -10,6 +10,7 @@ use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\Controllers\Database\StructureController; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\FlashMessages; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\Operations; use PhpMyAdmin\ResponseRenderer; @@ -61,7 +62,7 @@ final class EmptyTableController extends AbstractController $this->structureController = $structureController; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['message'] = $GLOBALS['message'] ?? null; @@ -112,6 +113,6 @@ final class EmptyTableController extends AbstractController unset($_POST['mult_btn']); - ($this->structureController)(); + ($this->structureController)($request); } } diff --git a/libraries/classes/Controllers/Database/Structure/FavoriteTableController.php b/libraries/classes/Controllers/Database/Structure/FavoriteTableController.php index 90d3daf015..1b3acd6471 100644 --- a/libraries/classes/Controllers/Database/Structure/FavoriteTableController.php +++ b/libraries/classes/Controllers/Database/Structure/FavoriteTableController.php @@ -6,6 +6,7 @@ namespace PhpMyAdmin\Controllers\Database\Structure; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\AbstractController; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\RecentFavoriteTable; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; @@ -30,7 +31,7 @@ final class FavoriteTableController extends AbstractController $this->relation = $relation; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; diff --git a/libraries/classes/Controllers/Database/Structure/RealRowCountController.php b/libraries/classes/Controllers/Database/Structure/RealRowCountController.php index e026092aa8..7b8364d36f 100644 --- a/libraries/classes/Controllers/Database/Structure/RealRowCountController.php +++ b/libraries/classes/Controllers/Database/Structure/RealRowCountController.php @@ -6,6 +6,7 @@ namespace PhpMyAdmin\Controllers\Database\Structure; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; use PhpMyAdmin\Url; @@ -27,7 +28,7 @@ final class RealRowCountController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; diff --git a/libraries/classes/Controllers/Database/Structure/ReplacePrefixController.php b/libraries/classes/Controllers/Database/Structure/ReplacePrefixController.php index b956e52a6b..6ea8e1dcbc 100644 --- a/libraries/classes/Controllers/Database/Structure/ReplacePrefixController.php +++ b/libraries/classes/Controllers/Database/Structure/ReplacePrefixController.php @@ -7,6 +7,7 @@ namespace PhpMyAdmin\Controllers\Database\Structure; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\Controllers\Database\StructureController; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; @@ -35,7 +36,7 @@ final class ReplacePrefixController extends AbstractController $this->structureController = $structureController; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['message'] = $GLOBALS['message'] ?? null; @@ -70,6 +71,6 @@ final class ReplacePrefixController extends AbstractController $_POST['message'] = $GLOBALS['message']; } - ($this->structureController)(); + ($this->structureController)($request); } } diff --git a/libraries/classes/Controllers/Database/Structure/ShowCreateController.php b/libraries/classes/Controllers/Database/Structure/ShowCreateController.php index ccb3c99c77..22264aef88 100644 --- a/libraries/classes/Controllers/Database/Structure/ShowCreateController.php +++ b/libraries/classes/Controllers/Database/Structure/ShowCreateController.php @@ -7,6 +7,7 @@ namespace PhpMyAdmin\Controllers\Database\Structure; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\Core; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; @@ -23,7 +24,7 @@ final class ShowCreateController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $selected = $_POST['selected_tbl'] ?? []; diff --git a/libraries/classes/Controllers/Database/StructureController.php b/libraries/classes/Controllers/Database/StructureController.php index daaad666f5..34b62ac4b3 100644 --- a/libraries/classes/Controllers/Database/StructureController.php +++ b/libraries/classes/Controllers/Database/StructureController.php @@ -13,6 +13,7 @@ use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\FlashMessages; use PhpMyAdmin\Html\Generator; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Operations; use PhpMyAdmin\RecentFavoriteTable; use PhpMyAdmin\Replication; @@ -133,7 +134,7 @@ class StructureController extends AbstractController $this->isShowStats = $isShowStats; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; diff --git a/libraries/classes/Controllers/Database/TrackingController.php b/libraries/classes/Controllers/Database/TrackingController.php index 5e0b35b2e7..0eedb36532 100644 --- a/libraries/classes/Controllers/Database/TrackingController.php +++ b/libraries/classes/Controllers/Database/TrackingController.php @@ -8,6 +8,7 @@ use PhpMyAdmin\CheckUserPrivileges; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Html\Generator; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; @@ -43,7 +44,7 @@ class TrackingController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['text_dir'] = $GLOBALS['text_dir'] ?? null; $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; diff --git a/libraries/classes/Controllers/Database/TriggersController.php b/libraries/classes/Controllers/Database/TriggersController.php index 8045849244..7c6bfa552b 100644 --- a/libraries/classes/Controllers/Database/TriggersController.php +++ b/libraries/classes/Controllers/Database/TriggersController.php @@ -8,6 +8,7 @@ use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\Database\Triggers; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\DbTableExists; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; use PhpMyAdmin\Url; @@ -30,7 +31,7 @@ class TriggersController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['tables'] = $GLOBALS['tables'] ?? null; $GLOBALS['num_tables'] = $GLOBALS['num_tables'] ?? null; diff --git a/libraries/classes/Controllers/DatabaseController.php b/libraries/classes/Controllers/DatabaseController.php index 8105a600c3..8cbf5524fb 100644 --- a/libraries/classes/Controllers/DatabaseController.php +++ b/libraries/classes/Controllers/DatabaseController.php @@ -4,9 +4,11 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers; +use PhpMyAdmin\Http\ServerRequest; + final class DatabaseController extends AbstractController { - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['dblist'] = $GLOBALS['dblist'] ?? null; $this->response->addJSON(['databases' => $GLOBALS['dblist']->databases]); diff --git a/libraries/classes/Controllers/Export/CheckTimeOutController.php b/libraries/classes/Controllers/Export/CheckTimeOutController.php index 10da315083..281fc3f0a9 100644 --- a/libraries/classes/Controllers/Export/CheckTimeOutController.php +++ b/libraries/classes/Controllers/Export/CheckTimeOutController.php @@ -5,10 +5,11 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Export; use PhpMyAdmin\Controllers\AbstractController; +use PhpMyAdmin\Http\ServerRequest; final class CheckTimeOutController extends AbstractController { - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $this->response->setAjax(true); diff --git a/libraries/classes/Controllers/Export/ExportController.php b/libraries/classes/Controllers/Export/ExportController.php index b7bd766c76..c017a5daac 100644 --- a/libraries/classes/Controllers/Export/ExportController.php +++ b/libraries/classes/Controllers/Export/ExportController.php @@ -347,7 +347,7 @@ final class ExportController extends AbstractController $GLOBALS['active_page'] = Url::getFromRoute('/database/export'); /** @var DatabaseExportController $controller */ $controller = $GLOBALS['containerBuilder']->get(DatabaseExportController::class); - $controller(); + $controller($request); exit; } } diff --git a/libraries/classes/Controllers/Export/TablesController.php b/libraries/classes/Controllers/Export/TablesController.php index 73d56b3179..eae20fc098 100644 --- a/libraries/classes/Controllers/Export/TablesController.php +++ b/libraries/classes/Controllers/Export/TablesController.php @@ -6,6 +6,7 @@ namespace PhpMyAdmin\Controllers\Export; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\Controllers\Database\ExportController; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; @@ -22,7 +23,7 @@ final class TablesController extends AbstractController $this->exportController = $exportController; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { if (empty($_POST['selected_tbl'])) { $this->response->setRequestStatus(false); @@ -31,6 +32,6 @@ final class TablesController extends AbstractController return; } - ($this->exportController)(); + ($this->exportController)($request); } } diff --git a/libraries/classes/Controllers/GitInfoController.php b/libraries/classes/Controllers/GitInfoController.php index e1250a0136..2fc4ae8df7 100644 --- a/libraries/classes/Controllers/GitInfoController.php +++ b/libraries/classes/Controllers/GitInfoController.php @@ -6,6 +6,7 @@ namespace PhpMyAdmin\Controllers; use PhpMyAdmin\Config; use PhpMyAdmin\Git; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; use PhpMyAdmin\Util; @@ -23,7 +24,7 @@ final class GitInfoController extends AbstractController $this->config = $config; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { if (! $this->response->isAjax()) { return; diff --git a/libraries/classes/Controllers/HomeController.php b/libraries/classes/Controllers/HomeController.php index 03e089a562..2b7a30226c 100644 --- a/libraries/classes/Controllers/HomeController.php +++ b/libraries/classes/Controllers/HomeController.php @@ -11,6 +11,7 @@ use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Git; use PhpMyAdmin\Html\Generator; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\LanguageManager; use PhpMyAdmin\Message; use PhpMyAdmin\RecentFavoriteTable; @@ -64,7 +65,7 @@ class HomeController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['server'] = $GLOBALS['server'] ?? null; $GLOBALS['collation_connection'] = $GLOBALS['collation_connection'] ?? null; diff --git a/libraries/classes/Controllers/Import/ImportController.php b/libraries/classes/Controllers/Import/ImportController.php index 1fe5588347..b89e20a5e8 100644 --- a/libraries/classes/Controllers/Import/ImportController.php +++ b/libraries/classes/Controllers/Import/ImportController.php @@ -13,6 +13,7 @@ use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Encoding; use PhpMyAdmin\File; use PhpMyAdmin\Html\Generator; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Import; use PhpMyAdmin\Message; use PhpMyAdmin\ParseAnalyze; @@ -70,7 +71,7 @@ final class ImportController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['collation_connection'] = $GLOBALS['collation_connection'] ?? null; $GLOBALS['goto'] = $GLOBALS['goto'] ?? null; diff --git a/libraries/classes/Controllers/Import/SimulateDmlController.php b/libraries/classes/Controllers/Import/SimulateDmlController.php index 0d79f2185e..37fffc0fe6 100644 --- a/libraries/classes/Controllers/Import/SimulateDmlController.php +++ b/libraries/classes/Controllers/Import/SimulateDmlController.php @@ -5,6 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Import; use PhpMyAdmin\Controllers\AbstractController; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Import\SimulateDml; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; @@ -32,7 +33,7 @@ final class SimulateDmlController extends AbstractController $this->simulateDml = $simulateDml; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $error = ''; $errorMsg = __('Only single-table UPDATE and DELETE queries can be simulated.'); diff --git a/libraries/classes/Controllers/Import/StatusController.php b/libraries/classes/Controllers/Import/StatusController.php index 48aa1c7cd2..2d461e218c 100644 --- a/libraries/classes/Controllers/Import/StatusController.php +++ b/libraries/classes/Controllers/Import/StatusController.php @@ -5,6 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Import; use PhpMyAdmin\Core; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Import\Ajax; use PhpMyAdmin\Message; use PhpMyAdmin\Template; @@ -30,7 +31,7 @@ class StatusController $this->template = $template; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['SESSION_KEY'] = $GLOBALS['SESSION_KEY'] ?? null; $GLOBALS['upload_id'] = $GLOBALS['upload_id'] ?? null; diff --git a/libraries/classes/Controllers/LicenseController.php b/libraries/classes/Controllers/LicenseController.php index 9763af8684..ca6b9b0e7d 100644 --- a/libraries/classes/Controllers/LicenseController.php +++ b/libraries/classes/Controllers/LicenseController.php @@ -7,6 +7,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers; +use PhpMyAdmin\Http\ServerRequest; + use function __; use function is_readable; use function printf; @@ -17,7 +19,7 @@ use function readfile; */ class LicenseController extends AbstractController { - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $this->response->disable(); $this->response->header('Content-type: text/plain; charset=utf-8'); diff --git a/libraries/classes/Controllers/LintController.php b/libraries/classes/Controllers/LintController.php index 52790c17e6..f25651ed42 100644 --- a/libraries/classes/Controllers/LintController.php +++ b/libraries/classes/Controllers/LintController.php @@ -8,6 +8,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers; use PhpMyAdmin\Core; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Linter; use function json_encode; @@ -17,7 +18,7 @@ use function json_encode; */ class LintController extends AbstractController { - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $params = [ 'sql_query' => $_POST['sql_query'] ?? null, diff --git a/libraries/classes/Controllers/LogoutController.php b/libraries/classes/Controllers/LogoutController.php index b5e9683e59..1640967d5d 100644 --- a/libraries/classes/Controllers/LogoutController.php +++ b/libraries/classes/Controllers/LogoutController.php @@ -5,10 +5,11 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers; use PhpMyAdmin\Core; +use PhpMyAdmin\Http\ServerRequest; class LogoutController { - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['auth_plugin'] = $GLOBALS['auth_plugin'] ?? null; $GLOBALS['token_mismatch'] = $GLOBALS['token_mismatch'] ?? null; diff --git a/libraries/classes/Controllers/NavigationController.php b/libraries/classes/Controllers/NavigationController.php index 5b79c87524..5dc0af3271 100644 --- a/libraries/classes/Controllers/NavigationController.php +++ b/libraries/classes/Controllers/NavigationController.php @@ -6,6 +6,7 @@ namespace PhpMyAdmin\Controllers; use PhpMyAdmin\Config\PageSettings; use PhpMyAdmin\ConfigStorage\Relation; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\Navigation\Navigation; use PhpMyAdmin\ResponseRenderer; @@ -38,7 +39,7 @@ class NavigationController extends AbstractController $this->relation = $relation; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { if (! $this->response->isAjax()) { $this->response->addHTML( diff --git a/libraries/classes/Controllers/NormalizationController.php b/libraries/classes/Controllers/NormalizationController.php index eaf109a537..22211836fd 100644 --- a/libraries/classes/Controllers/NormalizationController.php +++ b/libraries/classes/Controllers/NormalizationController.php @@ -5,6 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers; use PhpMyAdmin\Core; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Normalization; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; @@ -32,7 +33,7 @@ class NormalizationController extends AbstractController $this->normalization = $normalization; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { if (isset($_POST['getColumns'])) { $html = '<option selected disabled>' . __('Select one…') . '</option>' diff --git a/libraries/classes/Controllers/PhpInfoController.php b/libraries/classes/Controllers/PhpInfoController.php index 21cb516921..16a9482bb0 100644 --- a/libraries/classes/Controllers/PhpInfoController.php +++ b/libraries/classes/Controllers/PhpInfoController.php @@ -7,6 +7,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers; +use PhpMyAdmin\Http\ServerRequest; + use function phpinfo; use const INFO_CONFIGURATION; @@ -18,7 +20,7 @@ use const INFO_MODULES; */ class PhpInfoController extends AbstractController { - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $this->response->disable(); $this->response->getHeader()->sendHttpHeaders(); diff --git a/libraries/classes/Controllers/RecentTablesListController.php b/libraries/classes/Controllers/RecentTablesListController.php index 485f686984..51cbce21c2 100644 --- a/libraries/classes/Controllers/RecentTablesListController.php +++ b/libraries/classes/Controllers/RecentTablesListController.php @@ -4,11 +4,12 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\RecentFavoriteTable; final class RecentTablesListController extends AbstractController { - public function __invoke(): void + public function __invoke(ServerRequest $request): void { if (! $this->response->isAjax()) { return; diff --git a/libraries/classes/Controllers/SchemaExportController.php b/libraries/classes/Controllers/SchemaExportController.php index 52c181cc37..96fb90d24c 100644 --- a/libraries/classes/Controllers/SchemaExportController.php +++ b/libraries/classes/Controllers/SchemaExportController.php @@ -7,6 +7,7 @@ namespace PhpMyAdmin\Controllers; use PhpMyAdmin\Core; use PhpMyAdmin\Export; use PhpMyAdmin\Html\MySQLDocumentation; +use PhpMyAdmin\Http\ServerRequest; use function __; @@ -23,7 +24,7 @@ class SchemaExportController $this->export = $export; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { if (! isset($_POST['export_type'])) { $errorMessage = __('Missing parameter:') . ' export_type' diff --git a/libraries/classes/Controllers/Server/BinlogController.php b/libraries/classes/Controllers/Server/BinlogController.php index 0ddd8db82f..598c1087e1 100644 --- a/libraries/classes/Controllers/Server/BinlogController.php +++ b/libraries/classes/Controllers/Server/BinlogController.php @@ -7,6 +7,7 @@ namespace PhpMyAdmin\Controllers\Server; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Html\Generator; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; @@ -41,7 +42,7 @@ class BinlogController extends AbstractController ); } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; diff --git a/libraries/classes/Controllers/Server/CollationsController.php b/libraries/classes/Controllers/Server/CollationsController.php index c1b1af4c84..7528be3254 100644 --- a/libraries/classes/Controllers/Server/CollationsController.php +++ b/libraries/classes/Controllers/Server/CollationsController.php @@ -9,6 +9,7 @@ use PhpMyAdmin\Charsets\Charset; use PhpMyAdmin\Charsets\Collation; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; use PhpMyAdmin\Url; @@ -45,7 +46,7 @@ class CollationsController extends AbstractController $this->collations = $collations ?? Charsets::getCollations($this->dbi, $GLOBALS['cfg']['Server']['DisableIS']); } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['errorUrl'] = Url::getFromRoute('/'); diff --git a/libraries/classes/Controllers/Server/Databases/CreateController.php b/libraries/classes/Controllers/Server/Databases/CreateController.php index 90b54163c3..747ce63b8a 100644 --- a/libraries/classes/Controllers/Server/Databases/CreateController.php +++ b/libraries/classes/Controllers/Server/Databases/CreateController.php @@ -8,6 +8,7 @@ use PhpMyAdmin\Charsets; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Html\Generator; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; @@ -32,7 +33,7 @@ final class CreateController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $params = [ 'new_db' => $_POST['new_db'] ?? null, diff --git a/libraries/classes/Controllers/Server/Databases/DestroyController.php b/libraries/classes/Controllers/Server/Databases/DestroyController.php index 8eb2ce84a0..d69d30d071 100644 --- a/libraries/classes/Controllers/Server/Databases/DestroyController.php +++ b/libraries/classes/Controllers/Server/Databases/DestroyController.php @@ -7,6 +7,7 @@ namespace PhpMyAdmin\Controllers\Server\Databases; use PhpMyAdmin\ConfigStorage\RelationCleanup; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; @@ -43,7 +44,7 @@ final class DestroyController extends AbstractController $this->relationCleanup = $relationCleanup; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['selected'] = $GLOBALS['selected'] ?? null; $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; diff --git a/libraries/classes/Controllers/Server/DatabasesController.php b/libraries/classes/Controllers/Server/DatabasesController.php index 09f4d65f3e..e188d7c06e 100644 --- a/libraries/classes/Controllers/Server/DatabasesController.php +++ b/libraries/classes/Controllers/Server/DatabasesController.php @@ -9,6 +9,7 @@ use PhpMyAdmin\CheckUserPrivileges; use PhpMyAdmin\ConfigStorage\RelationCleanup; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Query\Utilities; use PhpMyAdmin\ReplicationInfo; use PhpMyAdmin\ResponseRenderer; @@ -74,7 +75,7 @@ class DatabasesController extends AbstractController $checkUserPrivileges->getPrivileges(); } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['server'] = $GLOBALS['server'] ?? null; $GLOBALS['dblist'] = $GLOBALS['dblist'] ?? null; diff --git a/libraries/classes/Controllers/Server/EnginesController.php b/libraries/classes/Controllers/Server/EnginesController.php index b863195ace..234faa8c23 100644 --- a/libraries/classes/Controllers/Server/EnginesController.php +++ b/libraries/classes/Controllers/Server/EnginesController.php @@ -6,6 +6,7 @@ namespace PhpMyAdmin\Controllers\Server; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\StorageEngine; use PhpMyAdmin\Template; @@ -25,7 +26,7 @@ class EnginesController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['errorUrl'] = Url::getFromRoute('/'); diff --git a/libraries/classes/Controllers/Server/ExportController.php b/libraries/classes/Controllers/Server/ExportController.php index 16dcc6031a..72c18eb4ca 100644 --- a/libraries/classes/Controllers/Server/ExportController.php +++ b/libraries/classes/Controllers/Server/ExportController.php @@ -8,6 +8,7 @@ use PhpMyAdmin\Config\PageSettings; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Export\Options; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\Plugins; use PhpMyAdmin\ResponseRenderer; @@ -32,7 +33,7 @@ final class ExportController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['num_tables'] = $GLOBALS['num_tables'] ?? null; $GLOBALS['unlim_num_rows'] = $GLOBALS['unlim_num_rows'] ?? null; diff --git a/libraries/classes/Controllers/Server/ImportController.php b/libraries/classes/Controllers/Server/ImportController.php index 8b718babbd..5bae544a1e 100644 --- a/libraries/classes/Controllers/Server/ImportController.php +++ b/libraries/classes/Controllers/Server/ImportController.php @@ -9,6 +9,7 @@ use PhpMyAdmin\Config\PageSettings; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Encoding; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Import; use PhpMyAdmin\Import\Ajax; use PhpMyAdmin\Message; @@ -34,7 +35,7 @@ final class ImportController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['SESSION_KEY'] = $GLOBALS['SESSION_KEY'] ?? null; $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; diff --git a/libraries/classes/Controllers/Server/PluginsController.php b/libraries/classes/Controllers/Server/PluginsController.php index 3f39b3e400..988284f0df 100644 --- a/libraries/classes/Controllers/Server/PluginsController.php +++ b/libraries/classes/Controllers/Server/PluginsController.php @@ -6,6 +6,7 @@ namespace PhpMyAdmin\Controllers\Server; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Server\Plugins; use PhpMyAdmin\Template; @@ -38,7 +39,7 @@ class PluginsController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['errorUrl'] = Url::getFromRoute('/'); diff --git a/libraries/classes/Controllers/Server/ReplicationController.php b/libraries/classes/Controllers/Server/ReplicationController.php index bcfdc36aca..28e6381e0e 100644 --- a/libraries/classes/Controllers/Server/ReplicationController.php +++ b/libraries/classes/Controllers/Server/ReplicationController.php @@ -9,6 +9,7 @@ namespace PhpMyAdmin\Controllers\Server; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ReplicationGui; use PhpMyAdmin\ReplicationInfo; use PhpMyAdmin\ResponseRenderer; @@ -39,7 +40,7 @@ class ReplicationController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; diff --git a/libraries/classes/Controllers/Server/SqlController.php b/libraries/classes/Controllers/Server/SqlController.php index cfb446cefd..67a4378b9a 100644 --- a/libraries/classes/Controllers/Server/SqlController.php +++ b/libraries/classes/Controllers/Server/SqlController.php @@ -7,6 +7,7 @@ namespace PhpMyAdmin\Controllers\Server; use PhpMyAdmin\Config\PageSettings; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\SqlQueryForm; use PhpMyAdmin\Template; @@ -34,7 +35,7 @@ class SqlController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; diff --git a/libraries/classes/Controllers/Server/Status/AdvisorController.php b/libraries/classes/Controllers/Server/Status/AdvisorController.php index 59fec05138..8e2d54eddd 100644 --- a/libraries/classes/Controllers/Server/Status/AdvisorController.php +++ b/libraries/classes/Controllers/Server/Status/AdvisorController.php @@ -5,6 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Server\Status; use PhpMyAdmin\Advisory\Advisor; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Server\Status\Data; use PhpMyAdmin\Template; @@ -23,7 +24,7 @@ class AdvisorController extends AbstractController $this->advisor = $advisor; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $data = []; if ($this->data->dataLoaded) { diff --git a/libraries/classes/Controllers/Server/Status/Monitor/ChartingDataController.php b/libraries/classes/Controllers/Server/Status/Monitor/ChartingDataController.php index 1647a75365..d7fec5332b 100644 --- a/libraries/classes/Controllers/Server/Status/Monitor/ChartingDataController.php +++ b/libraries/classes/Controllers/Server/Status/Monitor/ChartingDataController.php @@ -6,6 +6,7 @@ namespace PhpMyAdmin\Controllers\Server\Status\Monitor; use PhpMyAdmin\Controllers\Server\Status\AbstractController; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Server\Status\Data; use PhpMyAdmin\Server\Status\Monitor; @@ -32,7 +33,7 @@ final class ChartingDataController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; diff --git a/libraries/classes/Controllers/Server/Status/Monitor/GeneralLogController.php b/libraries/classes/Controllers/Server/Status/Monitor/GeneralLogController.php index a2cd17c728..ed3345337a 100644 --- a/libraries/classes/Controllers/Server/Status/Monitor/GeneralLogController.php +++ b/libraries/classes/Controllers/Server/Status/Monitor/GeneralLogController.php @@ -6,6 +6,7 @@ namespace PhpMyAdmin\Controllers\Server\Status\Monitor; use PhpMyAdmin\Controllers\Server\Status\AbstractController; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Server\Status\Data; use PhpMyAdmin\Server\Status\Monitor; @@ -32,7 +33,7 @@ final class GeneralLogController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; diff --git a/libraries/classes/Controllers/Server/Status/Monitor/LogVarsController.php b/libraries/classes/Controllers/Server/Status/Monitor/LogVarsController.php index e0d749da42..e580fd0186 100644 --- a/libraries/classes/Controllers/Server/Status/Monitor/LogVarsController.php +++ b/libraries/classes/Controllers/Server/Status/Monitor/LogVarsController.php @@ -6,6 +6,7 @@ namespace PhpMyAdmin\Controllers\Server\Status\Monitor; use PhpMyAdmin\Controllers\Server\Status\AbstractController; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Server\Status\Data; use PhpMyAdmin\Server\Status\Monitor; @@ -32,7 +33,7 @@ final class LogVarsController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; diff --git a/libraries/classes/Controllers/Server/Status/Monitor/QueryAnalyzerController.php b/libraries/classes/Controllers/Server/Status/Monitor/QueryAnalyzerController.php index 286ca371e4..03dedd612b 100644 --- a/libraries/classes/Controllers/Server/Status/Monitor/QueryAnalyzerController.php +++ b/libraries/classes/Controllers/Server/Status/Monitor/QueryAnalyzerController.php @@ -6,6 +6,7 @@ namespace PhpMyAdmin\Controllers\Server\Status\Monitor; use PhpMyAdmin\Controllers\Server\Status\AbstractController; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Server\Status\Data; use PhpMyAdmin\Server\Status\Monitor; @@ -32,7 +33,7 @@ final class QueryAnalyzerController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; diff --git a/libraries/classes/Controllers/Server/Status/Monitor/SlowLogController.php b/libraries/classes/Controllers/Server/Status/Monitor/SlowLogController.php index 7a636f5dee..23acd4d8ae 100644 --- a/libraries/classes/Controllers/Server/Status/Monitor/SlowLogController.php +++ b/libraries/classes/Controllers/Server/Status/Monitor/SlowLogController.php @@ -6,6 +6,7 @@ namespace PhpMyAdmin\Controllers\Server\Status\Monitor; use PhpMyAdmin\Controllers\Server\Status\AbstractController; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Server\Status\Data; use PhpMyAdmin\Server\Status\Monitor; @@ -32,7 +33,7 @@ final class SlowLogController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; diff --git a/libraries/classes/Controllers/Server/Status/MonitorController.php b/libraries/classes/Controllers/Server/Status/MonitorController.php index a2d4210184..c641fac330 100644 --- a/libraries/classes/Controllers/Server/Status/MonitorController.php +++ b/libraries/classes/Controllers/Server/Status/MonitorController.php @@ -5,6 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Server\Status; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Server\Status\Data; use PhpMyAdmin\Server\SysInfo\SysInfo; @@ -25,7 +26,7 @@ class MonitorController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['errorUrl'] = Url::getFromRoute('/'); diff --git a/libraries/classes/Controllers/Server/Status/Processes/RefreshController.php b/libraries/classes/Controllers/Server/Status/Processes/RefreshController.php index 1c513aec8f..c297e3b256 100644 --- a/libraries/classes/Controllers/Server/Status/Processes/RefreshController.php +++ b/libraries/classes/Controllers/Server/Status/Processes/RefreshController.php @@ -5,6 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Server\Status\Processes; use PhpMyAdmin\Controllers\Server\Status\AbstractController; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Server\Status\Data; use PhpMyAdmin\Server\Status\Processes; @@ -21,7 +22,7 @@ final class RefreshController extends AbstractController $this->processes = $processes; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $params = [ 'showExecuting' => $_POST['showExecuting'] ?? null, diff --git a/libraries/classes/Controllers/Server/Status/ProcessesController.php b/libraries/classes/Controllers/Server/Status/ProcessesController.php index 9029cff680..28072d5371 100644 --- a/libraries/classes/Controllers/Server/Status/ProcessesController.php +++ b/libraries/classes/Controllers/Server/Status/ProcessesController.php @@ -5,6 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Server\Status; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Server\Status\Data; use PhpMyAdmin\Server\Status\Processes; @@ -31,7 +32,7 @@ class ProcessesController extends AbstractController $this->processes = $processes; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; diff --git a/libraries/classes/Controllers/Server/Status/QueriesController.php b/libraries/classes/Controllers/Server/Status/QueriesController.php index d2641abdbe..c112557fdb 100644 --- a/libraries/classes/Controllers/Server/Status/QueriesController.php +++ b/libraries/classes/Controllers/Server/Status/QueriesController.php @@ -8,6 +8,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Server\Status; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Server\Status\Data; use PhpMyAdmin\Template; @@ -30,7 +31,7 @@ class QueriesController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['errorUrl'] = Url::getFromRoute('/'); diff --git a/libraries/classes/Controllers/Server/Status/StatusController.php b/libraries/classes/Controllers/Server/Status/StatusController.php index c62b64df59..7870f5c9de 100644 --- a/libraries/classes/Controllers/Server/Status/StatusController.php +++ b/libraries/classes/Controllers/Server/Status/StatusController.php @@ -5,6 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Server\Status; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ReplicationGui; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Server\Status\Data; @@ -38,7 +39,7 @@ class StatusController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['errorUrl'] = Url::getFromRoute('/'); diff --git a/libraries/classes/Controllers/Server/Status/VariablesController.php b/libraries/classes/Controllers/Server/Status/VariablesController.php index bf8042973a..92da16f6c5 100644 --- a/libraries/classes/Controllers/Server/Status/VariablesController.php +++ b/libraries/classes/Controllers/Server/Status/VariablesController.php @@ -9,6 +9,7 @@ namespace PhpMyAdmin\Controllers\Server\Status; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Html\Generator; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Server\Status\Data; use PhpMyAdmin\Template; @@ -30,7 +31,7 @@ class VariablesController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; diff --git a/libraries/classes/Controllers/Server/UserGroupsController.php b/libraries/classes/Controllers/Server/UserGroupsController.php index a823d2f9a7..99f49b1d71 100644 --- a/libraries/classes/Controllers/Server/UserGroupsController.php +++ b/libraries/classes/Controllers/Server/UserGroupsController.php @@ -8,6 +8,7 @@ use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\UserGroups; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; @@ -36,7 +37,7 @@ class UserGroupsController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $configurableMenusFeature = $this->relation->getRelationParameters()->configurableMenusFeature; if ($configurableMenusFeature === null) { diff --git a/libraries/classes/Controllers/Server/UserGroupsFormController.php b/libraries/classes/Controllers/Server/UserGroupsFormController.php index 36400628d3..9daa2c0965 100644 --- a/libraries/classes/Controllers/Server/UserGroupsFormController.php +++ b/libraries/classes/Controllers/Server/UserGroupsFormController.php @@ -9,6 +9,7 @@ use PhpMyAdmin\ConfigStorage\Features\ConfigurableMenusFeature; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; use PhpMyAdmin\Util; @@ -36,7 +37,7 @@ final class UserGroupsFormController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $this->response->setAjax(true); diff --git a/libraries/classes/Controllers/Server/VariablesController.php b/libraries/classes/Controllers/Server/VariablesController.php index 7433088d94..6ab0afc5e5 100644 --- a/libraries/classes/Controllers/Server/VariablesController.php +++ b/libraries/classes/Controllers/Server/VariablesController.php @@ -7,6 +7,7 @@ namespace PhpMyAdmin\Controllers\Server; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Html\Generator; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Providers\ServerVariables\ServerVariablesProvider; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; @@ -34,7 +35,7 @@ class VariablesController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; diff --git a/libraries/classes/Controllers/Sql/ColumnPreferencesController.php b/libraries/classes/Controllers/Sql/ColumnPreferencesController.php index ad25978bbb..9caa472919 100644 --- a/libraries/classes/Controllers/Sql/ColumnPreferencesController.php +++ b/libraries/classes/Controllers/Sql/ColumnPreferencesController.php @@ -7,6 +7,7 @@ namespace PhpMyAdmin\Controllers\Sql; use PhpMyAdmin\CheckUserPrivileges; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Sql; @@ -36,7 +37,7 @@ final class ColumnPreferencesController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $this->checkUserPrivileges->getPrivileges(); diff --git a/libraries/classes/Controllers/Sql/DefaultForeignKeyCheckValueController.php b/libraries/classes/Controllers/Sql/DefaultForeignKeyCheckValueController.php index fbba9e7f70..bbe9f9b4f8 100644 --- a/libraries/classes/Controllers/Sql/DefaultForeignKeyCheckValueController.php +++ b/libraries/classes/Controllers/Sql/DefaultForeignKeyCheckValueController.php @@ -6,6 +6,7 @@ namespace PhpMyAdmin\Controllers\Sql; use PhpMyAdmin\CheckUserPrivileges; use PhpMyAdmin\Controllers\AbstractController; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; use PhpMyAdmin\Utils\ForeignKey; @@ -24,7 +25,7 @@ final class DefaultForeignKeyCheckValueController extends AbstractController $this->checkUserPrivileges = $checkUserPrivileges; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $this->checkUserPrivileges->getPrivileges(); $this->response->addJSON('default_fk_check_value', ForeignKey::isCheckEnabled()); diff --git a/libraries/classes/Controllers/Sql/EnumValuesController.php b/libraries/classes/Controllers/Sql/EnumValuesController.php index 0a58f0691e..4548bdfbed 100644 --- a/libraries/classes/Controllers/Sql/EnumValuesController.php +++ b/libraries/classes/Controllers/Sql/EnumValuesController.php @@ -6,6 +6,7 @@ namespace PhpMyAdmin\Controllers\Sql; use PhpMyAdmin\CheckUserPrivileges; use PhpMyAdmin\Controllers\AbstractController; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Sql; use PhpMyAdmin\Template; @@ -37,7 +38,7 @@ final class EnumValuesController extends AbstractController /** * Get possible values for enum fields during grid edit. */ - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $this->checkUserPrivileges->getPrivileges(); diff --git a/libraries/classes/Controllers/Sql/RelationalValuesController.php b/libraries/classes/Controllers/Sql/RelationalValuesController.php index 4cccc15ce0..28a59bf2e2 100644 --- a/libraries/classes/Controllers/Sql/RelationalValuesController.php +++ b/libraries/classes/Controllers/Sql/RelationalValuesController.php @@ -6,6 +6,7 @@ namespace PhpMyAdmin\Controllers\Sql; use PhpMyAdmin\CheckUserPrivileges; use PhpMyAdmin\Controllers\AbstractController; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Sql; use PhpMyAdmin\Template; @@ -34,7 +35,7 @@ final class RelationalValuesController extends AbstractController * * During grid edit, if we have a relational field, show the dropdown for it. */ - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $this->checkUserPrivileges->getPrivileges(); diff --git a/libraries/classes/Controllers/Sql/SetValuesController.php b/libraries/classes/Controllers/Sql/SetValuesController.php index 501c828c10..db2999df21 100644 --- a/libraries/classes/Controllers/Sql/SetValuesController.php +++ b/libraries/classes/Controllers/Sql/SetValuesController.php @@ -6,6 +6,7 @@ namespace PhpMyAdmin\Controllers\Sql; use PhpMyAdmin\CheckUserPrivileges; use PhpMyAdmin\Controllers\AbstractController; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Sql; use PhpMyAdmin\Template; @@ -37,7 +38,7 @@ final class SetValuesController extends AbstractController /** * Get possible values for SET fields during grid edit. */ - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $this->checkUserPrivileges->getPrivileges(); diff --git a/libraries/classes/Controllers/Sql/SqlController.php b/libraries/classes/Controllers/Sql/SqlController.php index 3bd61e06b0..fbacb0a2a9 100644 --- a/libraries/classes/Controllers/Sql/SqlController.php +++ b/libraries/classes/Controllers/Sql/SqlController.php @@ -11,6 +11,7 @@ use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\Core; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Html\Generator; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ParseAnalyze; use PhpMyAdmin\ResponseRenderer; @@ -49,7 +50,7 @@ class SqlController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['display_query'] = $GLOBALS['display_query'] ?? null; $GLOBALS['ajax_reload'] = $GLOBALS['ajax_reload'] ?? null; diff --git a/libraries/classes/Controllers/Table/ChartController.php b/libraries/classes/Controllers/Table/ChartController.php index 09516ffb88..d1e935a57f 100644 --- a/libraries/classes/Controllers/Table/ChartController.php +++ b/libraries/classes/Controllers/Table/ChartController.php @@ -9,6 +9,7 @@ use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\FieldMetadata; use PhpMyAdmin\Html\Generator; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\SqlParser\Components\Limit; @@ -42,7 +43,7 @@ class ChartController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; diff --git a/libraries/classes/Controllers/Table/CreateController.php b/libraries/classes/Controllers/Table/CreateController.php index 0294056e14..68ec6f0ed2 100644 --- a/libraries/classes/Controllers/Table/CreateController.php +++ b/libraries/classes/Controllers/Table/CreateController.php @@ -10,6 +10,7 @@ use PhpMyAdmin\Core; use PhpMyAdmin\CreateAddField; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Html\Generator; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Table\ColumnsDefinition; use PhpMyAdmin\Template; @@ -55,7 +56,7 @@ class CreateController extends AbstractController $this->columnsDefinition = $columnsDefinition; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['num_fields'] = $GLOBALS['num_fields'] ?? null; $GLOBALS['result'] = $GLOBALS['result'] ?? null; diff --git a/libraries/classes/Controllers/Table/DeleteConfirmController.php b/libraries/classes/Controllers/Table/DeleteConfirmController.php index 8aa0f7ceb2..383ef8bf35 100644 --- a/libraries/classes/Controllers/Table/DeleteConfirmController.php +++ b/libraries/classes/Controllers/Table/DeleteConfirmController.php @@ -6,6 +6,7 @@ namespace PhpMyAdmin\Controllers\Table; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DbTableExists; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Url; use PhpMyAdmin\Util; use PhpMyAdmin\Utils\ForeignKey; @@ -15,7 +16,7 @@ use function is_array; final class DeleteConfirmController extends AbstractController { - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; diff --git a/libraries/classes/Controllers/Table/DeleteRowsController.php b/libraries/classes/Controllers/Table/DeleteRowsController.php index d39b9d6010..d48ad4346f 100644 --- a/libraries/classes/Controllers/Table/DeleteRowsController.php +++ b/libraries/classes/Controllers/Table/DeleteRowsController.php @@ -8,6 +8,7 @@ use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationCleanup; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Operations; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Sql; @@ -34,7 +35,7 @@ final class DeleteRowsController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['goto'] = $GLOBALS['goto'] ?? null; $GLOBALS['disp_message'] = $GLOBALS['disp_message'] ?? null; diff --git a/libraries/classes/Controllers/Table/DropColumnController.php b/libraries/classes/Controllers/Table/DropColumnController.php index 64bd717b7b..77f0ace8bb 100644 --- a/libraries/classes/Controllers/Table/DropColumnController.php +++ b/libraries/classes/Controllers/Table/DropColumnController.php @@ -8,6 +8,7 @@ use PhpMyAdmin\ConfigStorage\RelationCleanup; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\FlashMessages; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; @@ -41,7 +42,7 @@ final class DropColumnController extends AbstractController $this->relationCleanup = $relationCleanup; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $selected = $_POST['selected'] ?? []; diff --git a/libraries/classes/Controllers/Table/ExportController.php b/libraries/classes/Controllers/Table/ExportController.php index 01a91a68b2..70963a6f63 100644 --- a/libraries/classes/Controllers/Table/ExportController.php +++ b/libraries/classes/Controllers/Table/ExportController.php @@ -7,6 +7,7 @@ namespace PhpMyAdmin\Controllers\Table; use PhpMyAdmin\Config\PageSettings; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\Export\Options; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\Plugins; use PhpMyAdmin\ResponseRenderer; @@ -36,7 +37,7 @@ class ExportController extends AbstractController $this->export = $export; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; $GLOBALS['replaces'] = $GLOBALS['replaces'] ?? null; diff --git a/libraries/classes/Controllers/Table/ExportRowsController.php b/libraries/classes/Controllers/Table/ExportRowsController.php index bba0d81db3..ae4a891234 100644 --- a/libraries/classes/Controllers/Table/ExportRowsController.php +++ b/libraries/classes/Controllers/Table/ExportRowsController.php @@ -5,6 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Table; use PhpMyAdmin\Controllers\AbstractController; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; use PhpMyAdmin\Url; @@ -26,7 +27,7 @@ final class ExportRowsController extends AbstractController $this->exportController = $exportController; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['active_page'] = $GLOBALS['active_page'] ?? null; $GLOBALS['single_table'] = $GLOBALS['single_table'] ?? null; @@ -55,6 +56,6 @@ final class ExportRowsController extends AbstractController $GLOBALS['active_page'] = Url::getFromRoute('/table/export'); - ($this->exportController)(); + ($this->exportController)($request); } } diff --git a/libraries/classes/Controllers/Table/FindReplaceController.php b/libraries/classes/Controllers/Table/FindReplaceController.php index 7a03a3d09b..a4b1d944f6 100644 --- a/libraries/classes/Controllers/Table/FindReplaceController.php +++ b/libraries/classes/Controllers/Table/FindReplaceController.php @@ -8,6 +8,7 @@ use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Html\Generator; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; use PhpMyAdmin\Url; @@ -58,7 +59,7 @@ class FindReplaceController extends AbstractController $this->connectionCharSet = (string) $this->dbi->fetchValue('SELECT @@character_set_connection'); } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; diff --git a/libraries/classes/Controllers/Table/GetFieldController.php b/libraries/classes/Controllers/Table/GetFieldController.php index a481bf03cd..306a7cf090 100644 --- a/libraries/classes/Controllers/Table/GetFieldController.php +++ b/libraries/classes/Controllers/Table/GetFieldController.php @@ -8,6 +8,7 @@ use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\Core; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Html\Generator; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Mime; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; @@ -36,7 +37,7 @@ class GetFieldController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $this->response->disable(); diff --git a/libraries/classes/Controllers/Table/GisVisualizationController.php b/libraries/classes/Controllers/Table/GisVisualizationController.php index dce0bc8709..f07055ea0a 100644 --- a/libraries/classes/Controllers/Table/GisVisualizationController.php +++ b/libraries/classes/Controllers/Table/GisVisualizationController.php @@ -9,6 +9,7 @@ use PhpMyAdmin\Core; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Gis\GisVisualization; use PhpMyAdmin\Html\Generator; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; @@ -39,7 +40,7 @@ final class GisVisualizationController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; diff --git a/libraries/classes/Controllers/Table/ImportController.php b/libraries/classes/Controllers/Table/ImportController.php index b0437c2d7e..67bb6e090b 100644 --- a/libraries/classes/Controllers/Table/ImportController.php +++ b/libraries/classes/Controllers/Table/ImportController.php @@ -10,6 +10,7 @@ use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Encoding; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Import; use PhpMyAdmin\Import\Ajax; use PhpMyAdmin\Message; @@ -38,7 +39,7 @@ final class ImportController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; $GLOBALS['SESSION_KEY'] = $GLOBALS['SESSION_KEY'] ?? null; diff --git a/libraries/classes/Controllers/Table/IndexRenameController.php b/libraries/classes/Controllers/Table/IndexRenameController.php index e3289caf3a..6f8d4cefe7 100644 --- a/libraries/classes/Controllers/Table/IndexRenameController.php +++ b/libraries/classes/Controllers/Table/IndexRenameController.php @@ -7,6 +7,7 @@ namespace PhpMyAdmin\Controllers\Table; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\DbTableExists; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Index; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Table\Indexes; @@ -35,7 +36,7 @@ final class IndexRenameController extends AbstractController $this->indexes = $indexes; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; diff --git a/libraries/classes/Controllers/Table/IndexesController.php b/libraries/classes/Controllers/Table/IndexesController.php index e378f4cdd1..4382d40bbc 100644 --- a/libraries/classes/Controllers/Table/IndexesController.php +++ b/libraries/classes/Controllers/Table/IndexesController.php @@ -7,6 +7,7 @@ namespace PhpMyAdmin\Controllers\Table; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\DbTableExists; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Index; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Table\Indexes; @@ -42,7 +43,7 @@ class IndexesController extends AbstractController $this->indexes = $indexes; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; diff --git a/libraries/classes/Controllers/Table/OperationsController.php b/libraries/classes/Controllers/Table/OperationsController.php index 9429627f53..9ff9e72d8f 100644 --- a/libraries/classes/Controllers/Table/OperationsController.php +++ b/libraries/classes/Controllers/Table/OperationsController.php @@ -11,6 +11,7 @@ use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Html\Generator; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Index; use PhpMyAdmin\Message; use PhpMyAdmin\Operations; @@ -62,7 +63,7 @@ class OperationsController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; $GLOBALS['reread_info'] = $GLOBALS['reread_info'] ?? null; diff --git a/libraries/classes/Controllers/Table/PrivilegesController.php b/libraries/classes/Controllers/Table/PrivilegesController.php index 8fa48a8eb1..d3682a8445 100644 --- a/libraries/classes/Controllers/Table/PrivilegesController.php +++ b/libraries/classes/Controllers/Table/PrivilegesController.php @@ -10,6 +10,7 @@ namespace PhpMyAdmin\Controllers\Table; use PhpMyAdmin\CheckUserPrivileges; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Server\Privileges; @@ -41,7 +42,7 @@ class PrivilegesController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['text_dir'] = $GLOBALS['text_dir'] ?? null; diff --git a/libraries/classes/Controllers/Table/RecentFavoriteController.php b/libraries/classes/Controllers/Table/RecentFavoriteController.php index 61f97bf810..2d4770adb0 100644 --- a/libraries/classes/Controllers/Table/RecentFavoriteController.php +++ b/libraries/classes/Controllers/Table/RecentFavoriteController.php @@ -6,6 +6,7 @@ namespace PhpMyAdmin\Controllers\Table; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\Controllers\Sql\SqlController; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\RecentFavoriteTable; use function is_string; @@ -15,7 +16,7 @@ use function is_string; */ class RecentFavoriteController extends AbstractController { - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['containerBuilder'] = $GLOBALS['containerBuilder'] ?? null; @@ -27,6 +28,6 @@ class RecentFavoriteController extends AbstractController /** @var SqlController $controller */ $controller = $GLOBALS['containerBuilder']->get(SqlController::class); - $controller(); + $controller($request); } } diff --git a/libraries/classes/Controllers/Table/ReplaceController.php b/libraries/classes/Controllers/Table/ReplaceController.php index 38c2375d35..8e4022bb5f 100644 --- a/libraries/classes/Controllers/Table/ReplaceController.php +++ b/libraries/classes/Controllers/Table/ReplaceController.php @@ -343,7 +343,7 @@ final class ReplaceController extends AbstractController if ($gotoInclude === '/sql') { /** @var SqlController $controller */ $controller = $GLOBALS['containerBuilder']->get(SqlController::class); - $controller(); + $controller($request); return; } @@ -351,7 +351,7 @@ final class ReplaceController extends AbstractController if ($gotoInclude === '/database/sql') { /** @var DatabaseSqlController $controller */ $controller = $GLOBALS['containerBuilder']->get(DatabaseSqlController::class); - $controller(); + $controller($request); return; } @@ -367,7 +367,7 @@ final class ReplaceController extends AbstractController if ($gotoInclude === '/table/sql') { /** @var TableSqlController $controller */ $controller = $GLOBALS['containerBuilder']->get(TableSqlController::class); - $controller(); + $controller($request); return; } @@ -542,7 +542,7 @@ final class ReplaceController extends AbstractController if ($gotoInclude === '/sql') { /** @var SqlController $controller */ $controller = $GLOBALS['containerBuilder']->get(SqlController::class); - $controller(); + $controller($request); return; } @@ -550,7 +550,7 @@ final class ReplaceController extends AbstractController if ($gotoInclude === '/database/sql') { /** @var DatabaseSqlController $controller */ $controller = $GLOBALS['containerBuilder']->get(DatabaseSqlController::class); - $controller(); + $controller($request); return; } @@ -566,7 +566,7 @@ final class ReplaceController extends AbstractController if ($gotoInclude === '/table/sql') { /** @var TableSqlController $controller */ $controller = $GLOBALS['containerBuilder']->get(TableSqlController::class); - $controller(); + $controller($request); return; } diff --git a/libraries/classes/Controllers/Table/SearchController.php b/libraries/classes/Controllers/Table/SearchController.php index 079f679015..85bb4c9560 100644 --- a/libraries/classes/Controllers/Table/SearchController.php +++ b/libraries/classes/Controllers/Table/SearchController.php @@ -10,6 +10,7 @@ use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\Core; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\DbTableExists; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Operations; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Sql; @@ -170,7 +171,7 @@ class SearchController extends AbstractController /** * Index action */ - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $this->checkParameters(['db', 'table']); diff --git a/libraries/classes/Controllers/Table/SqlController.php b/libraries/classes/Controllers/Table/SqlController.php index 6cef2a97fe..814a506111 100644 --- a/libraries/classes/Controllers/Table/SqlController.php +++ b/libraries/classes/Controllers/Table/SqlController.php @@ -7,6 +7,7 @@ namespace PhpMyAdmin\Controllers\Table; use PhpMyAdmin\Config\PageSettings; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DbTableExists; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\SqlQueryForm; use PhpMyAdmin\Template; @@ -32,7 +33,7 @@ final class SqlController extends AbstractController $this->sqlQueryForm = $sqlQueryForm; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; $GLOBALS['goto'] = $GLOBALS['goto'] ?? null; diff --git a/libraries/classes/Controllers/Table/Structure/AddKeyController.php b/libraries/classes/Controllers/Table/Structure/AddKeyController.php index cd6df11488..04c58cb0d9 100644 --- a/libraries/classes/Controllers/Table/Structure/AddKeyController.php +++ b/libraries/classes/Controllers/Table/Structure/AddKeyController.php @@ -34,7 +34,7 @@ final class AddKeyController extends AbstractController { $GLOBALS['reload'] = $GLOBALS['reload'] ?? null; - ($this->sqlController)(); + ($this->sqlController)($request); $GLOBALS['reload'] = true; diff --git a/libraries/classes/Controllers/Table/Structure/BrowseController.php b/libraries/classes/Controllers/Table/Structure/BrowseController.php index 7666d84b54..56ffb8b1a5 100644 --- a/libraries/classes/Controllers/Table/Structure/BrowseController.php +++ b/libraries/classes/Controllers/Table/Structure/BrowseController.php @@ -5,6 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Table\Structure; use PhpMyAdmin\Controllers\AbstractController; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ParseAnalyze; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Sql; @@ -27,7 +28,7 @@ final class BrowseController extends AbstractController $this->sql = $sql; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { if (empty($_POST['selected_fld'])) { $this->response->setRequestStatus(false); diff --git a/libraries/classes/Controllers/Table/Structure/ChangeController.php b/libraries/classes/Controllers/Table/Structure/ChangeController.php index c3372b00bb..4f894deca2 100644 --- a/libraries/classes/Controllers/Table/Structure/ChangeController.php +++ b/libraries/classes/Controllers/Table/Structure/ChangeController.php @@ -7,6 +7,7 @@ namespace PhpMyAdmin\Controllers\Table\Structure; use PhpMyAdmin\CheckUserPrivileges; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Table\ColumnsDefinition; @@ -34,7 +35,7 @@ final class ChangeController extends AbstractController $this->columnsDefinition = $columnsDefinition; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { if (isset($_GET['change_column'])) { $this->displayHtmlForColumnChange(null); diff --git a/libraries/classes/Controllers/Table/Structure/MoveColumnsController.php b/libraries/classes/Controllers/Table/Structure/MoveColumnsController.php index d9ca1c3d9f..0302953c59 100644 --- a/libraries/classes/Controllers/Table/Structure/MoveColumnsController.php +++ b/libraries/classes/Controllers/Table/Structure/MoveColumnsController.php @@ -6,6 +6,7 @@ namespace PhpMyAdmin\Controllers\Table\Structure; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Table; @@ -41,7 +42,7 @@ final class MoveColumnsController extends AbstractController $this->tableObj = $this->dbi->getTable($GLOBALS['db'], $GLOBALS['table']); } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { if (! isset($_POST['move_columns']) || ! is_array($_POST['move_columns']) || ! $this->response->isAjax()) { return; diff --git a/libraries/classes/Controllers/Table/Structure/ReservedWordCheckController.php b/libraries/classes/Controllers/Table/Structure/ReservedWordCheckController.php index ea5257d98f..2ce478cf4e 100644 --- a/libraries/classes/Controllers/Table/Structure/ReservedWordCheckController.php +++ b/libraries/classes/Controllers/Table/Structure/ReservedWordCheckController.php @@ -5,6 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Table\Structure; use PhpMyAdmin\Controllers\AbstractController; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\SqlParser\Context; use function _ngettext; @@ -15,7 +16,7 @@ use function trim; final class ReservedWordCheckController extends AbstractController { - public function __invoke(): void + public function __invoke(ServerRequest $request): void { if ($GLOBALS['cfg']['ReservedWordDisableWarning'] !== false) { $this->response->setRequestStatus(false); diff --git a/libraries/classes/Controllers/Table/TrackingController.php b/libraries/classes/Controllers/Table/TrackingController.php index 61cdfb0c94..125b848067 100644 --- a/libraries/classes/Controllers/Table/TrackingController.php +++ b/libraries/classes/Controllers/Table/TrackingController.php @@ -6,6 +6,7 @@ namespace PhpMyAdmin\Controllers\Table; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DbTableExists; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; @@ -36,7 +37,7 @@ final class TrackingController extends AbstractController $this->tracking = $tracking; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['text_dir'] = $GLOBALS['text_dir'] ?? null; $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; diff --git a/libraries/classes/Controllers/Table/TriggersController.php b/libraries/classes/Controllers/Table/TriggersController.php index d570e3a0ca..6f95d6ed8b 100644 --- a/libraries/classes/Controllers/Table/TriggersController.php +++ b/libraries/classes/Controllers/Table/TriggersController.php @@ -8,6 +8,7 @@ use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\Database\Triggers; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\DbTableExists; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; use PhpMyAdmin\Url; @@ -33,7 +34,7 @@ class TriggersController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['tables'] = $GLOBALS['tables'] ?? null; $GLOBALS['num_tables'] = $GLOBALS['num_tables'] ?? null; diff --git a/libraries/classes/Controllers/Table/ZoomSearchController.php b/libraries/classes/Controllers/Table/ZoomSearchController.php index a0dd0eb553..5d87f73030 100644 --- a/libraries/classes/Controllers/Table/ZoomSearchController.php +++ b/libraries/classes/Controllers/Table/ZoomSearchController.php @@ -9,6 +9,7 @@ use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\Core; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\DbTableExists; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Table\Search; use PhpMyAdmin\Template; @@ -93,7 +94,7 @@ class ZoomSearchController extends AbstractController $this->loadTableInfo(); } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['goto'] = $GLOBALS['goto'] ?? null; $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; diff --git a/libraries/classes/Controllers/TableController.php b/libraries/classes/Controllers/TableController.php index c3ee04058c..27f74d46c7 100644 --- a/libraries/classes/Controllers/TableController.php +++ b/libraries/classes/Controllers/TableController.php @@ -5,6 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; @@ -20,7 +21,7 @@ final class TableController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { if (! isset($_POST['db'])) { $this->response->setRequestStatus(false); diff --git a/libraries/classes/Controllers/ThemesController.php b/libraries/classes/Controllers/ThemesController.php index caf3d9f6fe..3d8f4a7f43 100644 --- a/libraries/classes/Controllers/ThemesController.php +++ b/libraries/classes/Controllers/ThemesController.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; use PhpMyAdmin\ThemeManager; @@ -19,7 +20,7 @@ class ThemesController extends AbstractController $this->themeManager = $themeManager; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $themes = $this->themeManager->getThemesArray(); $themesList = $this->template->render('home/themes', ['themes' => $themes]); diff --git a/libraries/classes/Controllers/Transformation/OverviewController.php b/libraries/classes/Controllers/Transformation/OverviewController.php index 4d125454ee..4e261d168d 100644 --- a/libraries/classes/Controllers/Transformation/OverviewController.php +++ b/libraries/classes/Controllers/Transformation/OverviewController.php @@ -5,6 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Transformation; use PhpMyAdmin\Controllers\AbstractController; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; use PhpMyAdmin\Transformations; @@ -25,7 +26,7 @@ class OverviewController extends AbstractController $this->transformations = $transformations; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $header = $this->response->getHeader(); $header->disableMenuAndConsole(); diff --git a/libraries/classes/Controllers/VersionCheckController.php b/libraries/classes/Controllers/VersionCheckController.php index 32f06345ad..9f8f30ec7b 100644 --- a/libraries/classes/Controllers/VersionCheckController.php +++ b/libraries/classes/Controllers/VersionCheckController.php @@ -5,6 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers; use PhpMyAdmin\Core; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; use PhpMyAdmin\VersionInformation; @@ -25,7 +26,7 @@ class VersionCheckController extends AbstractController $this->versionInformation = $versionInformation; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $_GET['ajax_request'] = 'true'; diff --git a/libraries/classes/Controllers/View/OperationsController.php b/libraries/classes/Controllers/View/OperationsController.php index 5f1de79b04..2e63851452 100644 --- a/libraries/classes/Controllers/View/OperationsController.php +++ b/libraries/classes/Controllers/View/OperationsController.php @@ -8,6 +8,7 @@ use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Html\Generator; +use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\Operations; use PhpMyAdmin\ResponseRenderer; @@ -39,7 +40,7 @@ class OperationsController extends AbstractController $this->dbi = $dbi; } - public function __invoke(): void + public function __invoke(ServerRequest $request): void { $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; $GLOBALS['reload'] = $GLOBALS['reload'] ?? null; diff --git a/libraries/classes/DbTableExists.php b/libraries/classes/DbTableExists.php index b84afc4df9..a13398b270 100644 --- a/libraries/classes/DbTableExists.php +++ b/libraries/classes/DbTableExists.php @@ -110,7 +110,7 @@ final class DbTableExists /** @var SqlController $controller */ $controller = $GLOBALS['containerBuilder']->get(SqlController::class); - $controller(); + $controller(Common::getRequest()); exit; } diff --git a/libraries/classes/Export.php b/libraries/classes/Export.php index d5d51d1bbe..1ff049ed36 100644 --- a/libraries/classes/Export.php +++ b/libraries/classes/Export.php @@ -1095,12 +1095,13 @@ class Export { $GLOBALS['active_page'] = $GLOBALS['active_page'] ?? null; $GLOBALS['containerBuilder'] = $GLOBALS['containerBuilder'] ?? null; + $request = Common::getRequest(); if ($exportType === 'server') { $GLOBALS['active_page'] = Url::getFromRoute('/server/export'); /** @var ServerExportController $controller */ $controller = $GLOBALS['containerBuilder']->get(ServerExportController::class); - $controller(); + $controller($request); return; } @@ -1109,7 +1110,7 @@ class Export $GLOBALS['active_page'] = Url::getFromRoute('/database/export'); /** @var DatabaseExportController $controller */ $controller = $GLOBALS['containerBuilder']->get(DatabaseExportController::class); - $controller(); + $controller($request); return; } @@ -1117,7 +1118,7 @@ class Export $GLOBALS['active_page'] = Url::getFromRoute('/table/export'); /** @var TableExportController $controller */ $controller = $GLOBALS['containerBuilder']->get(TableExportController::class); - $controller(); + $controller($request); } /** |