Skip to content

Commit 675dc8d

Browse files
MauricioFauthMauricioFauth
authored
Merge pull request #18939 from kamil-tekiela/active_page
Remove $GLOBALS['active_page']
2 parents b37c3e1 + 479b369 commit 675dc8d

11 files changed

Lines changed: 0 additions & 51 deletions

‎psalm-baseline.xml‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1709,7 +1709,6 @@
17091709
<code>Config::getInstance()</code>
17101710
</DeprecatedMethod>
17111711
<InvalidArrayOffset>
1712-
<code><![CDATA[$GLOBALS['active_page']]]></code>
17131712
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
17141713
<code><![CDATA[$GLOBALS['export_type']]]></code>
17151714
<code><![CDATA[$GLOBALS['save_filename']]]></code>
@@ -1756,7 +1755,6 @@
17561755
<code><![CDATA[$_SESSION['tmpval']['aliases']]]></code>
17571756
</MixedArrayAssignment>
17581757
<MixedAssignment>
1759-
<code><![CDATA[$GLOBALS['active_page']]]></code>
17601758
<code><![CDATA[$GLOBALS['charset']]]></code>
17611759
<code><![CDATA[$GLOBALS['codegen_format']]]></code>
17621760
<code><![CDATA[$GLOBALS['codegen_structure_or_data']]]></code>
@@ -2012,7 +2010,6 @@
20122010
<code>$importPlugin == null</code>
20132011
</DocblockTypeContradiction>
20142012
<InvalidArrayOffset>
2015-
<code><![CDATA[$GLOBALS['active_page']]]></code>
20162013
<code><![CDATA[$GLOBALS['ajax_reload']]]></code>
20172014
<code><![CDATA[$GLOBALS['charset_conversion']]]></code>
20182015
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
@@ -2069,7 +2066,6 @@
20692066
<code><![CDATA[$_SESSION['Import_message']['message']]]></code>
20702067
</MixedArrayAssignment>
20712068
<MixedAssignment>
2072-
<code><![CDATA[$GLOBALS['active_page']]]></code>
20732069
<code><![CDATA[$GLOBALS['ajax_reload']]]></code>
20742070
<code><![CDATA[$GLOBALS['charset_conversion']]]></code>
20752071
<code><![CDATA[$GLOBALS['charset_of_file']]]></code>
@@ -3196,7 +3192,6 @@
31963192
</file>
31973193
<file src="src/Controllers/Table/AddFieldController.php">
31983194
<InvalidArrayOffset>
3199-
<code><![CDATA[$GLOBALS['active_page']]]></code>
32003195
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
32013196
</InvalidArrayOffset>
32023197
<MixedArgument>
@@ -3206,7 +3201,6 @@
32063201
<code><![CDATA[$_POST['field_transformation_options'][$fieldindex]]]></code>
32073202
</MixedArgument>
32083203
<MixedAssignment>
3209-
<code><![CDATA[$GLOBALS['active_page']]]></code>
32103204
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
32113205
</MixedAssignment>
32123206
<PossiblyInvalidArgument>
@@ -3276,11 +3270,9 @@
32763270
</file>
32773271
<file src="src/Controllers/Table/ChangeRowsController.php">
32783272
<InvalidArrayOffset>
3279-
<code><![CDATA[$GLOBALS['active_page']]]></code>
32803273
<code><![CDATA[$GLOBALS['where_clause']]]></code>
32813274
</InvalidArrayOffset>
32823275
<MixedAssignment>
3283-
<code><![CDATA[$GLOBALS['active_page']]]></code>
32843276
<code><![CDATA[$GLOBALS['where_clause']]]></code>
32853277
<code>$rowsToDelete</code>
32863278
</MixedAssignment>
@@ -3365,7 +3357,6 @@
33653357
<code><![CDATA[$_REQUEST['pos']]]></code>
33663358
</InvalidArgument>
33673359
<InvalidArrayOffset>
3368-
<code><![CDATA[$GLOBALS['active_page']]]></code>
33693360
<code><![CDATA[$GLOBALS['disp_message']]]></code>
33703361
<code><![CDATA[$GLOBALS['disp_query']]]></code>
33713362
</InvalidArrayOffset>
@@ -3376,7 +3367,6 @@
33763367
<code>$row</code>
33773368
</MixedArgument>
33783369
<MixedAssignment>
3379-
<code><![CDATA[$GLOBALS['active_page']]]></code>
33803370
<code><![CDATA[$GLOBALS['disp_message']]]></code>
33813371
<code><![CDATA[$GLOBALS['disp_query']]]></code>
33823372
<code><![CDATA[$GLOBALS['sql_query']]]></code>
@@ -3438,12 +3428,10 @@
34383428
</file>
34393429
<file src="src/Controllers/Table/ExportRowsController.php">
34403430
<InvalidArrayOffset>
3441-
<code><![CDATA[$GLOBALS['active_page']]]></code>
34423431
<code><![CDATA[$GLOBALS['single_table']]]></code>
34433432
<code><![CDATA[$GLOBALS['where_clause']]]></code>
34443433
</InvalidArrayOffset>
34453434
<MixedAssignment>
3446-
<code><![CDATA[$GLOBALS['active_page']]]></code>
34473435
<code><![CDATA[$GLOBALS['single_table']]]></code>
34483436
<code><![CDATA[$GLOBALS['where_clause']]]></code>
34493437
</MixedAssignment>
@@ -3679,7 +3667,6 @@
36793667
<code>$insertErrors</code>
36803668
</InvalidArgument>
36813669
<InvalidArrayOffset>
3682-
<code><![CDATA[$GLOBALS['active_page']]]></code>
36833670
<code><![CDATA[$GLOBALS['disp_message']]]></code>
36843671
<code><![CDATA[$GLOBALS['disp_query']]]></code>
36853672
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
@@ -3729,7 +3716,6 @@
37293716
<code>$mimeMap[$columnName]</code>
37303717
</MixedArrayOffset>
37313718
<MixedAssignment>
3732-
<code><![CDATA[$GLOBALS['active_page']]]></code>
37333719
<code><![CDATA[$GLOBALS['disp_message']]]></code>
37343720
<code><![CDATA[$GLOBALS['disp_query']]]></code>
37353721
<code><![CDATA[$GLOBALS['errorUrl']]]></code>

