diff --git a/composer.json b/composer.json index b6bb17ee25..af9d0c182a 100644 --- a/composer.json +++ b/composer.json @@ -101,7 +101,7 @@ "samyoul/u2f-php-server": "^1.1", "symfony/console": "^5.2.3", "tecnickcom/tcpdf": "^6.4.2", - "vimeo/psalm": "^4.8.1" + "vimeo/psalm": "^4.9.1" }, "extra": { "branch-alias": { diff --git a/psalm-baseline.xml b/psalm-baseline.xml index dc404d2466..3b1a1b5bc7 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -1,5 +1,5 @@ - + $isMinimumCommon @@ -25,6 +25,9 @@ $rule['test'] $this->variables['version'] + + (array) Util::formatByteDown($value, $limes, $comma) + $rule['formula'] $rule['id'] @@ -297,6 +300,9 @@ $state['Collation'] ?? '' $state['Pad_attribute'] ?? '' + + $suffixes + $name @@ -356,10 +362,6 @@ getPathname isFile - - $config - $dbi - @@ -467,28 +469,6 @@ $urlParams['table'] $userLink - - $PMA_PHP_SELF - $auth_plugin - $back - $cfg - $config - $containerBuilder - $db - $dbi - $errorHandler - $goto - $isConfigLoading - $request - $route - $server - $sql_query - $table - $theme - $token_mismatch - $token_provided - $urlParams - @@ -629,10 +609,6 @@ ThemeManager - - $isConfigLoading - $isConfigLoading - @@ -920,9 +896,6 @@ $valueDefault $valueDefaultJs - - $values[$path] - $userprefsDisallow @@ -1265,11 +1238,6 @@ $columnDefault $message - - $message - $num_cols - $pos - @@ -1308,7 +1276,8 @@ - + + $_GET['db'] $_GET['db'] $_GET['db'] $_POST['DB1'] @@ -1343,30 +1312,51 @@ $_POST['table'] $_POST['value'] $cfg['DefaultTabDatabase'] + $db + $db + $display_page $display_page $display_page $html $page + $position['dbName'] + $position['tableName'] + $sub_part ?? '' $success ['db' => $db] - + $cfg['DefaultTabDatabase'] + $position['dbName'] + $position['dbName'] + $position['tableName'] + $position['tableName'] - + $display_page $page + $params['db'] + $position - + + $position['dbName'] + $position['tableName'] + + + $_GET['db'] $display_page $display_page $page + $selected_page $tab_pos + + $_GET['db'] + @@ -1382,23 +1372,6 @@ $cfg['DefaultTabDatabase'] - - $errorUrl - $errors - $num_tables - $num_tables - $pos - $pos - $sub_part - $tables - $tables - $tooltip_aliasname - $tooltip_aliasname - $tooltip_truename - $tooltip_truename - $total_num_tables - $total_num_tables - @@ -1440,21 +1413,6 @@ '' - - $errorUrl - $num_tables - $pos - $pos - $sub_part - $sub_part - $tables - $tooltip_aliasname - $tooltip_aliasname - $tooltip_truename - $tooltip_truename - $total_num_tables - $total_num_tables - @@ -1488,23 +1446,6 @@ get get - - $SESSION_KEY - $errorUrl - $num_tables - $num_tables - $pos - $pos - $sub_part - $tables - $tables - $tooltip_aliasname - $tooltip_aliasname - $tooltip_truename - $tooltip_truename - $total_num_tables - $total_num_tables - @@ -1590,34 +1531,6 @@ $data - - $db_collation - $errorUrl - $errorUrl - $export_sql_plugin - $is_information_schema - $local_query - $move - $num_tables - $num_tables - $pos - $pos - $reload - $sqlConstratints - $sql_query - $sub_part - $sub_part - $tables - $tables - $tables_full - $tooltip_aliasname - $tooltip_aliasname - $tooltip_truename - $tooltip_truename - $total_num_tables - $total_num_tables - $views - @@ -1663,27 +1576,6 @@ '' - - $currentSearchId - $errorUrl - $goto - $num_tables - $num_tables - $pos - $pos - $savedSearch - $savedSearchList - $sub_part - $sub_part - $tables - $tables - $tooltip_aliasname - $tooltip_aliasname - $tooltip_truename - $tooltip_truename - $total_num_tables - $total_num_tables - @@ -1710,24 +1602,6 @@ $item $type - - $errorUrl - $errors - $num_tables - $num_tables - $pos - $pos - $sub_part - $tables - $tables - $tooltip_aliasname - $tooltip_aliasname - $tooltip_truename - $tooltip_truename - $total_num_tables - $total_num_tables - $urlParams - @@ -1746,22 +1620,6 @@ $urlParams['goto'] - - $errorUrl - $num_tables - $num_tables - $pos - $pos - $sub_part - $tables - $tables - $tooltip_aliasname - $tooltip_aliasname - $tooltip_truename - $tooltip_truename - $total_num_tables - $total_num_tables - @@ -1775,9 +1633,6 @@ $db $tableName - - $sql_autocomplete - @@ -1791,11 +1646,6 @@ $cfg['DefaultTabDatabase'] - - $back - $errorUrl - $goto - @@ -2137,25 +1987,9 @@ $tables $totalNumTables - - $errorUrl - $errorUrl - $errorUrl + $key $keyname - $message - $message - $message - $message - $message - $message - $message - $message - $message - $sql_query - $sql_query - $sql_query - $sql_query @@ -2209,23 +2043,6 @@ '' - - $data - $errorUrl - $num_tables - $pos - $pos - $sub_part - $sub_part - $tables - $tables - $tooltip_aliasname - $tooltip_aliasname - $tooltip_truename - $tooltip_truename - $total_num_tables - $total_num_tables - @@ -2244,24 +2061,6 @@ $cfg['DefaultTabDatabase'] $cfg['DefaultTabTable'] - - $errorUrl - $errors - $num_tables - $num_tables - $pos - $pos - $sub_part - $tables - $tables - $tooltip_aliasname - $tooltip_aliasname - $tooltip_truename - $tooltip_truename - $total_num_tables - $total_num_tables - $urlParams - @@ -2383,38 +2182,6 @@ $file_handle - - $active_page - $aliases - $asfile - $back_button - $buffer_needed - $compression - $compression_methods - $crlf - $do_comments - $do_dates - $do_mime - $do_relation - $errorUrl - $export_plugin - $file_handle - $filename - $mime_type - $num_tables - $onserver - $output_charset_conversion - $output_kanji_conversion - $quick_export - $refreshButton - $save_filename - $save_on_server - $separate_files - $tables - $time_start - $what - $whatStrucOrData - @@ -2459,22 +2226,6 @@ mb_strpos($_POST['value'], '(') - - $data - $geom_count - $geom_type - $gis_data - $gis_obj - $gis_types - $open_layers - $result - $srid - $start - $visualization - $visualizationSettings - $wkt - $wkt_with_zero - @@ -2546,13 +2297,8 @@ $this->config->get('TempDir') - - $collation_connection + $collationsList - $db - $errorUrl - $show_query - $table @@ -2713,47 +2459,9 @@ $finished $timeout_passed - - $MAX_FILE_SIZE - $active_page - $ajax_reload - $bookmark_created - $charset_conversion - $charset_of_file - $display_query - $error - $errorUrl - $executed_queries - $finished - $format - $go_sql - $import_file_name - $import_text - $import_type - $is_js_confirmed + $key - $local_import_file - $max_sql_len - $maximum_time - $memory_limit - $message_to_show - $msg - $noplugin - $offset - $read_limit - $read_multiply - $reload - $reset_charset - $result - $run_query - $show_as_php - $skip_queries $special_message - $sql_data - $sql_query_disabled - $timeout_passed - $timestamp - $urlParams @@ -2764,15 +2472,6 @@ $_SESSION['Import_message']['message'] - - $SESSION_KEY - $SESSION_KEY - $plugins - $plugins - $timestamp - $upload_id - $upload_id - @@ -2891,12 +2590,6 @@ $tabHash - - $cf - $error - $hash - $tabHash - @@ -2912,12 +2605,6 @@ $tabHash - - $cf - $error - $hash - $tabHash - @@ -2933,12 +2620,6 @@ $tabHash - - $cf - $error - $hash - $tabHash - @@ -2954,12 +2635,6 @@ $tabHash - - $cf - $error - $hash - $tabHash - @@ -2999,18 +2674,6 @@ $json - - $all_ok - $cf - $error - $filename - $form_display - $json - $new_config - $params - $query - $return_url - @@ -3026,12 +2689,6 @@ $tabHash - - $cf - $error - $hash - $tabHash - @@ -3047,12 +2704,6 @@ $tabHash - - $cf - $error - $hash - $tabHash - @@ -3070,9 +2721,6 @@ $_POST['export_type'] - - $cfgRelation - @@ -3099,9 +2747,6 @@ $cfg['MaxRows'] $cfg['MaxRows'] - - $errorUrl - @@ -3112,8 +2757,12 @@ $cfg['Server'] $cfg['Server'] - + + $this->collations[$charset->getName()] + + $this->charsets + $this->collations[$charset->getName()] @@ -3228,12 +2877,7 @@ 0 - - $db - $errorUrl - $errorUrl - $reload - $selected + $sqlQuery $sqlQuery @@ -3247,10 +2891,6 @@ $page - - $errorUrl - $errorUrl - @@ -3265,10 +2905,6 @@ $GLOBALS['single_table'] $select_item - - $errorUrl - $select_item - @@ -3295,15 +2931,6 @@ get get - - $SESSION_KEY - $errorUrl - - - - - $errorUrl - @@ -3364,6 +2991,9 @@ $username ?? '' $username ?? null + + $queries + $GLOBALS['cfgRelation']['menuswork'] @@ -3402,41 +3032,8 @@ '' - - $db_and_table - $db_and_table - $dbname - $dbname_is_wildcard - $errorUrl - $export - $hostname - $itemType + $key - $num_tables - $num_tables - $password - $pos - $pos - $post_patterns - $queries - $queries_for_display - $ret_message - $ret_queries - $routinename - $sql_query - $sub_part - $sub_part - $tablename - $tables - $tables - $title - $tooltip_aliasname - $tooltip_aliasname - $tooltip_truename - $tooltip_truename - $total_num_tables - $total_num_tables - $username @@ -3444,14 +3041,6 @@ $_POST['master_connection'] ?? null $replicaInfo['status'] - - $errorUrl - - - - - $errorUrl - @@ -3461,14 +3050,6 @@ $params['varName'] $params['varValue'] - - $errorUrl - $errorUrl - $errorUrl - $errorUrl - $errorUrl - $errorUrl - @@ -3491,9 +3072,6 @@ $params['sort_order'] Util::backquote($params['order_by_field']) - - $errorUrl - @@ -3515,9 +3093,6 @@ $value $value - - $errorUrl - @@ -3539,6 +3114,7 @@ $this->data->status['Uptime'] ($this->data->status['Bytes_received'] + $this->data->status['Bytes_sent']) * $hourFactor + $hourFactor $hourFactor @@ -3559,9 +3135,6 @@ $this->data->status['Uptime'] - - $errorUrl - @@ -3589,8 +3162,7 @@ $sectionLinks $sectionName - - $errorUrl + $linkName @@ -3640,12 +3212,14 @@ $varValue[1] $varValue[1] - + $name $name $name $name $name + Util::formatByteDown($value, 3, 3) + Util::formatByteDown($varValue[1], 3, 3) $serverVarsSession[$arr[0]] @@ -3666,9 +3240,6 @@ $varValue[1] $varValue[1] - - $errorUrl - @@ -3805,11 +3376,6 @@ $_POST['bkm_fields']['bkm_label'] $errorUrl - - $is_gotofile - $table_from_sql - $unlim_num_rows - @@ -3840,15 +3406,6 @@ $_POST['field_where'] $mimetype - - $action - $active_page - $errorUrl - $message - $num_fields - $result - $sql_query - @@ -3926,40 +3483,14 @@ $GLOBALS['goto'] $jsvkey - - $GLOBALS['goto'] - $urlParams $biggest_max_file_size > 0 - - $active_page - $after_insert - $biggest_max_file_size - $chg_evt_handler - $columns_cnt - $comments_map - $current_result - $errorUrl - $found_unique_key - $has_blob_field + $i - $insert_mode - $jsvkey - $o_rows - $result - $rows - $tabindex - $tabindex_for_value - $table_columns - $timestamp_seen - $vkey - $where_clause - $where_clause_array - $where_clauses @@ -4016,11 +3547,8 @@ $key - + $data_row_number - $errorUrl - $errorUrl - $urlParams @@ -4045,12 +3573,6 @@ $mimetype $result - - $action - $num_fields - $result - $sql_query - @@ -4083,13 +3605,6 @@ $selected $sql_query - - $active_page - $disp_message - $disp_query - $errorUrl - $urlParams - @@ -4101,10 +3616,6 @@ $selected - - $errorUrl - $urlParams - @@ -4138,8 +3649,9 @@ $table $unlim_num_rows - + $urlParams + $where_clause $cfg['DefaultTabTable'] @@ -4153,13 +3665,8 @@ $i_where_clause $where_clause[] - - $active_page - $errorUrl + $i - $single_table - $urlParams - $where_clause @@ -4246,10 +3753,6 @@ is_array($result) - - $errorUrl - $urlParams - @@ -4316,9 +3819,6 @@ $visualization - - $errorUrl - @@ -4350,11 +3850,6 @@ get get - - $SESSION_KEY - $errorUrl - $urlParams - @@ -4392,12 +3887,8 @@ $_POST['added_fields'] - - $errorUrl - $errorUrl + $sql_query - $urlParams - $urlParams @@ -4453,6 +3944,9 @@ $table $warning_messages + + $table_alters + $GLOBALS['cfg']['MaxDbList'] $GLOBALS['cfg']['Server'] @@ -4481,28 +3975,6 @@ $GLOBALS['dblist']->databases - - $auto_increment - $columns - $comment - $create_options - $errorUrl - $hideOrderTable - $indexes - $lowerCaseNames - $new_tbl_storage_engine - $notNull - $reload - $reread_info - $row_format - $show_comment - $table_alters - $table_info_num_rows - $tbl_collation - $tbl_is_view - $tbl_storage_engine - $urlParams - @@ -4785,36 +4257,6 @@ $val - - $active_page - $disp_message - $disp_query - $errorUrl - $error_messages - $func_no_param - $func_optional_param - $gis_from_text_functions - $gis_from_wkb_functions - $goto_include - $insert_errors - $is_insert - $is_insertignore - $last_messages - $loop_array - $message - $mime_map - $query - $query_fields - $query_values - $return_to_sql_query - $row_skipped - $total_affected_rows - $unsaved_values - $urlParams - $using_key - $value_sets - $warning_messages - @@ -4870,10 +4312,6 @@ (int) $fields_meta[$i]->length - - $errorUrl - $urlParams - @@ -4889,11 +4327,6 @@ $cfg['DefaultTabTable'] - - $back - $errorUrl - $goto - @@ -5015,7 +4448,8 @@ Util::getValueByKey($_POST, "field_virtuality.${i}", '') Util::getValueByKey($_POST, "field_virtuality_orig.${i}", '') - + + $fields $urlParams $url_params @@ -5222,27 +4656,8 @@ ! is_array($row) - - $action + $db - $errorUrl - $errorUrl - $num_fields - $reload - $reread_info - $showtable - $sql_query - $sql_query - $sql_query - $sql_query - $sql_query - $sql_query - $sql_query - $table_info_num_rows - $tbl_collation - $tbl_is_view - $tbl_storage_engine - $urlParams @@ -5297,20 +4712,6 @@ $GLOBALS['db'] $GLOBALS['table'] - - $data - $entries - $errorUrl - $filter_ts_from - $filter_ts_to - $filter_users - $msg - $selection_both - $selection_data - $selection_schema - $sql_result - $urlParams - @@ -5329,24 +4730,6 @@ $cfg['DefaultTabDatabase'] $cfg['DefaultTabTable'] - - $errorUrl - $errors - $num_tables - $num_tables - $pos - $pos - $sub_part - $tables - $tables - $tooltip_aliasname - $tooltip_aliasname - $tooltip_truename - $tooltip_truename - $total_num_tables - $total_num_tables - $urlParams - @@ -5436,10 +4819,6 @@ (int) $fields_meta[$i]->length - - $errorUrl - $urlParams - @@ -5532,21 +4911,8 @@ Util::backquote($table) Util::backquote($table) - - $default_ct - $destHeight - $destImage - $destWidth + $key - $mime_type - $ratioHeight - $ratioWidth - $request_params - $row - $size_params - $srcHeight - $srcImage - $srcWidth @@ -5573,10 +4939,6 @@ getDisplay - - $change_password_message - $password - @@ -5660,24 +5022,6 @@ isset($stmt->body) - - $arr - $column_map - $errorUrl - $item - $message - $new_transformations_sql - $parts - $pma_transformation_data - $sep - $sql_query - $systemDb - $view - $view_algorithm_options - $view_columns - $view_security_options - $view_with_options - @@ -5691,11 +5035,6 @@ $cfg['DefaultTabTable'] - - $errorUrl - $reload - $urlParams - @@ -5837,6 +5176,10 @@ $partition $subpartition + + $definitions + $indexFields + $_POST['field_attribute'][$i] $_POST['field_default_type'][$i] @@ -5974,9 +5317,10 @@ $table $type - + $field $field + [$extra, $attribute] $GLOBALS['cfg']['CharEditing'] @@ -6537,9 +5881,12 @@ $whereClauseColumns $whereClauseTables - + + $selectClauses $table $table + array_map([Util::class, 'backquote'], $searchTables) + array_map([Util::class, 'backquote'], $unfinalized) $_POST['Or' . $rowIndex][$columnIndex] @@ -6830,9 +6177,13 @@ Util::getSupportedDatatypes() Util::getSupportedDatatypes() - + $itemParamDir $itemParamName + $options + $options + $stmt->return->parameters + $value $GLOBALS['cfg']['Server'] @@ -7787,11 +7138,12 @@ $wkbval empty($field->database) ? $this->properties['db'] : $field->database - + $analyzedSqlResults $index $index $linkingUrlParams + $sortExpression $urlParams @@ -8185,10 +7537,9 @@ $columnIndex - + $key $relDb - $row @@ -8263,6 +7614,7 @@ $status['Innodb_buffer_pool_wait_free'] $status['Innodb_buffer_pool_write_requests'] + $value @@ -8457,6 +7809,11 @@ $table $view + + $dbSelect + $nonGeneratedCols + $nonGeneratedCols + $aliases[$dbName]['alias'] $aliases[$dbName]['tables'] @@ -8518,16 +7875,10 @@ $GLOBALS['dblist']->databases - - $dbSelect - $line $line - - $active_page - @@ -9559,6 +8910,9 @@ $offset + ($position * 20) $offset + ($position * 4) + + $commit + $commit $dataline @@ -9630,6 +8984,9 @@ $tempTitle $value + + $params + $GLOBALS['cfg']['AllowThirdPartyFraming'] $GLOBALS['cfg']['AllowThirdPartyFraming'] @@ -9688,7 +9045,7 @@ - + $GLOBALS['cfg']['DefaultTabDatabase'] $GLOBALS['cfg']['MysqlSslWarningSafeHosts'] $GLOBALS['db'] @@ -9708,6 +9065,7 @@ $queryBase $queryBase $result + $result $sqlQuery $sqlQuery $sqlQuery @@ -9723,7 +9081,8 @@ $tmp $value - + + $classes $key $urlParams $urlParams @@ -9756,12 +9115,13 @@ $_SESSION['tmpval']['max_rows'] $_SESSION['tmpval']['pos'] - + $alt $database $defaultFunction $defaultFunction $defaultFunction + $meta $paramValue $queryBase $result @@ -9778,20 +9138,25 @@ $urlParams['table'] $value $value + $value - - string + string getDisplay - + $GLOBALS['using_bookmark_message']->getDisplay() $attributes['class'] + $meta->name $sqlQuery $value + $value + + $meta->name + $defaultFunction @@ -9895,6 +9260,11 @@ Util::backquote($table[self::TBL_NAME]) Util::backquote($table[self::TBL_NAME]) + + $columns + $tableReferences + $tableReferences + $analyses[$i][self::FORMATTEDSQL][$colCount] $analyses[$i][self::SIZES] @@ -10067,15 +9437,6 @@ ! is_array($table) - - $db - $error - $import_notice - $msg - $read_multiply - $reload - $result - @@ -10298,12 +9659,15 @@ $whereClause min(max($column['len'], 4), $GLOBALS['cfg']['LimitChars']) - + $keyId + $query + $queryFields $thisUrlParams $thisUrlParams $urlParams $urlParams + $valueSets $GLOBALS['cfg']['CharEditing'] @@ -11635,11 +10999,13 @@ Util::backquote(explode(', ', $key)) Util::backquote(explode(',', $primaryColumns)) - + + $colList $column $column $column $column + $dependents $key $key $key @@ -12190,11 +11556,8 @@ SelectPropertyItem TextPropertyItem - + $not_subgroup_header - $plugin_param - $plugin_param - $plugin_param @@ -12356,10 +11719,6 @@ $val - - $conn_error - $conn_error - @@ -12587,10 +11946,6 @@ $what $what - - $csv_enclosed - $csv_escaped - @@ -13131,6 +12486,17 @@ $trigger['create'] Util::backquote($db) + + $autoIncrement + $constraints + $dropped + $fieldSet + $indexes + $indexesFulltext + $values + $values + $values + $aliases[$oldDatabase]['tables'] $cfgRelation['mimework'] @@ -13376,13 +12742,8 @@ $crlf - + $autoIncrement - $crlf - $current_row - $sql_constraints_query - $sql_drop_foreign_keys - $sql_indexes_query @@ -14046,13 +13407,8 @@ $analyze ImportCsv - - $error - $error + $key - $message - $message - $message @@ -14085,9 +13441,6 @@ $tmp[0] - - $finished - @@ -14250,11 +13603,7 @@ ImportShp - - $eof - $error - $finished - $message + $null_param @@ -14262,6 +13611,9 @@ $_POST['sql_delimiter'] + + $sql_modes + $values[$val] @@ -14439,12 +13791,9 @@ - + $output - - - $output - + @@ -15056,12 +14405,9 @@ is_int($height) is_int($width) - + $output - - - $output - + (string) $styles (string) $styles @@ -15688,6 +15034,9 @@ Util::backquote($oldIndexName) Util::backquote($tableName) + + $escapedTableOrTables + Util::backquote($database) Util::backquote($database) @@ -15866,8 +15215,10 @@ $tableRes $tablesRows - + + $bottom $params + $top uksort($foreign, 'strnatcasecmp') usort($tables, 'strnatcasecmp') @@ -16731,7 +16082,22 @@ Core::ifSetOr($dbname, is_array($dbname) ? $dbname[0] : '*', 'length') Core::ifSetOr($tablename, '*', 'length') - + + $queries + $this->extractPrivInfo($privs, true) + $this->extractPrivInfo($row) + $this->extractPrivInfo($row, true) + $this->extractPrivInfo($row, true) + $this->extractPrivInfo() + $this->extractPrivInfo() + $this->extractPrivInfo() + $this->extractPrivInfo(null, true) + $this->extractPrivInfo(null, true) + $tmpPrivs1 + $tmpPrivs2['Insert'] + $tmpPrivs2['References'] + $tmpPrivs2['Select'] + $tmpPrivs2['Update'] uksort($arrayInitials, 'strnatcasecmp') @@ -17184,6 +16550,7 @@ $statusVars $temp + $cpuload['busy'] $cpuload['idle'] @@ -17324,26 +16691,40 @@ $result $result + + $tabNames + $userGroups[$groupName] $userGroups[$groupName] $userGroups[$groupName] - + $groupName $key $result $result $result + $tab + $tab + $tab + $tabDetail['tab'] + $tabDetail['tab_name'] + $tabGroup + $tabGroupName + $tabName + $tabName + $tabName + $tabNames[] $userGroups[$groupName][$row['tab']] $user['user'] $value - - string - string - - + + $tab + $tab + $tab + $tabGroupName Util::backquote($cfgRelation['db']) Util::backquote($cfgRelation['db']) Util::backquote($cfgRelation['db']) @@ -17362,6 +16743,9 @@ $tabs $tabs + + $tabName + @@ -17993,7 +17377,18 @@ Util::backquote($this->name) Util::backquote('row_count') - + + $field + $foreignField + $indexFields + $indexedCols + $masterField + $newParts + $nonGeneratedCols + $nonGeneratedCols + $selectParts + $selectParts + $uniqueFields $where $where @@ -18552,6 +17947,9 @@ $value Util::backquote($_POST['columnsToDisplay']) + + $values + $_POST['criteriaColumnNames'][$column_index] $_POST['criteriaColumnTypes'][$column_index] @@ -18833,9 +18231,6 @@ '' - - $sql_backquotes - @@ -19255,7 +18650,8 @@ $user $val - + + $columnNames $tableName $tableName uksort($tables, 'strnatcasecmp') @@ -19739,15 +19135,6 @@ $val $val - - $cfg - $cfg - $config - $containerBuilder - $dbi - $lang - $theme - @@ -19910,9 +19297,6 @@ $filesFound $filesInfos - - $config - @@ -20144,11 +19528,6 @@ $cfg['Server'] - - $PMA_PHP_SELF - $db - $server - @@ -20228,9 +19607,6 @@ [$currentTable, , , , , , $sumSize] [$currentTable] - - $is_db - @@ -20251,11 +19627,6 @@ $GLOBALS['cfg']['Server'] - - $db - $sql_query - $table - @@ -20325,10 +19696,6 @@ $cfg['AllowUserDropDatabase'] $cfg['ShowCreateDb'] - - $dblist - $is_create_db_priv - @@ -20380,9 +19747,6 @@ $GLOBALS['cfg']['Server'] $GLOBALS['cfg']['Server'] - - $cached_affected_rows - @@ -20510,12 +19874,6 @@ $cfg['Server'] - - $PMA_PHP_SELF - $db - $server - $table - @@ -20840,9 +20198,6 @@ array array - - $errors - @@ -20883,9 +20238,6 @@ array array - - $errors - @@ -20913,9 +20265,6 @@ array array - - $errors - @@ -21036,11 +20385,6 @@ array array - - $db - $dbi - $table - @@ -21381,9 +20725,6 @@ array - - $cfg - @@ -21413,11 +20754,6 @@ testSkipByteOrderMarksFromContents - - $maximum_time - $timeout_passed - $timestamp - @@ -21894,12 +21230,6 @@ assertIsArray - - - $db - $table - - $arr->getPDFData() @@ -22405,11 +21735,6 @@ $GLOBALS['import_file_name'] $GLOBALS['import_file_name'] - - $sql_query_disabled - $sql_query_disabled - $sql_query_disabled - @@ -22437,18 +21762,6 @@ assertTrue - - $import_file - $ldi_enclosed - $ldi_ignore - $ldi_local_option - $ldi_new_line - $ldi_replace - $ldi_terminated - $skip_queries - $sql_query_disabled - $sql_query_disabled - @@ -22471,10 +21784,6 @@ array - - $sql_query_disabled - $sql_query_disabled - @@ -22487,10 +21796,6 @@ assertFalse - - $sql_query_disabled - $sql_query_disabled - @@ -22500,9 +21805,6 @@ $GLOBALS['cfg']['Server'] - - $sql_query_disabled - @@ -22538,10 +21840,6 @@ array array - - $fields_meta - $row - @@ -22550,11 +21848,6 @@ assertIsArray - - - $server - - 'subGroupHeader123' @@ -22749,6 +22042,9 @@ $sql_query $title + + $this->serverPrivileges->extractPrivInfo(null, true) + $GLOBALS['cfg']['DefaultTabDatabase'] $GLOBALS['cfg']['DefaultTabTable'] @@ -22827,9 +22123,8 @@ $GLOBALS['dbi']->escapeString($username) $GLOBALS['dbi']->escapeString($username) - + $password - $route $routinename $routinename $routinename @@ -23161,9 +22456,6 @@ array - - $theme - @@ -23499,12 +22791,6 @@ $_SESSION['cache']['server_server'] $_SESSION['cache']['server_server'] - - $server - $server - $server - $server -