Skip to content

Commit 134e3e4

Browse files
MauricioFauthMauricioFauth
authored
Merge pull request #18033 from kamil-tekiela/Remove-dead-code-again
Remove dead code
2 parents 6665289 + e3e351c commit 134e3e4

10 files changed

Lines changed: 29 additions & 107 deletions

File tree

‎libraries/classes/Controllers/Table/DeleteRowsController.php‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ public function __invoke(ServerRequest $request): void
4343
$GLOBALS['active_page'] = $GLOBALS['active_page'] ?? null;
4444

4545
$mult_btn = $_POST['mult_btn'] ?? '';
46-
$original_sql_query = $_POST['original_sql_query'] ?? '';
4746
$selected = $_POST['selected'] ?? [];
4847

4948
$relation = new Relation($this->dbi);
@@ -81,11 +80,8 @@ public function __invoke(ServerRequest $request): void
8180
$GLOBALS['disp_query'] = $GLOBALS['sql_query'];
8281
}
8382

84-
$_url_params = $GLOBALS['urlParams'];
85-
$_url_params['goto'] = Url::getFromRoute('/table/sql');
86-
87-
if (isset($original_sql_query)) {
88-
$GLOBALS['sql_query'] = $original_sql_query;
83+
if ($request->hasBodyParam('original_sql_query')) {
84+
$GLOBALS['sql_query'] = $request->getParsedBodyParam('original_sql_query', '');
8985
}
9086

9187
$GLOBALS['active_page'] = Url::getFromRoute('/sql');

‎libraries/classes/Controllers/Table/GisVisualizationController.php‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -147,14 +147,12 @@ public function __invoke(ServerRequest $request): void
147147
}
148148

