From e3e351c676f1155140b30efab88aa87dff50d39f Mon Sep 17 00:00:00 2001 From: Kamil Tekiela Date: Tue, 24 Jan 2023 23:22:34 +0000 Subject: [PATCH] Remove dead code Signed-off-by: Kamil Tekiela --- .../Table/DeleteRowsController.php | 8 +-- .../Table/GisVisualizationController.php | 12 ++-- .../Controllers/View/CreateController.php | 3 +- libraries/classes/Display/Results.php | 2 +- libraries/classes/Import/SimulateDml.php | 2 +- .../Plugins/Auth/AuthenticationHttp.php | 4 +- libraries/classes/Server/Status/Processes.php | 7 --- libraries/classes/Table.php | 6 +- phpstan-baseline.neon | 30 --------- psalm-baseline.xml | 62 +++++-------------- 10 files changed, 29 insertions(+), 107 deletions(-) diff --git a/libraries/classes/Controllers/Table/DeleteRowsController.php b/libraries/classes/Controllers/Table/DeleteRowsController.php index d48ad4346f..83096b2647 100644 --- a/libraries/classes/Controllers/Table/DeleteRowsController.php +++ b/libraries/classes/Controllers/Table/DeleteRowsController.php @@ -43,7 +43,6 @@ final class DeleteRowsController extends AbstractController $GLOBALS['active_page'] = $GLOBALS['active_page'] ?? null; $mult_btn = $_POST['mult_btn'] ?? ''; - $original_sql_query = $_POST['original_sql_query'] ?? ''; $selected = $_POST['selected'] ?? []; $relation = new Relation($this->dbi); @@ -81,11 +80,8 @@ final class DeleteRowsController extends AbstractController $GLOBALS['disp_query'] = $GLOBALS['sql_query']; } - $_url_params = $GLOBALS['urlParams']; - $_url_params['goto'] = Url::getFromRoute('/table/sql'); - - if (isset($original_sql_query)) { - $GLOBALS['sql_query'] = $original_sql_query; + if ($request->hasBodyParam('original_sql_query')) { + $GLOBALS['sql_query'] = $request->getParsedBodyParam('original_sql_query', ''); } $GLOBALS['active_page'] = Url::getFromRoute('/sql'); diff --git a/libraries/classes/Controllers/Table/GisVisualizationController.php b/libraries/classes/Controllers/Table/GisVisualizationController.php index 2cdfb6c691..fd496d01a2 100644 --- a/libraries/classes/Controllers/Table/GisVisualizationController.php +++ b/libraries/classes/Controllers/Table/GisVisualizationController.php @@ -147,14 +147,12 @@ final class GisVisualizationController extends AbstractController } $this->visualization->setUserSpecifiedSettings($visualizationSettings); - if ($visualizationSettings != null) { - foreach ($this->visualization->getSettings() as $setting => $val) { - if (isset($visualizationSettings[$setting])) { - continue; - } - - $visualizationSettings[$setting] = $val; + foreach ($this->visualization->getSettings() as $setting => $val) { + if (isset($visualizationSettings[$setting])) { + continue; } + + $visualizationSettings[$setting] = $val; } /** diff --git a/libraries/classes/Controllers/View/CreateController.php b/libraries/classes/Controllers/View/CreateController.php index 97f4e34be2..198b14b3ba 100644 --- a/libraries/classes/Controllers/View/CreateController.php +++ b/libraries/classes/Controllers/View/CreateController.php @@ -24,7 +24,6 @@ use function array_merge; use function explode; use function htmlspecialchars; use function in_array; -use function is_string; use function sprintf; use function str_contains; use function substr; @@ -270,7 +269,7 @@ class CreateController extends AbstractController $GLOBALS['view']['algorithm'] = $GLOBALS['item']['ALGORITHM']; // MySQL 8.0+ - issue #16194 - if (empty($GLOBALS['view']['as']) && is_string($createView)) { + if (empty($GLOBALS['view']['as'])) { $parser = new Parser($createView); /** * @var CreateStatement $stmt diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php index 8673db4a4e..cb37fa5732 100644 --- a/libraries/classes/Display/Results.php +++ b/libraries/classes/Display/Results.php @@ -3246,7 +3246,7 @@ class Results // The value can also be from _GET as described on issue #16146 when sorting results $sessionMaxRows = $_GET['session_max_rows'] ?? $_POST['session_max_rows'] ?? ''; - if (isset($sessionMaxRows) && is_numeric($sessionMaxRows)) { + if (is_numeric($sessionMaxRows)) { $query['max_rows'] = (int) $sessionMaxRows; unset($_GET['session_max_rows'], $_POST['session_max_rows']); } elseif ($sessionMaxRows === self::ALL_ROWS) { diff --git a/libraries/classes/Import/SimulateDml.php b/libraries/classes/Import/SimulateDml.php index fc48201872..edcab225f6 100644 --- a/libraries/classes/Import/SimulateDml.php +++ b/libraries/classes/Import/SimulateDml.php @@ -139,7 +139,7 @@ final class SimulateDml $diff[] = $set->column . $notEqualOperator . $set->value; } - if (! empty($diff)) { + if ($diff !== []) { $where .= ' AND (' . implode(' OR ', $diff) . ')'; } diff --git a/libraries/classes/Plugins/Auth/AuthenticationHttp.php b/libraries/classes/Plugins/Auth/AuthenticationHttp.php index 5956cd8997..a8cb8c0f8b 100644 --- a/libraries/classes/Plugins/Auth/AuthenticationHttp.php +++ b/libraries/classes/Plugins/Auth/AuthenticationHttp.php @@ -180,12 +180,12 @@ class AuthenticationHttp extends AuthenticationPlugin // User logged out -> ensure the new username is not the same $old_usr = $_REQUEST['old_usr'] ?? ''; - if (! empty($old_usr) && (isset($this->user) && hash_equals($old_usr, $this->user))) { + if (! empty($old_usr) && hash_equals($old_usr, $this->user)) { $this->user = ''; } // Returns whether we get authentication settings or not - return ! empty($this->user); + return $this->user !== ''; } /** diff --git a/libraries/classes/Server/Status/Processes.php b/libraries/classes/Server/Status/Processes.php index 55e476a83c..409501b8d1 100644 --- a/libraries/classes/Server/Status/Processes.php +++ b/libraries/classes/Server/Status/Processes.php @@ -10,7 +10,6 @@ use PhpMyAdmin\Util; use function __; use function array_keys; -use function count; use function mb_strtolower; use function strlen; use function ucfirst; @@ -144,8 +143,6 @@ final class Processes 'order_by_field' => 'Info', ]; - $sortableColCount = count($sortableColumns); - $columns = []; foreach ($sortableColumns as $columnKey => $column) { $is_sorted = $orderByField !== '' @@ -170,10 +167,6 @@ final class Processes 'is_full' => false, ]; - if (0 !== --$sortableColCount) { - continue; - } - $columns[$columnKey]['has_full_query'] = true; if (! $showFullSql) { continue; diff --git a/libraries/classes/Table.php b/libraries/classes/Table.php index 3adbce04eb..ac4ad43336 100644 --- a/libraries/classes/Table.php +++ b/libraries/classes/Table.php @@ -2540,12 +2540,10 @@ class Table implements Stringable /** * Returns the CREATE statement for this table - * - * @return mixed */ - public function showCreate() + public function showCreate(): string { - return $this->dbi->fetchValue( + return (string) $this->dbi->fetchValue( 'SHOW CREATE TABLE ' . Util::backquote($this->dbName) . '.' . Util::backquote($this->name), 1 diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index d8005f59f7..a94e014e4b 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -935,11 +935,6 @@ parameters: count: 1 path: libraries/classes/ConfigStorage/Relation.php - - - message: "#^Parameter \\#1 \\$list of class PhpMyAdmin\\\\SqlParser\\\\Parser constructor expects PhpMyAdmin\\\\SqlParser\\\\TokensList\\|PhpMyAdmin\\\\SqlParser\\\\UtfString\\|string\\|null, mixed given\\.$#" - count: 1 - path: libraries/classes/ConfigStorage/Relation.php - - message: "#^Parameter \\#2 \\$callback of function usort expects callable\\(string\\|null, string\\|null\\)\\: int, 'strnatcasecmp' given\\.$#" count: 1 @@ -1245,11 +1240,6 @@ parameters: count: 1 path: libraries/classes/Controllers/Database/Structure/ReplacePrefixController.php - - - message: "#^Parameter \\#1 \\$buffer of static method PhpMyAdmin\\\\Core\\:\\:mimeDefaultFunction\\(\\) expects string, mixed given\\.$#" - count: 1 - path: libraries/classes/Controllers/Database/Structure/ShowCreateController.php - - message: "#^Parameter \\#1 \\$selected of method PhpMyAdmin\\\\Controllers\\\\Database\\\\Structure\\\\ShowCreateController\\:\\:getShowCreateTables\\(\\) expects array\\, mixed given\\.$#" count: 1 @@ -2035,11 +2025,6 @@ parameters: count: 1 path: libraries/classes/Controllers/Table/Structure/PartitioningController.php - - - message: "#^Parameter \\#1 \\$list of class PhpMyAdmin\\\\SqlParser\\\\Parser constructor expects PhpMyAdmin\\\\SqlParser\\\\TokensList\\|PhpMyAdmin\\\\SqlParser\\\\UtfString\\|string\\|null, mixed given\\.$#" - count: 1 - path: libraries/classes/Controllers/Table/Structure/PartitioningController.php - - message: "#^Parameter \\#1 \\$var of function count expects array\\|Countable, array\\\\|null given\\.$#" count: 1 @@ -2200,11 +2185,6 @@ parameters: count: 1 path: libraries/classes/Controllers/View/CreateController.php - - - message: "#^Parameter \\#1 \\$string of function substr expects string, mixed given\\.$#" - count: 1 - path: libraries/classes/Controllers/View/CreateController.php - - message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Statements\\\\CreateStatement\\:\\:\\$body \\(array\\\\|string\\) in isset\\(\\) is not nullable\\.$#" count: 1 @@ -5725,11 +5705,6 @@ parameters: count: 1 path: libraries/classes/Plugins/Auth/AuthenticationCookie.php - - - message: "#^Property PhpMyAdmin\\\\Plugins\\\\AuthenticationPlugin\\:\\:\\$user \\(string\\) in isset\\(\\) is not nullable\\.$#" - count: 1 - path: libraries/classes/Plugins/Auth/AuthenticationHttp.php - - message: "#^Method PhpMyAdmin\\\\Plugins\\\\Auth\\\\AuthenticationSignon\\:\\:setCookieParams\\(\\) has parameter \\$sessionCookieParams with no value type specified in iterable type array\\.$#" count: 1 @@ -8255,11 +8230,6 @@ parameters: count: 1 path: libraries/classes/Table.php - - - message: "#^Parameter \\#1 \\$list of class PhpMyAdmin\\\\SqlParser\\\\Parser constructor expects PhpMyAdmin\\\\SqlParser\\\\TokensList\\|PhpMyAdmin\\\\SqlParser\\\\UtfString\\|string\\|null, mixed given\\.$#" - count: 1 - path: libraries/classes/Table.php - - message: "#^Parameter \\#1 \\$string of function substr expects string, mixed given\\.$#" count: 2 diff --git a/psalm-baseline.xml b/psalm-baseline.xml index faac4a3864..49034582ea 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -768,7 +768,7 @@ - + $_SESSION['sql_history'] $_SESSION['sql_history'] $_SESSION['sql_history'] @@ -785,7 +785,6 @@ $foreign_table $foreign_table $one_key['index_list'] - $show_create_table $tableNameReplacements[$tableName] @@ -818,7 +817,7 @@ $foreign[$key] $one_key['ref_index_list'][$column_index] - + $child_references $column $columns @@ -840,7 +839,6 @@ $key $one_key $relations - $show_create_table $the_total $value $value @@ -1621,8 +1619,7 @@ - - $object->showCreate() + $selected @@ -3122,32 +3119,25 @@ $_REQUEST['pos'] - + $GLOBALS['disp_message'] ?? null $GLOBALS['disp_query'] ?? null + $GLOBALS['sql_query'] $row - + $GLOBALS['active_page'] $GLOBALS['disp_message'] $GLOBALS['disp_query'] + $GLOBALS['sql_query'] $row - - $GLOBALS['sql_query'] - - - $GLOBALS['sql_query'] - $selected $GLOBALS['goto'] - - isset($original_sql_query) - @@ -3741,12 +3731,6 @@ - - $createTable - - - $createTable - $stmt->partitions $stmt->partitions[0]->subpartitions @@ -4096,8 +4080,7 @@ $GLOBALS['view']['as'] - - $createView + $view['as'] $view['column_names'] $view['definer'] @@ -4106,7 +4089,7 @@ $view['name'] $view['name'] - + $GLOBALS['arr'] $GLOBALS['column_map'] $GLOBALS['item'] @@ -4126,7 +4109,6 @@ $GLOBALS['view_columns'] $GLOBALS['view_security_options'] $GLOBALS['view_with_options'] - $createView $view['algorithm'] @@ -4147,10 +4129,6 @@ $_GET['table'] $_GET['table'] - - empty($GLOBALS['view']['as']) && is_string($createView) - is_string($createView) - isset($stmt->body) @@ -6031,9 +6009,8 @@ (int) $GLOBALS['cfg']['LimitChars'] (int) $GLOBALS['cfg']['LimitChars'] - + empty($statementInfo->statement->from) - isset($sessionMaxRows) isset($meta->internalMediaType) @@ -7562,8 +7539,9 @@ $statement->set - - empty($diff) + + $diff !== [] + $diff !== [] @@ -9013,9 +8991,6 @@ $old_usr - - isset($this->user) - @@ -12546,11 +12521,6 @@ $row['#'] - - - 0 !== --$sortableColCount - - $config->getCookie('phpMyAdmin') @@ -12883,7 +12853,7 @@ $tableAutoIncrement ?? '' - + $GLOBALS['sql_auto_increments'] $GLOBALS['sql_indexes'] $_POST['constraint_name'][$masterFieldMd5] @@ -12894,7 +12864,6 @@ $column['Extra'] $column['Extra'] $column['Extra'] - $createTable $eachCol $eachCol $existrelForeign[$masterFieldMd5]['constraint'] @@ -13002,7 +12971,7 @@ $optionsArray[$existrelForeign[$masterFieldMd5]['on_delete'] ?? ''] $optionsArray[$existrelForeign[$masterFieldMd5]['on_update'] ?? ''] - + $GLOBALS['errorUrl'] $altered $altered @@ -13013,7 +12982,6 @@ $column $columns[$row['Field']] $constraintName - $createTable $currCreateTime $eachCol $exactRowsCached