From bd1850c060aad9209d804403d0f7c9d9235d6cdc Mon Sep 17 00:00:00 2001 From: Kamil Tekiela Date: Sat, 11 Mar 2023 23:18:34 +0000 Subject: [PATCH] Update baselines Signed-off-by: Kamil Tekiela --- phpstan-baseline.neon | 193 +----------------------------------- psalm-baseline.xml | 226 +++++------------------------------------- 2 files changed, 30 insertions(+), 389 deletions(-) diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 84168cadda..71fe08eb97 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -857,7 +857,7 @@ parameters: - message: "#^Casting to string something that's already string\\.$#" - count: 4 + count: 1 path: libraries/classes/ConfigStorage/Relation.php - @@ -1565,16 +1565,6 @@ parameters: count: 6 path: libraries/classes/Controllers/Database/StructureController.php - - - message: "#^Parameter \\#4 \\$formattedSize of method PhpMyAdmin\\\\Controllers\\\\Database\\\\StructureController\\:\\:getValuesForAriaTable\\(\\) expects int, string given\\.$#" - count: 1 - path: libraries/classes/Controllers/Database/StructureController.php - - - - message: "#^Parameter \\#6 \\$formattedOverhead of method PhpMyAdmin\\\\Controllers\\\\Database\\\\StructureController\\:\\:getValuesForAriaTable\\(\\) expects int, string given\\.$#" - count: 1 - path: libraries/classes/Controllers/Database/StructureController.php - - message: "#^Property PhpMyAdmin\\\\Controllers\\\\Database\\\\StructureController\\:\\:\\$tables type has no value type specified in iterable type array\\.$#" count: 1 @@ -2720,11 +2710,6 @@ parameters: count: 1 path: libraries/classes/Database/CentralColumns.php - - - message: "#^Method PhpMyAdmin\\\\Database\\\\CentralColumns\\:\\:makeConsistentWithList\\(\\) has parameter \\$selected_tables with no value type specified in iterable type array\\.$#" - count: 1 - path: libraries/classes/Database/CentralColumns.php - - message: "#^Method PhpMyAdmin\\\\Database\\\\CentralColumns\\:\\:syncUniqueColumns\\(\\) has parameter \\$field_select with no value type specified in iterable type array\\.$#" count: 1 @@ -3040,11 +3025,6 @@ parameters: count: 1 path: libraries/classes/Database/Qbe.php - - - message: "#^Parameter \\#2 \\$sortOrder of method PhpMyAdmin\\\\Database\\\\Qbe\\:\\:getSortOrderSelectCell\\(\\) expects int, null given\\.$#" - count: 1 - path: libraries/classes/Database/Qbe.php - - message: "#^Parameter \\#2 \\$table of method PhpMyAdmin\\\\DatabaseInterface\\:\\:getColumns\\(\\) expects string, string\\|null given\\.$#" count: 1 @@ -3795,11 +3775,6 @@ parameters: count: 1 path: libraries/classes/Display/Results.php - - - message: "#^Parameter \\#3 \\$total of method PhpMyAdmin\\\\Display\\\\Results\\:\\:setMessageInformation\\(\\) expects int, mixed given\\.$#" - count: 1 - path: libraries/classes/Display/Results.php - - message: "#^Parameter \\#5 \\$sortExpressionNoDirection of method PhpMyAdmin\\\\Display\\\\Results\\:\\:getTableHeaders\\(\\) expects array\\, array\\ given\\.$#" count: 1 @@ -3816,7 +3791,7 @@ parameters: path: libraries/classes/Display/Results.php - - message: "#^Parameter \\#9 \\$colVisibElement of method PhpMyAdmin\\\\Display\\\\Results\\:\\:getOrderLinkAndSortedHeaderHtml\\(\\) expects string, mixed given\\.$#" + message: "#^Parameter \\#9 \\$colVisibElement of method PhpMyAdmin\\\\Display\\\\Results\\:\\:getOrderLinkAndSortedHeaderHtml\\(\\) expects string\\|null, mixed given\\.$#" count: 1 path: libraries/classes/Display/Results.php @@ -4675,11 +4650,6 @@ parameters: count: 1 path: libraries/classes/Header.php - - - message: "#^Casting to string something that's already string\\.$#" - count: 1 - path: libraries/classes/Html/Generator.php - - message: "#^Method PhpMyAdmin\\\\Html\\\\Generator\\:\\:getDefaultFunctionForField\\(\\) has parameter \\$field with no value type specified in iterable type array\\.$#" count: 1 @@ -4875,11 +4845,6 @@ parameters: count: 6 path: libraries/classes/Import/SimulateDml.php - - - message: "#^Casting to string something that's already string\\.$#" - count: 1 - path: libraries/classes/Index.php - - message: "#^Method PhpMyAdmin\\\\Index\\:\\:__construct\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#" count: 1 @@ -5245,11 +5210,6 @@ parameters: count: 1 path: libraries/classes/InsertEdit.php - - - message: "#^Parameter \\#2 \\$keyId of method PhpMyAdmin\\\\InsertEdit\\:\\:showEmptyResultMessageOrSetUniqueCondition\\(\\) expects string, \\(int\\|string\\) given\\.$#" - count: 1 - path: libraries/classes/InsertEdit.php - - message: "#^Parameter \\#4 \\$data of method PhpMyAdmin\\\\ConfigStorage\\\\Relation\\:\\:foreignDropdown\\(\\) expects string, mixed given\\.$#" count: 1 @@ -5525,16 +5485,6 @@ parameters: count: 1 path: libraries/classes/Navigation/Nodes/Node.php - - - message: "#^Casting to bool something that's already bool\\.$#" - count: 1 - path: libraries/classes/Navigation/Nodes/Node.php - - - - message: "#^Casting to string something that's already string\\.$#" - count: 1 - path: libraries/classes/Navigation/Nodes/Node.php - - message: "#^Method PhpMyAdmin\\\\Navigation\\\\Nodes\\\\Node\\:\\:getData\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 @@ -5730,11 +5680,6 @@ parameters: count: 4 path: libraries/classes/Normalization.php - - - message: "#^Casting to string something that's already string\\.$#" - count: 1 - path: libraries/classes/Operations.php - - message: "#^Method PhpMyAdmin\\\\Operations\\:\\:copyTables\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 @@ -6665,16 +6610,6 @@ parameters: count: 1 path: libraries/classes/Plugins/Schema/Dia/RelationStatsDia.php - - - message: "#^Parameter \\#2 \\$master_table of class PhpMyAdmin\\\\Plugins\\\\Schema\\\\Eps\\\\RelationStatsEps constructor expects string, PhpMyAdmin\\\\Plugins\\\\Schema\\\\Eps\\\\TableStatsEps given\\.$#" - count: 1 - path: libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php - - - - message: "#^Parameter \\#4 \\$foreign_table of class PhpMyAdmin\\\\Plugins\\\\Schema\\\\Eps\\\\RelationStatsEps constructor expects string, PhpMyAdmin\\\\Plugins\\\\Schema\\\\Eps\\\\TableStatsEps given\\.$#" - count: 1 - path: libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php - - message: "#^Parameter \\#4 \\$masterField of method PhpMyAdmin\\\\Plugins\\\\Schema\\\\Eps\\\\EpsRelationSchema\\:\\:addRelation\\(\\) expects string, \\(int\\|string\\) given\\.$#" count: 1 @@ -6685,11 +6620,6 @@ parameters: count: 7 path: libraries/classes/Plugins/Schema/Eps/RelationStatsEps.php - - - message: "#^Casting to int something that's already int\\.$#" - count: 3 - path: libraries/classes/Plugins/Schema/Eps/TableStatsEps.php - - message: "#^Parameter \\#1 \\$x_from of method PhpMyAdmin\\\\Plugins\\\\Schema\\\\Eps\\\\Eps\\:\\:rect\\(\\) expects int, float\\|int given\\.$#" count: 2 @@ -6770,26 +6700,11 @@ parameters: count: 1 path: libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php - - - message: "#^Parameter \\#2 \\$master_table of class PhpMyAdmin\\\\Plugins\\\\Schema\\\\Pdf\\\\RelationStatsPdf constructor expects string, PhpMyAdmin\\\\Plugins\\\\Schema\\\\Pdf\\\\TableStatsPdf given\\.$#" - count: 1 - path: libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php - - message: "#^Parameter \\#2 \\$value of method PhpMyAdmin\\\\Pdf\\:\\:setAlias\\(\\) expects string, int given\\.$#" count: 2 path: libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php - - - message: "#^Parameter \\#4 \\$fontSize of class PhpMyAdmin\\\\Plugins\\\\Schema\\\\Pdf\\\\TableStatsPdf constructor expects int, null given\\.$#" - count: 3 - path: libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php - - - - message: "#^Parameter \\#4 \\$foreign_table of class PhpMyAdmin\\\\Plugins\\\\Schema\\\\Pdf\\\\RelationStatsPdf constructor expects string, PhpMyAdmin\\\\Plugins\\\\Schema\\\\Pdf\\\\TableStatsPdf given\\.$#" - count: 1 - path: libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php - - message: "#^Call to an undefined method object\\:\\:lineScale\\(\\)\\.$#" count: 7 @@ -6820,66 +6735,21 @@ parameters: count: 1 path: libraries/classes/Plugins/Schema/RelationStats.php - - - message: "#^Parameter \\#1 \\$table of method PhpMyAdmin\\\\Plugins\\\\Schema\\\\RelationStats\\:\\:getXy\\(\\) expects PhpMyAdmin\\\\Plugins\\\\Schema\\\\TableStats, string given\\.$#" - count: 2 - path: libraries/classes/Plugins/Schema/RelationStats.php - - message: "#^Call to an undefined method object\\:\\:printElementLine\\(\\)\\.$#" count: 7 path: libraries/classes/Plugins/Schema/Svg/RelationStatsSvg.php - - - message: "#^Call to function is_int\\(\\) with int will always evaluate to true\\.$#" - count: 2 - path: libraries/classes/Plugins/Schema/Svg/Svg.php - - - - message: "#^Casting to string something that's already string\\.$#" - count: 2 - path: libraries/classes/Plugins/Schema/Svg/Svg.php - - message: "#^Parameter \\#1 \\$table of method PhpMyAdmin\\\\Plugins\\\\Schema\\\\Svg\\\\SvgRelationSchema\\:\\:setMinMax\\(\\) expects PhpMyAdmin\\\\Plugins\\\\Schema\\\\Svg\\\\TableStatsSvg, PhpMyAdmin\\\\Plugins\\\\Schema\\\\Dia\\\\TableStatsDia\\|PhpMyAdmin\\\\Plugins\\\\Schema\\\\Eps\\\\TableStatsEps\\|PhpMyAdmin\\\\Plugins\\\\Schema\\\\Pdf\\\\TableStatsPdf\\|PhpMyAdmin\\\\Plugins\\\\Schema\\\\Svg\\\\TableStatsSvg given\\.$#" count: 1 path: libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php - - - message: "#^Parameter \\#1 \\$width of method PhpMyAdmin\\\\Plugins\\\\Schema\\\\Svg\\\\Svg\\:\\:startSvgDoc\\(\\) expects int, float\\|int given\\.$#" - count: 1 - path: libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php - - - - message: "#^Parameter \\#2 \\$height of method PhpMyAdmin\\\\Plugins\\\\Schema\\\\Svg\\\\Svg\\:\\:startSvgDoc\\(\\) expects int, float\\|int given\\.$#" - count: 1 - path: libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php - - - - message: "#^Parameter \\#2 \\$master_table of class PhpMyAdmin\\\\Plugins\\\\Schema\\\\Svg\\\\RelationStatsSvg constructor expects string, PhpMyAdmin\\\\Plugins\\\\Schema\\\\Dia\\\\TableStatsDia\\|PhpMyAdmin\\\\Plugins\\\\Schema\\\\Eps\\\\TableStatsEps\\|PhpMyAdmin\\\\Plugins\\\\Schema\\\\Pdf\\\\TableStatsPdf\\|PhpMyAdmin\\\\Plugins\\\\Schema\\\\Svg\\\\TableStatsSvg given\\.$#" - count: 1 - path: libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php - - - - message: "#^Parameter \\#3 \\$x of method PhpMyAdmin\\\\Plugins\\\\Schema\\\\Svg\\\\Svg\\:\\:startSvgDoc\\(\\) expects int, float\\|int given\\.$#" - count: 1 - path: libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php - - - - message: "#^Parameter \\#4 \\$foreign_table of class PhpMyAdmin\\\\Plugins\\\\Schema\\\\Svg\\\\RelationStatsSvg constructor expects string, PhpMyAdmin\\\\Plugins\\\\Schema\\\\Dia\\\\TableStatsDia\\|PhpMyAdmin\\\\Plugins\\\\Schema\\\\Eps\\\\TableStatsEps\\|PhpMyAdmin\\\\Plugins\\\\Schema\\\\Pdf\\\\TableStatsPdf\\|PhpMyAdmin\\\\Plugins\\\\Schema\\\\Svg\\\\TableStatsSvg given\\.$#" - count: 1 - path: libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php - - message: "#^Parameter \\#4 \\$masterField of method PhpMyAdmin\\\\Plugins\\\\Schema\\\\Svg\\\\SvgRelationSchema\\:\\:addRelation\\(\\) expects string, \\(int\\|string\\) given\\.$#" count: 1 path: libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php - - - message: "#^Parameter \\#4 \\$y of method PhpMyAdmin\\\\Plugins\\\\Schema\\\\Svg\\\\Svg\\:\\:startSvgDoc\\(\\) expects int, float\\|int given\\.$#" - count: 1 - path: libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php - - message: "#^Parameter \\#2 \\$x of method PhpMyAdmin\\\\Plugins\\\\Schema\\\\Svg\\\\Svg\\:\\:printElement\\(\\) expects int, float\\|int given\\.$#" count: 4 @@ -6937,7 +6807,7 @@ parameters: - message: "#^Casting to string something that's already string\\.$#" - count: 2 + count: 1 path: libraries/classes/Plugins/Transformations/Abs/DateFormatTransformationsPlugin.php - @@ -7057,7 +6927,7 @@ parameters: - message: "#^Casting to string something that's already string\\.$#" - count: 3 + count: 1 path: libraries/classes/Plugins/Transformations/Abs/SubstringTransformationsPlugin.php - @@ -7500,11 +7370,6 @@ parameters: count: 1 path: libraries/classes/Server/Plugins.php - - - message: "#^Casting to string something that's already string\\.$#" - count: 1 - path: libraries/classes/Server/Privileges.php - - message: "#^Foreach overwrites \\$sqlQuery with its value variable\\.$#" count: 1 @@ -7705,11 +7570,6 @@ parameters: count: 3 path: libraries/classes/Server/Privileges.php - - - message: "#^Parameter \\#6 \\$dbname of method PhpMyAdmin\\\\Server\\\\Privileges\\:\\:addUserAndCreateDatabase\\(\\) expects string, array\\|string\\|null given\\.$#" - count: 1 - path: libraries/classes/Server/Privileges.php - - message: "#^Possibly invalid array key type array\\\\|string\\|null\\.$#" count: 1 @@ -7720,11 +7580,6 @@ parameters: count: 1 path: libraries/classes/Server/Privileges.php - - - message: "#^Variable \\$userGroup on left side of \\?\\?\\= always exists and is not nullable\\.$#" - count: 1 - path: libraries/classes/Server/Privileges.php - - message: "#^Access to an uninitialized property PhpMyAdmin\\\\Server\\\\Status\\\\Data\\:\\:\\$config\\.$#" count: 1 @@ -8320,11 +8175,6 @@ parameters: count: 1 path: libraries/classes/Table.php - - - message: "#^Casting to string something that's already string\\.$#" - count: 5 - path: libraries/classes/Table.php - - message: "#^Foreach overwrites \\$trigger with its value variable\\.$#" count: 1 @@ -8480,11 +8330,6 @@ parameters: count: 1 path: libraries/classes/Table.php - - - message: "#^Parameter \\#1 \\$identifier of static method PhpMyAdmin\\\\Util\\:\\:backquote\\(\\) expects string\\|Stringable\\|null, \\(int\\|string\\) given\\.$#" - count: 2 - path: libraries/classes/Table.php - - message: "#^Parameter \\#1 \\$string of function substr expects string, mixed given\\.$#" count: 2 @@ -8590,11 +8435,6 @@ parameters: count: 1 path: libraries/classes/Theme/Theme.php - - - message: "#^Casting to bool something that's already bool\\.$#" - count: 1 - path: libraries/classes/Theme/ThemeManager.php - - message: "#^If condition is always true\\.$#" count: 1 @@ -8640,11 +8480,6 @@ parameters: count: 3 path: libraries/classes/Tracker.php - - - message: "#^Casting to string something that's already string\\.$#" - count: 1 - path: libraries/classes/Tracker.php - - message: "#^Foreach overwrites \\$logEntry with its value variable\\.$#" count: 1 @@ -8675,11 +8510,6 @@ parameters: count: 2 path: libraries/classes/Tracker.php - - - message: "#^Parameter \\#3 \\$version of static method PhpMyAdmin\\\\Tracker\\:\\:deactivateTracking\\(\\) expects string, int given\\.$#" - count: 1 - path: libraries/classes/Tracker.php - - message: "#^Property PhpMyAdmin\\\\Tracker\\:\\:\\$trackingCache type has no value type specified in iterable type array\\.$#" count: 1 @@ -8965,11 +8795,6 @@ parameters: count: 2 path: libraries/classes/TwoFactor.php - - - message: "#^Casting to string something that's already string\\.$#" - count: 2 - path: libraries/classes/Url.php - - message: "#^Method PhpMyAdmin\\\\Url\\:\\:getFromRoute\\(\\) has parameter \\$additionalParameters with no value type specified in iterable type array\\.$#" count: 1 @@ -9035,11 +8860,6 @@ parameters: count: 1 path: libraries/classes/Util.php - - - message: "#^Casting to int something that's already int\\\\|int\\<0, max\\>\\.$#" - count: 5 - path: libraries/classes/Util.php - - message: "#^For loop initial assignment overwrites variable \\$i\\.$#" count: 1 @@ -9145,11 +8965,6 @@ parameters: count: 1 path: libraries/classes/Util.php - - - message: "#^Casting to string something that's already string\\.$#" - count: 1 - path: libraries/classes/Utils/ForeignKey.php - - message: "#^Cannot cast mixed to int\\.$#" count: 1 diff --git a/psalm-baseline.xml b/psalm-baseline.xml index d0c50af288..128eb2d26a 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -458,7 +458,6 @@ $path $path $path - $path $keys @@ -509,7 +508,6 @@ $systemPath systemPaths[$systemPath]]]> $translatedPath - $translatedPath $userPrefsDisallow ?? [] $val $validators[$path] @@ -547,11 +545,13 @@ userprefsDisallow[$systemPath]]]> userprefsKeys[$path]]]> userprefsKeys[$systemPath]]]> - $validators[$path] $values[$path] $values[$path] $values[$systemPath] + + $values[$path] + $canonicalPath $errorList @@ -786,7 +786,6 @@ $foreign_db $foreign_db $foreign_field - $foreign_field $foreign_table $foreign_table @@ -883,11 +882,6 @@ (string) $table[1] - - (string) $data - (string) $db - (string) $table - @@ -1414,9 +1408,9 @@ - + $selected - + __construct @@ -1663,10 +1657,6 @@ - - $formattedOverhead - $formattedSize - @@ -1692,7 +1682,6 @@ $dbTable - $dbTable $overheadSize @@ -2876,7 +2865,7 @@ getParsedBodyParam('old_hostname', '')]]> getParsedBodyParam('old_username')]]> getParsedBodyParam('old_username', '')]]> - getParsedBodyParam('userGroup')]]> + getParsedBodyParam('userGroup', '')]]> getQueryParam('initial', '')]]> @@ -3052,7 +3041,6 @@ data->status['Connections']]]> data->status['Connections'] * $hourFactor]]> data->status['Max_used_connections']]]> - data->status['Uptime']]]> data->status['Bytes_received'] + $this->data->status['Bytes_sent']) * $hourFactor]]> @@ -3388,10 +3376,8 @@ $isUpload - $isUpload - $row_id $row_id @@ -3547,9 +3533,6 @@ $selected - - - @@ -3621,27 +3604,15 @@ - - - - - + + + + + - $column - $column - $column - $column - $column - $column - $column - $column - $column - $column - $column - $column $column $column $column @@ -3892,7 +3863,6 @@ $foreignDb - $foreignDb $foreignTable $html $preview_sql_data @@ -3970,7 +3940,6 @@ $multi_edit_salt[$key] ?? null $one_where_clause $relation_field - $relation_field $relation_field_value $totalAffectedRows $totalAffectedRows @@ -4185,7 +4154,6 @@ $column $column $column - $column @@ -4222,7 +4190,6 @@ $columns[$column] - $expressions[$column] $column @@ -4522,7 +4489,6 @@ - $columnName $columnName $columnName @@ -4534,7 +4500,6 @@ originalColumnTypes[$column_index]]]> $type $uniqueCondition - $uniqueCondition $key @@ -4567,6 +4532,7 @@ $dataLabel + $dataLabel @@ -5062,8 +5028,6 @@ $table $table - $table - $table $type @@ -5151,7 +5115,6 @@ $table $table $table - $table $type @@ -5502,9 +5465,6 @@ - - $sortOrder - criteriaTables]]> criteriaTables]]> @@ -5563,7 +5523,6 @@ - $checkedTables[$table] $checkedTables[$table] $finalized[$foreignTable] $finalized[$foreignTable] @@ -5579,8 +5538,10 @@ formAndOrCols[$lastWhere]]]> $tsize[$table] - $tsize[$table] + + $tsize[$table] + $clause @@ -5613,7 +5574,6 @@ $table $table $table - $tempSearchTables[] $tmpCriteria $uniqueColumns $value @@ -5643,9 +5603,6 @@ reset($candidateColumns) reset($candidateColumns) - - null - @@ -5677,6 +5634,9 @@ formAndOrRows)]]> + + formSortOrders[$newColumnCount] = $_POST['criteriaSortOrder'][$colInd]]]> + @@ -6418,7 +6378,6 @@ $sortExpressionNoDirection[$indexInExpression] $sqlQuery statement->from]]> - $total $whereClause $whereClause @@ -6556,7 +6515,6 @@ $highlightColumns[$identifier] $map[$oneField] - table]]]> $row[$i] $row[$i] $row[$i] @@ -6619,7 +6577,6 @@ $sqlQuery $sqlQueryAdd $tableCreateTime - $total $value orgtable]]]> properties['table']]]]> @@ -6675,7 +6632,6 @@ $editCopyUrlParams - $colVisibCurrent parser->list]]> parser->list]]> parser->list]]> @@ -6917,17 +6873,8 @@ $dbAlias $dbAlias - $dbAlias $table $table - $table - $table - $table - $table - $table - $table - $table - $view $dbSelect @@ -6974,15 +6921,10 @@ $val2 $val2 $value - $view - $views[] - $table - $table dumpBufferObjects[$objectName]]]> $tmpSelect - $view @@ -7793,9 +7735,6 @@ - - (string) $database - @@ -8091,9 +8030,6 @@ hasPrimary isPacked - - (string) $name - bool @@ -8212,7 +8148,6 @@ - $keyId $query $queryFields $thisUrlParams @@ -8725,8 +8660,6 @@ $displayName - (bool) $isGroup - (string) $name (string) $prefix @@ -8852,7 +8785,6 @@ $key $table $table - $table $key]]> $key]]> $totalRows @@ -8928,7 +8860,6 @@ $foreignTable - $foreignTable $oldPriv $query @@ -9075,9 +9006,6 @@ - - (string) $packKeys - $copyMode @@ -9463,10 +9391,6 @@ $row[0] $table_alias $table_alias - $table_alias - $table_alias - $table_alias - $table_alias bool @@ -10165,7 +10089,6 @@ $db_charset $db_collation $table - $table @@ -10178,9 +10101,6 @@ - - $result[$table] - $code @@ -10190,6 +10110,14 @@ $table $trigger + + $table + $table + $table + + + $result[$table] + $table_alias @@ -11233,14 +11161,6 @@ - - tables[$foreignTable]]]> - tables[$masterTable]]]> - - - tables[$foreignTable]]]> - tables[$masterTable]]]> - $one_field @@ -11332,11 +11252,6 @@ $height - - (int) $fontSize - (int) $fontSize - (int) $fontSize - @@ -11412,13 +11327,7 @@ diagram->PageNo()]]> diagram->PageNo()]]> - tables[$foreignTable]]]> - tables[$masterTable]]]> - - tables[$foreignTable]]]> - tables[$masterTable]]]> - $field_name $field_name @@ -11435,8 +11344,6 @@ $table $table $table - $table - $table diagram->customLinks['RT']['-']]]> diagram->customLinks['doc'][$table][$field_name]]]> diagram->customLinks['doc'][$table]['-']]]> @@ -11479,9 +11386,7 @@ diagram->customLinks['doc'][$table]['-']]]> - $comments[$field_name] - $mime_map[$field_name] diagram->customLinks['RT'][$table]]]> diagram->customLinks['RT'][$table][$field_name]]]> @@ -11520,11 +11425,6 @@ $table $table - - null - null - null - @@ -11640,10 +11540,6 @@ - - $foreign_table - $master_table - $pos @@ -11723,10 +11619,6 @@ - - is_int($height) - is_int($width) - printElementLine @@ -11734,21 +11626,11 @@ $author $title - - (string) $styles - (string) $styles - showColor]]> - tables[$foreignTable]]]> - tables[$masterTable]]]> - - tables[$foreignTable]]]> - tables[$masterTable]]]> - $one_field @@ -11780,10 +11662,6 @@ tables[$table]]]> - xMax + $border]]> - xMin - $border]]> - yMax + $border]]> - yMin - $border]]> tableDraw @@ -11857,7 +11735,6 @@ (string) $buffer - (string) $buffer @@ -11947,8 +11824,6 @@ (string) $buffer - (string) $buffer - (string) $buffer @@ -12482,9 +12357,6 @@ escapeString escapeString - - - @@ -12557,14 +12429,12 @@ - - $sqlQuery[0] $sqlQuery[0] @@ -12673,7 +12543,6 @@ - $dbname $eachUser $hashedPassword $oldUserGroup @@ -12693,7 +12562,6 @@ - $dbname $dbname[0] $oldUserGroup @@ -12748,15 +12616,9 @@ $alterUserQuery $alterUserQuery - - (string) $privs - - - $userGroup - @@ -13022,8 +12884,6 @@ $date $date $version - $version - $version releases]]> @@ -13353,8 +13213,6 @@ $foreignField $indexedCols $masterField - $where - $where dbName][$this->name]]]> @@ -13568,13 +13426,6 @@ - - (string) $defaultValue - (string) $defaultValue - (string) $defaultValue - (string) $defaultValue - (string) $tableName - return $sqlQuery; @@ -13785,9 +13636,6 @@ issetCookie issetCookie - - (bool) $perServer - $configThemeExists @@ -13839,9 +13687,6 @@ escapeString escapeString - - (int) $version - 1 - @@ -13924,9 +13769,6 @@ getTableName - - (string) $version - @@ -14154,10 +13996,6 @@ get getCookie - - (string) $db - (string) $table - @@ -14360,18 +14198,6 @@ - - (int) $timestamp - (int) $timestamp - (int) $timestamp - (int) $timestamp - (int) $timestamp - - - - - (string) $engine -