149149
$this->visualization->setUserSpecifiedSettings($visualizationSettings);
150-
if ($visualizationSettings != null) {
151-
foreach ($this->visualization->getSettings() as $setting => $val) {
152-
if (isset($visualizationSettings[$setting])) {
153-
continue;
154-
}
155-
156-
$visualizationSettings[$setting] = $val;
150+
foreach ($this->visualization->getSettings() as $setting => $val) {
151+
if (isset($visualizationSettings[$setting])) {
152+
continue;
157153
}
154+
155+
$visualizationSettings[$setting] = $val;
158156
}
159157

160158
/**

‎libraries/classes/Controllers/View/CreateController.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
use function explode;
2525
use function htmlspecialchars;
2626
use function in_array;
27-
use function is_string;
2827
use function sprintf;
2928
use function str_contains;
3029
use function substr;
@@ -270,7 +269,7 @@ public function __invoke(ServerRequest $request): void
270269
$GLOBALS['view']['algorithm'] = $GLOBALS['item']['ALGORITHM'];
271270

272271
// MySQL 8.0+ - issue #16194
273-
if (empty($GLOBALS['view']['as']) && is_string($createView)) {
272+
if (empty($GLOBALS['view']['as'])) {
274273
$parser = new Parser($createView);
275274
/**
276275
* @var CreateStatement $stmt

‎libraries/classes/Display/Results.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3246,7 +3246,7 @@ public function setConfigParamsForDisplayTable(StatementInfo $analyzedSqlResults
32463246
// The value can also be from _GET as described on issue #16146 when sorting results
32473247
$sessionMaxRows = $_GET['session_max_rows'] ?? $_POST['session_max_rows'] ?? '';
32483248

3249-
if (isset($sessionMaxRows) && is_numeric($sessionMaxRows)) {
3249+
if (is_numeric($sessionMaxRows)) {
32503250
$query['max_rows'] = (int) $sessionMaxRows;
32513251
unset($_GET['session_max_rows'], $_POST['session_max_rows']);
32523252
} elseif ($sessionMaxRows === self::ALL_ROWS) {

‎libraries/classes/Import/SimulateDml.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ private function getSimulatedUpdateQuery(Parser $parser, UpdateStatement $statem
139139
$diff[] = $set->column . $notEqualOperator . $set->value;
140140
}
141141

142-
if (! empty($diff)) {
142+
if ($diff !== []) {
143143
$where .= ' AND (' . implode(' OR ', $diff) . ')';
144144
}
145145

‎libraries/classes/Plugins/Auth/AuthenticationHttp.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,12 +180,12 @@ public function readCredentials(): bool
180180

181181
// User logged out -> ensure the new username is not the same
182182
$old_usr = $_REQUEST['old_usr'] ?? '';
183-
if (! empty($old_usr) && (isset($this->user) && hash_equals($old_usr, $this->user))) {
183+
if (! empty($old_usr) && hash_equals($old_usr, $this->user)) {
184184
$this->user = '';
185185
}
186186

187187
// Returns whether we get authentication settings or not
188-
return ! empty($this->user);
188+
return $this->user !== '';
189189
}
190190

191191
/**

‎libraries/classes/Server/Status/Processes.php‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
use function __;
1212
use function array_keys;
13-
use function count;
1413
use function mb_strtolower;
1514
use function strlen;
1615
use function ucfirst;
@@ -144,8 +143,6 @@ private function getSortableColumnsForProcessList(
144143
'order_by_field' => 'Info',
145144
];
146145

147-
$sortableColCount = count($sortableColumns);
148-
149146
$columns = [];
150147
foreach ($sortableColumns as $columnKey => $column) {
151148
$is_sorted = $orderByField !== ''
@@ -170,10 +167,6 @@ private function getSortableColumnsForProcessList(
170167
'is_full' => false,
171168
];
172169

173-
if (0 !== --$sortableColCount) {
174-
continue;
175-
}
176-
177170
$columns[$columnKey]['has_full_query'] = true;
178171
if (! $showFullSql) {
179172
continue;

‎libraries/classes/Table.php‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2540,12 +2540,10 @@ public function getColumnGenerationExpression($column = null)
25402540

25412541
/**
25422542
* Returns the CREATE statement for this table
2543-
*
2544-
* @return mixed
25452543
*/
2546-
public function showCreate()
2544+
public function showCreate(): string
25472545
{
2548-
return $this->dbi->fetchValue(
2546+
return (string) $this->dbi->fetchValue(
25492547
'SHOW CREATE TABLE ' . Util::backquote($this->dbName) . '.'
25502548
. Util::backquote($this->name),
25512549
1

‎phpstan-baseline.neon‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -935,11 +935,6 @@ parameters:
935935
count: 1
936936
path: libraries/classes/ConfigStorage/Relation.php
937937

938-
-
939-
message: "#^Parameter \\#1 \\$list of class PhpMyAdmin\\\\SqlParser\\\\Parser constructor expects PhpMyAdmin\\\\SqlParser\\\\TokensList\\|PhpMyAdmin\\\\SqlParser\\\\UtfString\\|string\\|null, mixed given\\.$#"
940-
count: 1
941-
path: libraries/classes/ConfigStorage/Relation.php
942-
943938
-
944939
message: "#^Parameter \\#2 \\$callback of function usort expects callable\\(string\\|null, string\\|null\\)\\: int, 'strnatcasecmp' given\\.$#"
945940
count: 1
@@ -1245,11 +1240,6 @@ parameters:
12451240
count: 1
12461241
path: libraries/classes/Controllers/Database/Structure/ReplacePrefixController.php
12471242

1248-
-
1249-
message: "#^Parameter \\#1 \\$buffer of static method PhpMyAdmin\\\\Core\\:\\:mimeDefaultFunction\\(\\) expects string, mixed given\\.$#"
1250-
count: 1
1251-
path: libraries/classes/Controllers/Database/Structure/ShowCreateController.php
1252-
12531243
-
12541244
message: "#^Parameter \\#1 \\$selected of method PhpMyAdmin\\\\Controllers\\\\Database\\\\Structure\\\\ShowCreateController\\:\\:getShowCreateTables\\(\\) expects array\\<string\\>, mixed given\\.$#"
12551245
count: 1
@@ -2035,11 +2025,6 @@ parameters:
20352025
count: 1
20362026
path: libraries/classes/Controllers/Table/Structure/PartitioningController.php
20372027

2038-
-
2039-
message: "#^Parameter \\#1 \\$list of class PhpMyAdmin\\\\SqlParser\\\\Parser constructor expects PhpMyAdmin\\\\SqlParser\\\\TokensList\\|PhpMyAdmin\\\\SqlParser\\\\UtfString\\|string\\|null, mixed given\\.$#"
2040-
count: 1
2041-
path: libraries/classes/Controllers/Table/Structure/PartitioningController.php
2042-
20432028
-
20442029
message: "#^Parameter \\#1 \\$var of function count expects array\\|Countable, array\\<PhpMyAdmin\\\\SqlParser\\\\Components\\\\PartitionDefinition\\>\\|null given\\.$#"
20452030
count: 1
@@ -2200,11 +2185,6 @@ parameters:
22002185
count: 1
22012186
path: libraries/classes/Controllers/View/CreateController.php
22022187

2203-
-
2204-
message: "#^Parameter \\#1 \\$string of function substr expects string, mixed given\\.$#"
2205-
count: 1
2206-
path: libraries/classes/Controllers/View/CreateController.php
2207-
22082188
-
22092189
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Statements\\\\CreateStatement\\:\\:\\$body \\(array\\<PhpMyAdmin\\\\SqlParser\\\\Token\\>\\|string\\) in isset\\(\\) is not nullable\\.$#"
22102190
count: 1
@@ -5725,11 +5705,6 @@ parameters:
57255705
count: 1
57265706
path: libraries/classes/Plugins/Auth/AuthenticationCookie.php
57275707

5728-
-
5729-
message: "#^Property PhpMyAdmin\\\\Plugins\\\\AuthenticationPlugin\\:\\:\\$user \\(string\\) in isset\\(\\) is not nullable\\.$#"
5730-
count: 1
5731-
path: libraries/classes/Plugins/Auth/AuthenticationHttp.php
5732-
57335708
-
57345709
message: "#^Method PhpMyAdmin\\\\Plugins\\\\Auth\\\\AuthenticationSignon\\:\\:setCookieParams\\(\\) has parameter \\$sessionCookieParams with no value type specified in iterable type array\\.$#"
57355710
count: 1
@@ -8255,11 +8230,6 @@ parameters:
82558230
count: 1
82568231
path: libraries/classes/Table.php
82578232

8258-
-
8259-
message: "#^Parameter \\#1 \\$list of class PhpMyAdmin\\\\SqlParser\\\\Parser constructor expects PhpMyAdmin\\\\SqlParser\\\\TokensList\\|PhpMyAdmin\\\\SqlParser\\\\UtfString\\|string\\|null, mixed given\\.$#"
8260-
count: 1
8261-
path: libraries/classes/Table.php
8262-
82638233
-
82648234
message: "#^Parameter \\#1 \\$string of function substr expects string, mixed given\\.$#"
82658235
count: 2

0 commit comments

Comments
 (0)