‎src/Controllers/Export/ExportController.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ public function __invoke(ServerRequest $request): void
6161
$GLOBALS['table_select'] ??= null;
6262
$GLOBALS['time_start'] ??= null;
6363
$GLOBALS['charset'] ??= null;
64-
$GLOBALS['active_page'] ??= null;
6564
$GLOBALS['table_data'] ??= null;
6665

6766
/** @var array<string, string> $postParams */
@@ -300,7 +299,6 @@ public function __invoke(ServerRequest $request): void
300299
$GLOBALS['message'] = Message::error(
301300
__('No tables found in database.'),
302301
);
303-
$GLOBALS['active_page'] = Url::getFromRoute('/database/export');
304302
/** @var DatabaseExportController $controller */
305303
$controller = ContainerBuilder::getContainer()->get(DatabaseExportController::class);
306304
$controller($request);

‎src/Controllers/Import/ImportController.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ public function __invoke(ServerRequest $request): void
9494
$GLOBALS['import_file_name'] ??= null;
9595
$GLOBALS['import_notice'] ??= null;
9696
$GLOBALS['read_multiply'] ??= null;
97-
$GLOBALS['active_page'] ??= null;
9897

9998
$GLOBALS['charset_of_file'] = $request->getParsedBodyParam('charset_of_file');
10099
$GLOBALS['format'] = $request->getParsedBodyParam('format', '');
@@ -773,7 +772,6 @@ public function __invoke(ServerRequest $request): void
773772
$this->response->setRequestStatus(false);
774773
$this->response->addJSON('message', Message::error($GLOBALS['msg']));
775774
} else {
776-
$GLOBALS['active_page'] = $GLOBALS['goto'];
777775
/** @psalm-suppress UnresolvableInclude */
778776
include ROOT_PATH . $GLOBALS['goto'];
779777
}

