Skip to content

Commit 3c618c2

Browse files
MauricioFauthMauricioFauth
committed
Add ServerRequest parameter to all controllers
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
1 parent b0c4426 commit 3c618c2

173 files changed

Lines changed: 432 additions & 212 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎libraries/classes/Controllers/ChangeLogController.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
namespace PhpMyAdmin\Controllers;
99

10+
use PhpMyAdmin\Http\ServerRequest;
11+
1012
use function __;
1113
use function array_keys;
1214
use function file_get_contents;
@@ -21,7 +23,7 @@
2123

2224
class ChangeLogController extends AbstractController
2325
{
24-
public function __invoke(): void
26+
public function __invoke(ServerRequest $request): void
2527
{
2628
$this->response->disable();
2729
$this->response->getHeader()->sendHttpHeaders();

‎libraries/classes/Controllers/CollationConnectionController.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace PhpMyAdmin\Controllers;
66

77
use PhpMyAdmin\Config;
8+
use PhpMyAdmin\Http\ServerRequest;
89
use PhpMyAdmin\ResponseRenderer;
910
use PhpMyAdmin\Template;
1011
use PhpMyAdmin\Url;
@@ -20,7 +21,7 @@ public function __construct(ResponseRenderer $response, Template $template, Conf
2021
$this->config = $config;
2122
}
2223

23-
public function __invoke(): void
24+
public function __invoke(ServerRequest $request): void
2425
{
2526
$this->config->setUserValue(
2627
null,

‎libraries/classes/Controllers/Database/CentralColumns/PopulateColumnsController.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
use PhpMyAdmin\Controllers\AbstractController;
88
use PhpMyAdmin\Database\CentralColumns;
9+
use PhpMyAdmin\Http\ServerRequest;
910
use PhpMyAdmin\ResponseRenderer;
1011
use PhpMyAdmin\Template;
1112

@@ -23,7 +24,7 @@ public function __construct(
2324
$this->centralColumns = $centralColumns;
2425
}
2526

26-
public function __invoke(): void
27+
public function __invoke(ServerRequest $request): void
2728
{
2829
$columns = $this->centralColumns->getColumnsNotInCentralList($GLOBALS['db'], $_POST['selectedTable']);
2930
$this->render('database/central_columns/populate_columns', ['columns' => $columns]);

‎libraries/classes/Controllers/Database/CentralColumnsController.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
use PhpMyAdmin\Controllers\AbstractController;
1111
use PhpMyAdmin\Database\CentralColumns;
12+
use PhpMyAdmin\Http\ServerRequest;
1213
use PhpMyAdmin\Message;
1314
use PhpMyAdmin\ResponseRenderer;
1415
use PhpMyAdmin\Template;
@@ -33,7 +34,7 @@ public function __construct(
3334
$this->centralColumns = $centralColumns;
3435
}
3536

36-
public function __invoke(): void
37+
public function __invoke(ServerRequest $request): void
3738
{
3839
$GLOBALS['message'] = $GLOBALS['message'] ?? null;
3940
$GLOBALS['pos'] = $GLOBALS['pos'] ?? null;

‎libraries/classes/Controllers/Database/DataDictionaryController.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use PhpMyAdmin\ConfigStorage\Relation;
88
use PhpMyAdmin\Controllers\AbstractController;
99
use PhpMyAdmin\DatabaseInterface;
10+
use PhpMyAdmin\Http\ServerRequest;
1011
use PhpMyAdmin\Index;
1112
use PhpMyAdmin\ResponseRenderer;
1213
use PhpMyAdmin\Template;
@@ -40,7 +41,7 @@ public function __construct(
4041
$this->dbi = $dbi;
4142
}
4243

43-
public function __invoke(): void
44+
public function __invoke(ServerRequest $request): void
4445
{
4546
$this->checkParameters(['db'], true);
4647

‎libraries/classes/Controllers/Database/DesignerController.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use PhpMyAdmin\Controllers\AbstractController;
88
use PhpMyAdmin\Database\Designer;
99
use PhpMyAdmin\Database\Designer\Common as DesignerCommon;
10+
use PhpMyAdmin\Http\ServerRequest;
1011
use PhpMyAdmin\ResponseRenderer;
1112
use PhpMyAdmin\Template;
1213
use PhpMyAdmin\Url;
@@ -36,7 +37,7 @@ public function __construct(
3637
$this->designerCommon = $designerCommon;
3738
}
3839

39-
public function __invoke(): void
40+
public function __invoke(ServerRequest $request): void
4041
{
4142
$GLOBALS['script_display_field'] = $GLOBALS['script_display_field'] ?? null;
4243
$GLOBALS['tab_column'] = $GLOBALS['tab_column'] ?? null;

‎libraries/classes/Controllers/Database/EventsController.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use PhpMyAdmin\Controllers\AbstractController;
88
use PhpMyAdmin\Database\Events;
99
use PhpMyAdmin\DatabaseInterface;
10+
use PhpMyAdmin\Http\ServerRequest;
1011
use PhpMyAdmin\ResponseRenderer;
1112
use PhpMyAdmin\Template;
1213
use PhpMyAdmin\Url;
@@ -33,7 +34,7 @@ public function __construct(
3334
$this->dbi = $dbi;
3435
}
3536

36-
public function __invoke(): void
37+
public function __invoke(ServerRequest $request): void
3738
{
3839
$GLOBALS['tables'] = $GLOBALS['tables'] ?? null;
3940
$GLOBALS['num_tables'] = $GLOBALS['num_tables'] ?? null;

‎libraries/classes/Controllers/Database/ExportController.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use PhpMyAdmin\Controllers\AbstractController;
99
use PhpMyAdmin\Export;
1010
use PhpMyAdmin\Export\Options;
11+
use PhpMyAdmin\Http\ServerRequest;
1112
use PhpMyAdmin\Message;
1213
use PhpMyAdmin\Plugins;
1314
use PhpMyAdmin\ResponseRenderer;
@@ -38,7 +39,7 @@ public function __construct(
3839
$this->exportOptions = $exportOptions;
3940
}
4041

41-
public function __invoke(): void
42+
public function __invoke(ServerRequest $request): void
4243
{
4344
$GLOBALS['sub_part'] = $GLOBALS['sub_part'] ?? null;
4445
$GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null;

‎libraries/classes/Controllers/Database/ImportController.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use PhpMyAdmin\Controllers\AbstractController;
1010
use PhpMyAdmin\DatabaseInterface;
1111
use PhpMyAdmin\Encoding;
12+
use PhpMyAdmin\Http\ServerRequest;
1213
use PhpMyAdmin\Import;
1314
use PhpMyAdmin\Import\Ajax;
1415
use PhpMyAdmin\Message;
@@ -34,7 +35,7 @@ public function __construct(ResponseRenderer $response, Template $template, Data
3435
$this->dbi = $dbi;
3536
}
3637

37-
public function __invoke(): void
38+
public function __invoke(ServerRequest $request): void
3839
{
3940
$GLOBALS['tables'] = $GLOBALS['tables'] ?? null;
4041
$GLOBALS['num_tables'] = $GLOBALS['num_tables'] ?? null;

‎libraries/classes/Controllers/Database/MultiTableQuery/QueryController.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@
66

77
use PhpMyAdmin\Controllers\AbstractController;
88
use PhpMyAdmin\Database\MultiTableQuery;
9+
use PhpMyAdmin\Http\ServerRequest;
910

1011
final class QueryController extends AbstractController
1112
{
12-
public function __invoke(): void
13+
public function __invoke(ServerRequest $request): void
1314
{
1415
$params = [
1516
'sql_query' => $_POST['sql_query'],

0 commit comments

Comments
 (0)