‎src/Controllers/Table/AddFieldController.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ public function __invoke(ServerRequest $request): void
5050
{
5151
$GLOBALS['errorUrl'] ??= null;
5252
$GLOBALS['message'] ??= null;
53-
$GLOBALS['active_page'] ??= null;
5453

5554
/** @var string|null $numberOfFields */
5655
$numberOfFields = $request->getParsedBodyParam('num_fields');
@@ -183,8 +182,6 @@ public function __invoke(ServerRequest $request): void
183182
return;
184183
}
185184

186-
$GLOBALS['active_page'] = Url::getFromRoute('/table/structure');
187-
188185
$this->addScriptFiles(['vendor/jquery/jquery.uitablefilter.js']);
189186

190187
if (! $this->checkParameters(['server', 'db', 'table'])) {

‎src/Controllers/Table/ChangeRowsController.php‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
use PhpMyAdmin\Http\ServerRequest;
99
use PhpMyAdmin\ResponseRenderer;
1010
use PhpMyAdmin\Template;
11-
use PhpMyAdmin\Url;
1211

1312
use function __;
1413
use function array_values;
@@ -26,7 +25,6 @@ public function __construct(
2625

2726
public function __invoke(ServerRequest $request): void
2827
{
29-
$GLOBALS['active_page'] ??= null;
3028
$GLOBALS['where_clause'] ??= null;
3129

3230
$rowsToDelete = $request->getParsedBodyParam('rows_to_delete');
@@ -50,8 +48,6 @@ public function __invoke(ServerRequest $request): void
5048
$GLOBALS['where_clause'] = array_values($rowsToDelete);
5149
}
5250

53-
$GLOBALS['active_page'] = Url::getFromRoute('/table/change');
54-
5551
($this->changeController)($request);
5652
}
5753
}

‎src/Controllers/Table/DeleteRowsController.php‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
use PhpMyAdmin\Sql;
1717
use PhpMyAdmin\Template;
1818
use PhpMyAdmin\Transformations;
19-
use PhpMyAdmin\Url;
2019
use PhpMyAdmin\Util;
2120
use PhpMyAdmin\Utils\ForeignKey;
2221

@@ -38,7 +37,6 @@ public function __invoke(ServerRequest $request): void
3837
$GLOBALS['goto'] ??= null;
3938
$GLOBALS['disp_message'] ??= null;
4039
$GLOBALS['disp_query'] ??= null;
41-
$GLOBALS['active_page'] ??= null;
4240

4341
$multBtn = $_POST['mult_btn'] ?? '';
4442
$selected = $_POST['selected'] ?? [];
@@ -83,8 +81,6 @@ public function __invoke(ServerRequest $request): void
8381
$GLOBALS['sql_query'] = $request->getParsedBodyParam('original_sql_query', '');
8482
}
8583

86-
$GLOBALS['active_page'] = Url::getFromRoute('/sql');
87-
8884
$this->response->addHTML($sql->executeQueryAndSendQueryResponse(
8985
null,
9086
false,

‎src/Controllers/Table/ExportRowsController.php‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
use PhpMyAdmin\Http\ServerRequest;
99
use PhpMyAdmin\ResponseRenderer;
1010
use PhpMyAdmin\Template;
11-
use PhpMyAdmin\Url;
1211

1312
use function __;
1413
use function array_values;
@@ -26,7 +25,6 @@ public function __construct(
2625

2726
public function __invoke(ServerRequest $request): void
2827
{
29-
$GLOBALS['active_page'] ??= null;
3028
$GLOBALS['single_table'] ??= null;
3129
$GLOBALS['where_clause'] ??= null;
3230

@@ -49,8 +47,6 @@ public function __invoke(ServerRequest $request): void
4947
$GLOBALS['where_clause'] = array_values($_POST['rows_to_delete']);
5048
}
5149

52-
$GLOBALS['active_page'] = Url::getFromRoute('/table/export');
53-
5450
($this->exportController)($request);
5551
}
5652
}

‎src/Controllers/Table/ReplaceController.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ public function __invoke(ServerRequest $request): void
6868

6969
$GLOBALS['errorUrl'] ??= null;
7070
$GLOBALS['unsaved_values'] ??= null;
71-
$GLOBALS['active_page'] ??= null;
7271
$GLOBALS['disp_query'] ??= null;
7372
$GLOBALS['disp_message'] ??= null;
7473
$GLOBALS['query'] ??= null;
@@ -478,7 +477,6 @@ private function doTransformations(array $mimeMap, ServerRequest $request): void
478477

479478
private function moveBackToCallingScript(string $gotoInclude, ServerRequest $request): void
480479
{
481-
$GLOBALS['active_page'] = $gotoInclude;
482480
if ($gotoInclude === '/sql') {
483481
($this->sqlController)($request);
484482

‎src/Controllers/Table/Structure/BrowseController.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
use PhpMyAdmin\ResponseRenderer;
1212
use PhpMyAdmin\Sql;
1313
use PhpMyAdmin\Template;
14-
use PhpMyAdmin\Url;
1514
use PhpMyAdmin\Util;
1615

1716
use function __;
@@ -44,7 +43,6 @@ public function __invoke(ServerRequest $request): void
4443
*/
4544
private function displayTableBrowseForSelectedColumns(string $goto): void
4645
{
47-
$GLOBALS['active_page'] = Url::getFromRoute('/sql');
4846
$fields = [];
4947
foreach ($_POST['selected_fld'] as $sval) {
5048
$fields[] = Util::backquote($sval);

‎tests/classes/Controllers/Table/ChangeRowsControllerTest.php‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ protected function setUp(): void
2323

2424
DatabaseInterface::$instance = $this->createDatabaseInterface();
2525
Current::$server = 2;
26-
$GLOBALS['active_page'] = null;
2726
$GLOBALS['where_clause'] = null;
2827
$_POST = [];
2928
}
@@ -38,8 +37,6 @@ public function testChangeRowsController(): void
3837

3938
(new ChangeRowsController(new ResponseRenderer(), new Template(), $mock))($request);
4039

41-
/** @psalm-suppress InvalidArrayOffset */
42-
$this->assertSame('index.php?route=/table/change&server=2&lang=en', $GLOBALS['active_page']);
4340
/** @psalm-suppress InvalidArrayOffset */
4441
$this->assertSame([], $GLOBALS['where_clause']);
4542
}
@@ -58,8 +55,6 @@ public function testWithoutRowsToDelete(): void
5855
$this->assertSame(['message' => 'No row selected.'], $response->getJSONResult());
5956
$this->assertFalse($response->hasSuccessState());
6057
/** @psalm-suppress InvalidArrayOffset */
61-
$this->assertNull($GLOBALS['active_page']);
62-
/** @psalm-suppress InvalidArrayOffset */
6358
$this->assertNull($GLOBALS['where_clause']);
6459
}
6560

@@ -73,8 +68,6 @@ public function testWithRowsToDelete(): void
7368

7469
(new ChangeRowsController(new ResponseRenderer(), new Template(), $mock))($request);
7570

76-
/** @psalm-suppress InvalidArrayOffset */
77-
$this->assertSame('index.php?route=/table/change&server=2&lang=en', $GLOBALS['active_page']);
7871
/** @psalm-suppress InvalidArrayOffset */
7972
$this->assertSame(['row1', 'row2'], $GLOBALS['where_clause']);
8073
}

0 commit comments

Comments
 (0)