gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #19446 from kamil-tekiela/errorUrl

Browse Source 
Removal of $GLOBALS['errorUrl']
This commit is contained in:
Maurício Meneghini Fauth 2024-12-13 19:12:29 -03:00 committed by GitHub
commit 325760150e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
97 changed files with 76 additions and 1043 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

193
phpstan-baseline.neon
View File

@ -2025,15 +2025,6 @@ parameters:
count: 1
path: src/Controllers/Database/DesignerController.php
-
message: '''
#^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\:
Use dependency injection instead\.$#
'''
identifier: staticMethod.deprecated
count: 1
path: src/Controllers/Database/DesignerController.php
-
message: '#^Cannot access offset ''dbName'' on mixed\.$#'
identifier: offsetAccess.nonOffsetAccessible
@ -2124,15 +2115,6 @@ parameters:
count: 1
path: src/Controllers/Database/DesignerController.php
-
message: '''
#^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\:
Use dependency injection instead\.$#
'''
identifier: staticMethod.deprecated
count: 1
path: src/Controllers/Database/EventsController.php
-
message: '#^Cannot call method isSuccess\(\) on mixed\.$#'
identifier: method.nonObject
@ -2187,15 +2169,6 @@ parameters:
count: 1
path: src/Controllers/Database/EventsController.php
-
message: '''
#^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\:
Use dependency injection instead\.$#
'''
identifier: staticMethod.deprecated
count: 1
path: src/Controllers/Database/ExportController.php
-
message: '#^Construct empty\(\) is not allowed\. Use more strict comparison\.$#'
identifier: empty.notAllowed
@ -2406,15 +2379,6 @@ parameters:
count: 1
path: src/Controllers/Database/SearchController.php
-
message: '''
#^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\:
Use dependency injection instead\.$#
'''
identifier: staticMethod.deprecated
count: 1
path: src/Controllers/Database/SqlController.php
-
message: '#^Parameter \#1 \$database of method PhpMyAdmin\\Database\\CentralColumns\:\:deleteColumnsFromList\(\) expects string, mixed given\.$#'
identifier: argument.type
@ -2544,15 +2508,6 @@ parameters:
count: 1
path: src/Controllers/Database/Structure/FavoriteTableController.php
-
message: '''
#^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\:
Use dependency injection instead\.$#
'''
identifier: staticMethod.deprecated
count: 1
path: src/Controllers/Database/Structure/RealRowCountController.php
-
message: '#^Cannot cast mixed to string\.$#'
identifier: cast.string
@ -2931,24 +2886,12 @@ parameters:
count: 1
path: src/Controllers/Export/ExportController.php
-
message: '#^Parameter \#3 \$errorUrl of static method PhpMyAdmin\\Export\\Export\:\:exportRaw\(\) expects string, mixed given\.$#'
identifier: argument.type
count: 1
path: src/Controllers/Export/ExportController.php
-
message: '#^Parameter \#3 \$saveFilename of method PhpMyAdmin\\Export\\Export\:\:closeFile\(\) expects string, mixed given\.$#'
identifier: argument.type
count: 1
path: src/Controllers/Export/ExportController.php
-
message: '#^Parameter \#4 \$errorUrl of method PhpMyAdmin\\Export\\Export\:\:exportServer\(\) expects string, mixed given\.$#'
identifier: argument.type
count: 1
path: src/Controllers/Export/ExportController.php
-
message: '#^Parameter \#4 \$tableStructure of method PhpMyAdmin\\Export\\Export\:\:exportDatabase\(\) expects array\<string\>, array\<mixed\> given\.$#'
identifier: argument.type
@ -2956,7 +2899,7 @@ parameters:
path: src/Controllers/Export/ExportController.php
-
message: '#^Parameter \#5 \$errorUrl of method PhpMyAdmin\\Export\\Export\:\:exportTable\(\) expects string, mixed given\.$#'
message: '#^Parameter \#5 \$exportType of method PhpMyAdmin\\Export\\Export\:\:exportTable\(\) expects string, mixed given\.$#'
identifier: argument.type
count: 2
path: src/Controllers/Export/ExportController.php
@ -2968,19 +2911,7 @@ parameters:
path: src/Controllers/Export/ExportController.php
-
message: '#^Parameter \#6 \$exportType of method PhpMyAdmin\\Export\\Export\:\:exportTable\(\) expects string, mixed given\.$#'
identifier: argument.type
count: 2
path: src/Controllers/Export/ExportController.php
-
message: '#^Parameter \#7 \$errorUrl of method PhpMyAdmin\\Export\\Export\:\:exportDatabase\(\) expects string, mixed given\.$#'
identifier: argument.type
count: 2
path: src/Controllers/Export/ExportController.php
-
message: '#^Parameter \#8 \$exportType of method PhpMyAdmin\\Export\\Export\:\:exportDatabase\(\) expects string, mixed given\.$#'
message: '#^Parameter \#7 \$exportType of method PhpMyAdmin\\Export\\Export\:\:exportDatabase\(\) expects string, mixed given\.$#'
identifier: argument.type
count: 2
path: src/Controllers/Export/ExportController.php
@ -3357,15 +3288,6 @@ parameters:
count: 1
path: src/Controllers/Normalization/ThirdNormalForm/NewTablesController.php
-
message: '''
#^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\:
Use dependency injection instead\.$#
'''
identifier: staticMethod.deprecated
count: 1
path: src/Controllers/Operations/Database/CollationController.php
-
message: '''
#^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\:
@ -3462,15 +3384,6 @@ parameters:
count: 1
path: src/Controllers/Operations/TableController.php
-
message: '''
#^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\:
Use dependency injection instead\.$#
'''
identifier: staticMethod.deprecated
count: 1
path: src/Controllers/Operations/ViewController.php
-
message: '''
#^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\:
@ -3813,12 +3726,6 @@ parameters:
count: 1
path: src/Controllers/Server/PrivilegesController.php
-
message: '#^Parameter \#1 \$errorUrl of method PhpMyAdmin\\Server\\Privileges\:\:updatePassword\(\) expects string, mixed given\.$#'
identifier: argument.type
count: 1
path: src/Controllers/Server/PrivilegesController.php
-
message: '#^Parameter \#1 \$message of static method PhpMyAdmin\\Html\\Generator\:\:getMessage\(\) expects PhpMyAdmin\\Message\|string, mixed given\.$#'
identifier: argument.type
@ -4296,12 +4203,6 @@ parameters:
count: 1
path: src/Controllers/Sql/SqlController.php
-
message: '#^Parameter \#4 \$backUrl of static method PhpMyAdmin\\Html\\Generator\:\:mysqlDie\(\) expects string, mixed given\.$#'
identifier: argument.type
count: 1
path: src/Controllers/Sql/SqlController.php
-
message: '#^Parameter \#5 \$sqlQueryForBookmark of method PhpMyAdmin\\Sql\:\:executeQueryAndSendQueryResponse\(\) expects string\|null, mixed given\.$#'
identifier: argument.type
@ -4452,12 +4353,6 @@ parameters:
count: 1
path: src/Controllers/Table/ChangeController.php
-
message: '#^Parameter \#4 \$errorUrl of method PhpMyAdmin\\InsertEdit\:\:getContinueInsertionForm\(\) expects string, mixed given\.$#'
identifier: argument.type
count: 1
path: src/Controllers/Table/ChangeController.php
-
message: '#^Parameter \#7 \$isUpload of method PhpMyAdmin\\InsertEdit\:\:getHtmlForInsertEditRow\(\) expects bool, mixed given\.$#'
identifier: argument.type
@ -4488,7 +4383,7 @@ parameters:
Use dependency injection instead\.$#
'''
identifier: staticMethod.deprecated
count: 2
count: 1
path: src/Controllers/Table/ChartController.php
-
@ -4557,15 +4452,6 @@ parameters:
count: 1
path: src/Controllers/Table/CreateController.php
-
message: '''
#^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\:
Use dependency injection instead\.$#
'''
identifier: staticMethod.deprecated
count: 1
path: src/Controllers/Table/DeleteConfirmController.php
-
message: '#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\.$#'
identifier: foreach.nonIterable
@ -4647,15 +4533,6 @@ parameters:
count: 1
path: src/Controllers/Table/DropColumnController.php
-
message: '''
#^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\:
Use dependency injection instead\.$#
'''
identifier: staticMethod.deprecated
count: 1
path: src/Controllers/Table/ExportController.php
-
message: '#^Construct empty\(\) is not allowed\. Use more strict comparison\.$#'
identifier: empty.notAllowed
@ -4686,7 +4563,7 @@ parameters:
Use dependency injection instead\.$#
'''
identifier: staticMethod.deprecated
count: 2
count: 1
path: src/Controllers/Table/FindReplaceController.php
-
@ -4737,7 +4614,7 @@ parameters:
Use dependency injection instead\.$#
'''
identifier: staticMethod.deprecated
count: 3
count: 2
path: src/Controllers/Table/GisVisualizationController.php
-
@ -4797,15 +4674,6 @@ parameters:
count: 1
path: src/Controllers/Table/ImportController.php
-
message: '''
#^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\:
Use dependency injection instead\.$#
'''
identifier: staticMethod.deprecated
count: 1
path: src/Controllers/Table/IndexRenameController.php
-
message: '#^Binary operation "\+\=" between int and mixed results in an error\.$#'
identifier: assignOp.invalid
@ -4818,7 +4686,7 @@ parameters:
Use dependency injection instead\.$#
'''
identifier: staticMethod.deprecated
count: 2
count: 1
path: src/Controllers/Table/IndexesController.php
-
@ -5259,7 +5127,7 @@ parameters:
Use dependency injection instead\.$#
'''
identifier: staticMethod.deprecated
count: 4
count: 3
path: src/Controllers/Table/SearchController.php
-
@ -5328,15 +5196,6 @@ parameters:
count: 1
path: src/Controllers/Table/SearchController.php
-
message: '''
#^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\:
Use dependency injection instead\.$#
'''
identifier: staticMethod.deprecated
count: 1
path: src/Controllers/Table/SqlController.php
-
message: '#^Parameter \#3 \$query of method PhpMyAdmin\\SqlQueryForm\:\:getHtml\(\) expects bool\|string, mixed given\.$#'
identifier: argument.type
@ -5433,15 +5292,6 @@ parameters:
count: 2
path: src/Controllers/Table/Structure/PartitioningController.php
-
message: '''
#^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\:
Use dependency injection instead\.$#
'''
identifier: staticMethod.deprecated
count: 1
path: src/Controllers/Table/Structure/PrimaryController.php
-
message: '#^Construct empty\(\) is not allowed\. Use more strict comparison\.$#'
identifier: empty.notAllowed
@ -5742,7 +5592,7 @@ parameters:
Use dependency injection instead\.$#
'''
identifier: staticMethod.deprecated
count: 3
count: 2
path: src/Controllers/Table/StructureController.php
-
@ -5775,15 +5625,6 @@ parameters:
count: 4
path: src/Controllers/Table/StructureController.php
-
message: '''
#^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\:
Use dependency injection instead\.$#
'''
identifier: staticMethod.deprecated
count: 1
path: src/Controllers/Table/TrackingController.php
-
message: '#^Parameter \#2 \$entries of method PhpMyAdmin\\Tracking\\Tracking\:\:getDownloadInfoForExport\(\) expects array\<int, array\<string, int\|string\>\>, array\<mixed\> given\.$#'
identifier: argument.type
@ -5970,15 +5811,6 @@ parameters:
count: 1
path: src/Controllers/Transformation/WrapperController.php
-
message: '''
#^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\:
Use dependency injection instead\.$#
'''
identifier: staticMethod.deprecated
count: 1
path: src/Controllers/Triggers/IndexController.php
-
message: '#^Cannot call method isSuccess\(\) on mixed\.$#'
identifier: method.nonObject
@ -6066,15 +5898,6 @@ parameters:
count: 1
path: src/Controllers/View/CreateController.php
-
message: '''
#^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\:
Use dependency injection instead\.$#
'''
identifier: staticMethod.deprecated
count: 1
path: src/Controllers/View/CreateController.php
-
message: '#^Construct empty\(\) is not allowed\. Use more strict comparison\.$#'
identifier: empty.notAllowed

361
psalm-baseline.xml
View File

@ -848,12 +848,6 @@
</PossiblyUnusedMethod>
</file>
<file src="src/Controllers/Database/DesignerController.php">
<DeprecatedMethod>
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</InvalidArrayOffset>
<MixedArgument>
<code><![CDATA[$position['dbName']]]></code>
<code><![CDATA[$position['tableName']]]></code>
@ -862,9 +856,6 @@
<code><![CDATA[$request->getQueryParam('db')]]></code>
<code><![CDATA[Current::$database]]></code>
</MixedArgument>
<MixedArgumentTypeCoercion>
<code><![CDATA[['db' => Current::$database]]]></code>
</MixedArgumentTypeCoercion>
<MixedArrayAccess>
<code><![CDATA[$position['dbName']]]></code>
<code><![CDATA[$position['dbName']]]></code>
@ -872,7 +863,6 @@
<code><![CDATA[$position['tableName']]]></code>
</MixedArrayAccess>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$position]]></code>
</MixedAssignment>
<MixedOperand>
@ -893,11 +883,7 @@
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Database/EventsController.php">
<DeprecatedMethod>
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['errors']]]></code>
</InvalidArrayOffset>
<MixedArgument>
@ -906,11 +892,7 @@
<code><![CDATA[Current::$database]]></code>
<code><![CDATA[Current::$database]]></code>
</MixedArgument>
<MixedArgumentTypeCoercion>
<code><![CDATA[['db' => Current::$database]]]></code>
</MixedArgumentTypeCoercion>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['errors']]]></code>
<code><![CDATA[$item['item_original_name']]]></code>
</MixedAssignment>
@ -958,11 +940,7 @@
</TypeDoesNotContainType>
</file>
<file src="src/Controllers/Database/ExportController.php">
<DeprecatedMethod>
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['single_table']]]></code>
<code><![CDATA[$GLOBALS['table_select']]]></code>
<code><![CDATA[$GLOBALS['unlim_num_rows']]]></code>
@ -972,11 +950,7 @@
<code><![CDATA[$GLOBALS['unlim_num_rows']]]></code>
<code><![CDATA[Current::$database]]></code>
</MixedArgument>
<MixedArgumentTypeCoercion>
<code><![CDATA[['db' => Current::$database]]]></code>
</MixedArgumentTypeCoercion>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['single_table']]]></code>
<code><![CDATA[$GLOBALS['table_select']]]></code>
<code><![CDATA[$GLOBALS['table_select']]]></code>
@ -997,18 +971,11 @@
<DeprecatedMethod>
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</InvalidArrayOffset>
<MixedArgumentTypeCoercion>
<code><![CDATA[['db' => Current::$database]]]></code>
</MixedArgumentTypeCoercion>
<MixedArrayAccess>
<code><![CDATA[$_SESSION[$GLOBALS['SESSION_KEY']]['handler']]]></code>
<code><![CDATA[$_SESSION[$GLOBALS['SESSION_KEY']]['handler']]]></code>
</MixedArrayAccess>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$idKey]]></code>
</MixedAssignment>
<MixedMethodCall>
@ -1053,7 +1020,6 @@
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['errors']]]></code>
</InvalidArrayOffset>
<MixedArgument>
@ -1068,9 +1034,6 @@
<code><![CDATA[Current::$database]]></code>
<code><![CDATA[Current::$database]]></code>
</MixedArgument>
<MixedArgumentTypeCoercion>
<code><![CDATA[['db' => Current::$database]]]></code>
</MixedArgumentTypeCoercion>
<MixedArrayAccess>
<code><![CDATA[$routine['item_param_dir'][$routine['item_num_params'] - 1]]]></code>
<code><![CDATA[$routine['item_param_length'][$i]]]></code>
@ -1100,7 +1063,6 @@
<code><![CDATA[$routine['item_param_type'][$routine['item_num_params'] - 1]]]></code>
</MixedArrayOffset>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['errors']]]></code>
<code><![CDATA[$routine['item_num_params']]]></code>
<code><![CDATA[$routine['item_num_params']]]></code>
@ -1194,18 +1156,12 @@
<DeprecatedMethod>
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</InvalidArrayOffset>
<MixedArgument>
<code><![CDATA[Current::$database]]></code>
</MixedArgument>
<MixedArgumentTypeCoercion>
<code><![CDATA[['db' => Current::$database]]]></code>
</MixedArgumentTypeCoercion>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</MixedAssignment>
<PossiblyUnusedMethod>
<code><![CDATA[__construct]]></code>
</PossiblyUnusedMethod>
@ -1219,21 +1175,9 @@
</PossiblyUnusedMethod>
</file>
<file src="src/Controllers/Database/SqlController.php">
<DeprecatedMethod>
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</InvalidArrayOffset>
<MixedArgument>
<code><![CDATA[Current::$database]]></code>
</MixedArgument>
<MixedArgumentTypeCoercion>
<code><![CDATA[['db' => Current::$database]]]></code>
</MixedArgumentTypeCoercion>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</MixedAssignment>
<PossiblyUnusedMethod>
<code><![CDATA[__construct]]></code>
</PossiblyUnusedMethod>
@ -1327,16 +1271,10 @@
<DeprecatedMethod>
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</InvalidArrayOffset>
<MixedArgument>
<code><![CDATA[$favoriteTables]]></code>
<code><![CDATA[$favoriteTables]]></code>
</MixedArgument>
<MixedArgumentTypeCoercion>
<code><![CDATA[['db' => Current::$database]]]></code>
</MixedArgumentTypeCoercion>
<MixedArrayAccess>
<code><![CDATA[$value['db']]]></code>
<code><![CDATA[$value['table']]]></code>
@ -1347,7 +1285,6 @@
<code><![CDATA[$favoriteTables[$user]]]></code>
</MixedArrayAssignment>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$favoriteTables]]></code>
<code><![CDATA[$favoriteTables]]></code>
<code><![CDATA[$value]]></code>
@ -1357,22 +1294,10 @@
</MixedOperand>
</file>
<file src="src/Controllers/Database/Structure/RealRowCountController.php">
<DeprecatedMethod>
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</InvalidArrayOffset>
<MixedArgument>
<code><![CDATA[Current::$database]]></code>
<code><![CDATA[Current::$database]]></code>
</MixedArgument>
<MixedArgumentTypeCoercion>
<code><![CDATA[['db' => Current::$database]]]></code>
</MixedArgumentTypeCoercion>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</MixedAssignment>
<PossiblyInvalidCast>
<code><![CDATA[$parameters['table']]]></code>
</PossiblyInvalidCast>
@ -1401,9 +1326,6 @@
<code><![CDATA[Config::getInstance()]]></code>
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</InvalidArrayOffset>
<MixedArgument>
<code><![CDATA[$currentTable['Collation']]]></code>
<code><![CDATA[$currentTable['Data_free']]]></code>
@ -1429,9 +1351,6 @@
<code><![CDATA[$replicaInfo['Wild_Ignore_Table']]]></code>
<code><![CDATA[$truename]]></code>
</MixedArgument>
<MixedArgumentTypeCoercion>
<code><![CDATA[['db' => Current::$database]]]></code>
</MixedArgumentTypeCoercion>
<MixedArrayAccess>
<code><![CDATA[$currentTable['TABLE_NAME']]]></code>
<code><![CDATA[$currentTable['TABLE_TYPE']]]></code>
@ -1440,7 +1359,6 @@
<code><![CDATA[$currentTable['TABLE_ROWS']]]></code>
</MixedArrayAssignment>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$charset]]></code>
<code><![CDATA[$dbTable]]></code>
<code><![CDATA[$overheadSize]]></code>
@ -1480,19 +1398,10 @@
<DeprecatedMethod>
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</InvalidArrayOffset>
<MixedArgument>
<code><![CDATA[$request->getParsedBodyParam('selected')]]></code>
<code><![CDATA[Current::$database]]></code>
</MixedArgument>
<MixedArgumentTypeCoercion>
<code><![CDATA[['db' => Current::$database]]]></code>
</MixedArgumentTypeCoercion>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</MixedAssignment>
<PossiblyUnusedMethod>
<code><![CDATA[__construct]]></code>
</PossiblyUnusedMethod>
@ -1531,7 +1440,6 @@
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['export_type']]]></code>
<code><![CDATA[$GLOBALS['save_filename']]]></code>
<code><![CDATA[$GLOBALS['single_table']]]></code>
@ -1544,12 +1452,6 @@
<code><![CDATA[$GLOBALS['charset']]]></code>
<code><![CDATA[$GLOBALS['compression']]]></code>
<code><![CDATA[$GLOBALS['compression']]]></code>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['export_type']]]></code>
<code><![CDATA[$GLOBALS['export_type']]]></code>
<code><![CDATA[$GLOBALS['export_type']]]></code>
@ -1581,7 +1483,6 @@
<code><![CDATA[$GLOBALS['csv_separator']]]></code>
<code><![CDATA[$GLOBALS['csv_structure_or_data']]]></code>
<code><![CDATA[$GLOBALS['csv_terminated']]]></code>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['excel_columns']]]></code>
<code><![CDATA[$GLOBALS['excel_edition']]]></code>
<code><![CDATA[$GLOBALS['excel_null']]]></code>
@ -1685,12 +1586,6 @@
<code><![CDATA[$GLOBALS['charset']]]></code>
<code><![CDATA[$GLOBALS['compression']]]></code>
<code><![CDATA[$GLOBALS['compression']]]></code>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['export_type']]]></code>
<code><![CDATA[$GLOBALS['export_type']]]></code>
<code><![CDATA[$GLOBALS['export_type']]]></code>
@ -1705,12 +1600,6 @@
<code><![CDATA[$GLOBALS['charset']]]></code>
<code><![CDATA[$GLOBALS['compression']]]></code>
<code><![CDATA[$GLOBALS['compression']]]></code>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['export_type']]]></code>
<code><![CDATA[$GLOBALS['export_type']]]></code>
<code><![CDATA[$GLOBALS['export_type']]]></code>
@ -1802,7 +1691,6 @@
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['language_stats']]]></code>
<code><![CDATA[$GLOBALS['language_stats']]]></code>
<code><![CDATA[$GLOBALS['show_query']]]></code>
@ -1821,7 +1709,6 @@
<code><![CDATA[$config->settings['Servers'][Current::$server]]]></code>
</MixedArrayTypeCoercion>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['show_query']]]></code>
</MixedAssignment>
<PossiblyNullArgument>
@ -1852,7 +1739,6 @@
</DeprecatedMethod>
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['ajax_reload']]]></code>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['result']]]></code>
</InvalidArrayOffset>
<MixedArgumentTypeCoercion>
@ -1867,7 +1753,6 @@
</MixedArrayAssignment>
<MixedAssignment>
<code><![CDATA[$GLOBALS['ajax_reload']]]></code>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['is_js_confirmed']]]></code>
<code><![CDATA[$GLOBALS['message_to_show']]]></code>
<code><![CDATA[$GLOBALS['noplugin']]]></code>
@ -2051,21 +1936,9 @@
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Operations/Database/CollationController.php">
<DeprecatedMethod>
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</InvalidArrayOffset>
<MixedArgument>
<code><![CDATA[Current::$database]]></code>
</MixedArgument>
<MixedArgumentTypeCoercion>
<code><![CDATA[['db' => Current::$database]]]></code>
</MixedArgumentTypeCoercion>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</MixedAssignment>
<PossiblyInvalidArgument>
<code><![CDATA[Current::$database]]></code>
<code><![CDATA[Current::$database]]></code>
@ -2083,7 +1956,6 @@
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['single_table']]]></code>
</InvalidArrayOffset>
<MixedArgument>
@ -2091,11 +1963,7 @@
<code><![CDATA[Current::$database]]></code>
<code><![CDATA[Current::$database]]></code>
</MixedArgument>
<MixedArgumentTypeCoercion>
<code><![CDATA[['db' => Current::$database]]]></code>
</MixedArgumentTypeCoercion>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['single_table']]]></code>
</MixedAssignment>
<PossiblyNullArgument>
@ -2117,7 +1985,6 @@
</DeprecatedMethod>
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['auto_increment']]]></code>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['message_to_show']]]></code>
</InvalidArrayOffset>
<MixedArgumentTypeCoercion>
@ -2125,7 +1992,6 @@
</MixedArgumentTypeCoercion>
<MixedAssignment>
<code><![CDATA[$GLOBALS['auto_increment']]]></code>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['message_to_show']]]></code>
</MixedAssignment>
<PossiblyUnusedReturnValue>
@ -2140,14 +2006,7 @@
</RiskyTruthyFalsyComparison>
</file>
<file src="src/Controllers/Operations/ViewController.php">
<DeprecatedMethod>
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</InvalidArrayOffset>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$newname]]></code>
</MixedAssignment>
<PossiblyUnusedMethod>
@ -2328,14 +2187,12 @@
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['selected']]]></code>
</InvalidArrayOffset>
<MixedArgument>
<code><![CDATA[$database]]></code>
</MixedArgument>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['selected']]]></code>
<code><![CDATA[$database]]></code>
</MixedAssignment>
@ -2348,9 +2205,6 @@
<code><![CDATA[Config::getInstance()]]></code>
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</InvalidArrayOffset>
<MixedArgument>
<code><![CDATA[$database['DEFAULT_COLLATION_NAME']]]></code>
<code><![CDATA[$database['SCHEMA_NAME']]]></code>
@ -2384,7 +2238,6 @@
<code><![CDATA[$databases[$database['SCHEMA_NAME']]]]></code>
</MixedArrayOffset>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$database]]></code>
<code><![CDATA[$key]]></code>
<code><![CDATA[$key]]></code>
@ -2428,15 +2281,11 @@
<DeprecatedMethod>
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</InvalidArrayOffset>
<MixedArrayAccess>
<code><![CDATA[$_SESSION[$GLOBALS['SESSION_KEY']]['handler']]]></code>
<code><![CDATA[$_SESSION[$GLOBALS['SESSION_KEY']]['handler']]]></code>
</MixedArrayAccess>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$idKey]]></code>
</MixedAssignment>
<MixedMethodCall>
@ -2466,9 +2315,6 @@
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Server/PrivilegesController.php">
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</InvalidArrayOffset>
<MixedArgument>
<code><![CDATA[$request->getQueryParam('initial')]]></code>
<code><![CDATA[$urlDbname ?? '']]></code>
@ -2477,9 +2323,6 @@
<MixedArgumentTypeCoercion>
<code><![CDATA[$queries]]></code>
</MixedArgumentTypeCoercion>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</MixedAssignment>
<RedundantConditionGivenDocblockType>
<code><![CDATA[! empty($GLOBALS['message']) && $GLOBALS['message'] instanceof Message]]></code>
</RedundantConditionGivenDocblockType>
@ -2490,14 +2333,10 @@
</RiskyTruthyFalsyComparison>
</file>
<file src="src/Controllers/Server/ReplicationController.php">
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</InvalidArrayOffset>
<MixedArgument>
<code><![CDATA[$replicaInfo['status']]]></code>
</MixedArgument>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$primaryConfigure]]></code>
<code><![CDATA[$replicaConfigure]]></code>
<code><![CDATA[$urlParams]]></code>
@ -2515,12 +2354,6 @@
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Server/SqlController.php">
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</InvalidArrayOffset>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</MixedAssignment>
<PossiblyUnusedMethod>
<code><![CDATA[__construct]]></code>
</PossiblyUnusedMethod>
@ -2531,56 +2364,26 @@
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Server/Status/Monitor/ChartingDataController.php">
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</InvalidArrayOffset>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</MixedAssignment>
<PossiblyUnusedMethod>
<code><![CDATA[__construct]]></code>
</PossiblyUnusedMethod>
</file>
<file src="src/Controllers/Server/Status/Monitor/GeneralLogController.php">
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</InvalidArrayOffset>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</MixedAssignment>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Server/Status/Monitor/LogVarsController.php">
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</InvalidArrayOffset>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</MixedAssignment>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Server/Status/Monitor/QueryAnalyzerController.php">
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</InvalidArrayOffset>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</MixedAssignment>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Server/Status/Monitor/SlowLogController.php">
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</InvalidArrayOffset>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</MixedAssignment>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
@ -2677,9 +2480,6 @@
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Server/Status/VariablesController.php">
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</InvalidArrayOffset>
<MixedArgument>
<code><![CDATA[$flush]]></code>
</MixedArgument>
@ -2688,7 +2488,6 @@
<code><![CDATA[$name]]></code>
</MixedArgumentTypeCoercion>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$dontFormat]]></code>
<code><![CDATA[$filterAlert]]></code>
<code><![CDATA[$filterCategory]]></code>
@ -2824,16 +2623,13 @@
<code><![CDATA[$GLOBALS['ajax_reload']]]></code>
<code><![CDATA[$GLOBALS['disp_message']]]></code>
<code><![CDATA[$GLOBALS['disp_query']]]></code>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['message_to_show']]]></code>
<code><![CDATA[$GLOBALS['unlim_num_rows']]]></code>
</InvalidArrayOffset>
<MixedArgument>
<code><![CDATA[$GLOBALS['disp_message'] ?? null]]></code>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['message_to_show'] ?? null]]></code>
<code><![CDATA[$request->getQueryParam('sql_signature')]]></code>
<code><![CDATA[Current::$table]]></code>
</MixedArgument>
<MixedArrayAccess>
<code><![CDATA[$GLOBALS['ajax_reload']['reload']]]></code>
@ -2842,20 +2638,13 @@
<code><![CDATA[$GLOBALS['ajax_reload']]]></code>
<code><![CDATA[$GLOBALS['disp_message']]]></code>
<code><![CDATA[$GLOBALS['disp_query']]]></code>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['message_to_show']]]></code>
<code><![CDATA[$GLOBALS['unlim_num_rows']]]></code>
<code><![CDATA[$bkmAllUsers]]></code>
<code><![CDATA[$sqlQuery]]></code>
</MixedAssignment>
<PossiblyNullArgument>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</PossiblyNullArgument>
</file>
<file src="src/Controllers/Table/AddFieldController.php">
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</InvalidArrayOffset>
<MixedArgument>
<code><![CDATA[$_POST['field_input_transformation'][$fieldindex]]]></code>
<code><![CDATA[$_POST['field_input_transformation_options'][$fieldindex]]]></code>
@ -2863,12 +2652,6 @@
<code><![CDATA[$_POST['field_transformation_options'][$fieldindex]]]></code>
<code><![CDATA[Current::$table]]></code>
</MixedArgument>
<MixedArgumentTypeCoercion>
<code><![CDATA[$urlParams]]></code>
</MixedArgumentTypeCoercion>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</MixedAssignment>
<PossiblyInvalidArgument>
<code><![CDATA[$_POST['field_input_transformation'][$fieldindex]]]></code>
<code><![CDATA[$_POST['field_input_transformation_options'][$fieldindex]]]></code>
@ -2900,7 +2683,6 @@
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['current_result']]]></code>
<code><![CDATA[$GLOBALS['disp_message']]]></code>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['unsaved_values']]]></code>
<code><![CDATA[$GLOBALS['where_clause']]]></code>
</InvalidArrayOffset>
@ -2921,7 +2703,6 @@
<MixedAssignment>
<code><![CDATA[$GLOBALS['current_result']]]></code>
<code><![CDATA[$GLOBALS['disp_message']]]></code>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['unsaved_values']]]></code>
<code><![CDATA[$GLOBALS['where_clause']]]></code>
<code><![CDATA[$isUpload]]></code>
@ -2955,24 +2736,11 @@
<file src="src/Controllers/Table/ChartController.php">
<DeprecatedMethod>
<code><![CDATA[Config::getInstance()]]></code>
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</InvalidArrayOffset>
<MixedArgument>
<code><![CDATA[Current::$database]]></code>
<code><![CDATA[Current::$sqlQuery]]></code>
</MixedArgument>
<MixedArgumentTypeCoercion>
<code><![CDATA[$urlParams]]></code>
<code><![CDATA[UrlParams::$params]]></code>
</MixedArgumentTypeCoercion>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</MixedAssignment>
<MixedPropertyTypeCoercion>
<code><![CDATA[['db' => Current::$database, 'table' => Current::$table]]]></code>
</MixedPropertyTypeCoercion>
@ -3035,18 +2803,6 @@
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Table/DeleteConfirmController.php">
<DeprecatedMethod>
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</InvalidArrayOffset>
<MixedArgumentTypeCoercion>
<code><![CDATA[UrlParams::$params]]></code>
</MixedArgumentTypeCoercion>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</MixedAssignment>
<MixedPropertyTypeCoercion>
<code><![CDATA[['db' => Current::$database, 'table' => Current::$table]]]></code>
</MixedPropertyTypeCoercion>
@ -3116,11 +2872,7 @@
</RiskyTruthyFalsyComparison>
</file>
<file src="src/Controllers/Table/ExportController.php">
<DeprecatedMethod>
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['num_tables']]]></code>
<code><![CDATA[$GLOBALS['single_table']]]></code>
<code><![CDATA[$GLOBALS['unlim_num_rows']]]></code>
@ -3134,10 +2886,8 @@
</MixedArgument>
<MixedArgumentTypeCoercion>
<code><![CDATA[$GLOBALS['where_clause']]]></code>
<code><![CDATA[UrlParams::$params]]></code>
</MixedArgumentTypeCoercion>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['single_table']]]></code>
<code><![CDATA[$GLOBALS['unlim_num_rows']]]></code>
<code><![CDATA[$GLOBALS['where_clause']]]></code>
@ -3170,11 +2920,7 @@
<file src="src/Controllers/Table/FindReplaceController.php">
<DeprecatedMethod>
<code><![CDATA[Config::getInstance()]]></code>
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</InvalidArrayOffset>
<MixedArgument>
<code><![CDATA[$column]]></code>
<code><![CDATA[$column]]></code>
@ -3185,9 +2931,6 @@
<code><![CDATA[$row[1]]]></code>
<code><![CDATA[$this->columnTypes[$i]]]></code>
</MixedArgument>
<MixedArgumentTypeCoercion>
<code><![CDATA[UrlParams::$params]]></code>
</MixedArgumentTypeCoercion>
<MixedArrayAccess>
<code><![CDATA[$row[0]]]></code>
<code><![CDATA[$row[0]]]></code>
@ -3200,7 +2943,6 @@
<code><![CDATA[$types[$columnName]]]></code>
</MixedArrayOffset>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$column]]></code>
<code><![CDATA[$column]]></code>
<code><![CDATA[$column]]></code>
@ -3231,11 +2973,7 @@
<DeprecatedMethod>
<code><![CDATA[Config::getInstance()]]></code>
<code><![CDATA[Config::getInstance()]]></code>
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<MixedArgumentTypeCoercion>
<code><![CDATA[['db' => Current::$database]]]></code>
</MixedArgumentTypeCoercion>
<MixedArrayAccess>
<code><![CDATA[$_SESSION['tmpval']['max_rows']]]></code>
<code><![CDATA[$_SESSION['tmpval']['pos']]]></code>
@ -3255,18 +2993,11 @@
<DeprecatedMethod>
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</InvalidArrayOffset>
<MixedArgumentTypeCoercion>
<code><![CDATA[UrlParams::$params]]></code>
</MixedArgumentTypeCoercion>
<MixedArrayAccess>
<code><![CDATA[$_SESSION[$GLOBALS['SESSION_KEY']]['handler']]]></code>
<code><![CDATA[$_SESSION[$GLOBALS['SESSION_KEY']]['handler']]]></code>
</MixedArrayAccess>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$idKey]]></code>
</MixedAssignment>
<MixedMethodCall>
@ -3286,18 +3017,6 @@
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Table/IndexRenameController.php">
<DeprecatedMethod>
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</InvalidArrayOffset>
<MixedArgumentTypeCoercion>
<code><![CDATA[UrlParams::$params]]></code>
</MixedArgumentTypeCoercion>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</MixedAssignment>
<MixedPropertyTypeCoercion>
<code><![CDATA[['db' => Current::$database, 'table' => Current::$table]]]></code>
</MixedPropertyTypeCoercion>
@ -3308,20 +3027,12 @@
<file src="src/Controllers/Table/IndexesController.php">
<DeprecatedMethod>
<code><![CDATA[Config::getInstance()]]></code>
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</InvalidArrayOffset>
<MixedArgument>
<code><![CDATA[$_POST['index']['columns']['names']]]></code>
<code><![CDATA[$fields]]></code>
</MixedArgument>
<MixedArgumentTypeCoercion>
<code><![CDATA[UrlParams::$params]]></code>
</MixedArgumentTypeCoercion>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$fields]]></code>
</MixedAssignment>
<MixedPropertyTypeCoercion>
@ -3487,7 +3198,6 @@
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['disp_message']]]></code>
<code><![CDATA[$GLOBALS['disp_query']]]></code>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['query']]]></code>
<code><![CDATA[$GLOBALS['unsaved_values']]]></code>
</InvalidArrayOffset>
@ -3531,7 +3241,6 @@
<MixedAssignment>
<code><![CDATA[$GLOBALS['disp_message']]]></code>
<code><![CDATA[$GLOBALS['disp_query']]]></code>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['query']]]></code>
<code><![CDATA[$GLOBALS['unsaved_values']]]></code>
<code><![CDATA[$GLOBALS['unsaved_values'][$rowNumber]]]></code>
@ -3582,14 +3291,10 @@
<code><![CDATA[Config::getInstance()]]></code>
<code><![CDATA[Config::getInstance()]]></code>
<code><![CDATA[Config::getInstance()]]></code>
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<MixedArgument>
<code><![CDATA[$foreignData->foreignField]]></code>
</MixedArgument>
<MixedArgumentTypeCoercion>
<code><![CDATA[UrlParams::$params]]></code>
</MixedArgumentTypeCoercion>
<MixedAssignment>
<code><![CDATA[$isUnsigned]]></code>
</MixedAssignment>
@ -3614,23 +3319,11 @@
</RiskyTruthyFalsyComparison>
</file>
<file src="src/Controllers/Table/SqlController.php">
<DeprecatedMethod>
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</InvalidArrayOffset>
<MixedArgument>
<code><![CDATA[$request->getQueryParam('sql_query', true)]]></code>
<code><![CDATA[Current::$database]]></code>
<code><![CDATA[Current::$table]]></code>
</MixedArgument>
<MixedArgumentTypeCoercion>
<code><![CDATA[$urlParams]]></code>
</MixedArgumentTypeCoercion>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</MixedAssignment>
</file>
<file src="src/Controllers/Table/Structure/BrowseController.php">
<MixedArgument>
@ -3696,18 +3389,6 @@
</RiskyTruthyFalsyComparison>
</file>
<file src="src/Controllers/Table/Structure/PrimaryController.php">
<DeprecatedMethod>
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</InvalidArrayOffset>
<MixedArgumentTypeCoercion>
<code><![CDATA[UrlParams::$params]]></code>
</MixedArgumentTypeCoercion>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</MixedAssignment>
<MixedPropertyTypeCoercion>
<code><![CDATA[['db' => Current::$database, 'table' => Current::$table]]]></code>
</MixedPropertyTypeCoercion>
@ -3841,19 +3522,11 @@
<DeprecatedMethod>
<code><![CDATA[Config::getInstance()]]></code>
<code><![CDATA[Config::getInstance()]]></code>
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</InvalidArrayOffset>
<MixedArgument>
<code><![CDATA[Current::$table]]></code>
</MixedArgument>
<MixedArgumentTypeCoercion>
<code><![CDATA[$urlParams]]></code>
</MixedArgumentTypeCoercion>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$attributes[$rownum]]]></code>
</MixedAssignment>
<MixedOperand>
@ -3886,12 +3559,6 @@
</RiskyTruthyFalsyComparison>
</file>
<file src="src/Controllers/Table/TrackingController.php">
<DeprecatedMethod>
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</InvalidArrayOffset>
<MixedArgument>
<code><![CDATA[$version]]></code>
<code><![CDATA[Current::$database]]></code>
@ -3905,14 +3572,12 @@
</MixedArgument>
<MixedArgumentTypeCoercion>
<code><![CDATA[$entries]]></code>
<code><![CDATA[UrlParams::$params]]></code>
</MixedArgumentTypeCoercion>
<MixedArrayOffset>
<code><![CDATA[$trackedTables[Current::$table]]]></code>
<code><![CDATA[$trackedTables[Current::$table]]]></code>
</MixedArrayOffset>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$reportExportType]]></code>
<code><![CDATA[$selectedVersions]]></code>
<code><![CDATA[$submitMult]]></code>
@ -3936,7 +3601,6 @@
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$row[$_POST['criteriaColumnNames'][0]]]]></code>
<code><![CDATA[$row[$_POST['criteriaColumnNames'][1]]]]></code>
</InvalidArrayOffset>
@ -3946,11 +3610,7 @@
<code><![CDATA[Current::$database]]></code>
<code><![CDATA[Current::$table]]></code>
</MixedArgument>
<MixedArgumentTypeCoercion>
<code><![CDATA[UrlParams::$params]]></code>
</MixedArgumentTypeCoercion>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$isUnsigned]]></code>
</MixedAssignment>
<MixedPropertyTypeCoercion>
@ -4024,11 +3684,7 @@
</RiskyTruthyFalsyComparison>
</file>
<file src="src/Controllers/Triggers/IndexController.php">
<DeprecatedMethod>
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['errors']]]></code>
</InvalidArrayOffset>
<MixedArgument>
@ -4040,11 +3696,7 @@
<code><![CDATA[Current::$database]]></code>
<code><![CDATA[Current::$database]]></code>
</MixedArgument>
<MixedArgumentTypeCoercion>
<code><![CDATA[['db' => Current::$database]]]></code>
</MixedArgumentTypeCoercion>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['errors']]]></code>
</MixedAssignment>
<PossiblyInvalidArgument>
@ -4109,9 +3761,6 @@
</PossiblyUnusedMethod>
</file>
<file src="src/Controllers/View/CreateController.php">
<DeprecatedMethod>
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<MixedArgument>
<code><![CDATA[$db]]></code>
<code><![CDATA[$table]]></code>
@ -4123,9 +3772,6 @@
<code><![CDATA[$view['name']]]></code>
<code><![CDATA[$view['name']]]></code>
</MixedArgument>
<MixedArgumentTypeCoercion>
<code><![CDATA[['db' => Current::$database]]]></code>
</MixedArgumentTypeCoercion>
<MixedAssignment>
<code><![CDATA[$db]]></code>
<code><![CDATA[$table]]></code>
@ -8476,9 +8122,6 @@
<code><![CDATA[$values[count($values) - 1]]]></code>
<code><![CDATA[$values[count($values) - 1]]]></code>
</InvalidArrayOffset>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</MixedAssignment>
<PossiblyNullOperand>
<code><![CDATA[$ch]]></code>
</PossiblyNullOperand>
@ -10783,11 +10426,7 @@
</UnsupportedPropertyReferenceUsage>
</file>
<file src="src/Table/TableMover.php">
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</InvalidArrayOffset>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$altered]]></code>
<code><![CDATA[$altered]]></code>
<code><![CDATA[$value]]></code>

9
src/Controllers/Database/DesignerController.php
View File

@ -4,7 +4,6 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Database;
use PhpMyAdmin\Config;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\Database\Designer;
@ -17,7 +16,6 @@ use PhpMyAdmin\Message;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
use PhpMyAdmin\Url;
use PhpMyAdmin\Util;
use function __;
use function htmlspecialchars;
@ -39,7 +37,6 @@ final class DesignerController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['message'] ??= null;
$GLOBALS['errorUrl'] ??= null;
$db = $request->getParsedBodyParamAsStringOrNull('db');
$table = $request->getParsedBodyParamAsStringOrNull('table');
@ -164,12 +161,6 @@ final class DesignerController implements InvocableController
return $this->response->missingParameterError('db');
}
$GLOBALS['errorUrl'] = Util::getScriptNameForOption(
Config::getInstance()->settings['DefaultTabDatabase'],
'database',
);
$GLOBALS['errorUrl'] .= Url::getCommon(['db' => Current::$database], '&');
$databaseName = DatabaseName::tryFrom($request->getParam('db'));
if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) {
if ($request->isAjax()) {

9
src/Controllers/Database/EventsController.php
View File

@ -4,7 +4,6 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Database;
use PhpMyAdmin\Config;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\Database\Events;
@ -16,7 +15,6 @@ use PhpMyAdmin\Identifiers\DatabaseName;
use PhpMyAdmin\Message;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
use PhpMyAdmin\Url;
use PhpMyAdmin\Util;
use function __;
@ -40,7 +38,6 @@ final class EventsController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errors'] ??= null;
$GLOBALS['errorUrl'] ??= null;
$this->response->addScriptFiles(['database/events.js', 'sql.js']);
@ -49,12 +46,6 @@ final class EventsController implements InvocableController
return $this->response->missingParameterError('db');
}
$GLOBALS['errorUrl'] = Util::getScriptNameForOption(
Config::getInstance()->settings['DefaultTabDatabase'],
'database',
);
$GLOBALS['errorUrl'] .= Url::getCommon(['db' => Current::$database], '&');
$databaseName = DatabaseName::tryFrom($request->getParam('db'));
if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) {
$this->response->redirectToRoute('/', ['reload' => true, 'message' => __('No databases selected.')]);

9
src/Controllers/Database/ExportController.php
View File

@ -4,7 +4,6 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Database;
use PhpMyAdmin\Config;
use PhpMyAdmin\Config\PageSettings;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
@ -19,7 +18,6 @@ use PhpMyAdmin\Plugins;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Url;
use PhpMyAdmin\UrlParams;
use PhpMyAdmin\Util;
use function __;
use function array_merge;
@ -41,7 +39,6 @@ final class ExportController implements InvocableController
{
$GLOBALS['table_select'] ??= null;
$GLOBALS['unlim_num_rows'] ??= null;
$GLOBALS['errorUrl'] ??= null;
$this->pageSettings->init('Export');
$pageSettingsErrorHtml = $this->pageSettings->getErrorHTML();
@ -53,12 +50,6 @@ final class ExportController implements InvocableController
return $this->response->missingParameterError('db');
}
$GLOBALS['errorUrl'] = Util::getScriptNameForOption(
Config::getInstance()->settings['DefaultTabDatabase'],
'database',
);
$GLOBALS['errorUrl'] .= Url::getCommon(['db' => Current::$database], '&');
$databaseName = DatabaseName::tryFrom($request->getParam('db'));
if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) {
if ($request->isAjax()) {

4
src/Controllers/Database/ImportController.php
View File

@ -21,7 +21,6 @@ use PhpMyAdmin\Import\ImportSettings;
use PhpMyAdmin\Message;
use PhpMyAdmin\Plugins;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Url;
use PhpMyAdmin\Util;
use PhpMyAdmin\Utils\ForeignKey;
@ -41,7 +40,6 @@ final class ImportController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['SESSION_KEY'] ??= null;
$GLOBALS['errorUrl'] ??= null;
$this->pageSettings->init('Import');
$pageSettingsErrorHtml = $this->pageSettings->getErrorHTML();
@ -54,8 +52,6 @@ final class ImportController implements InvocableController
}
$config = Config::getInstance();
$GLOBALS['errorUrl'] = Util::getScriptNameForOption($config->settings['DefaultTabDatabase'], 'database');
$GLOBALS['errorUrl'] .= Url::getCommon(['db' => Current::$database], '&');
$databaseName = DatabaseName::tryFrom($request->getParam('db'));
if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) {

10
src/Controllers/Database/RoutinesController.php
View File

@ -18,7 +18,6 @@ use PhpMyAdmin\Identifiers\TableName;
use PhpMyAdmin\Message;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
use PhpMyAdmin\Url;
use PhpMyAdmin\UrlParams;
use PhpMyAdmin\UserPrivilegesFactory;
use PhpMyAdmin\Util;
@ -51,7 +50,6 @@ final class RoutinesController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errors'] ??= null;
$GLOBALS['errorUrl'] ??= null;
$this->response->addScriptFiles(['database/routines.js', 'sql.js']);
@ -70,8 +68,6 @@ final class RoutinesController implements InvocableController
*/
if (Current::$table !== '' && in_array(Current::$table, $this->dbi->getTables(Current::$database), true)) {
UrlParams::$params = ['db' => Current::$database, 'table' => Current::$table];
$GLOBALS['errorUrl'] = Util::getScriptNameForOption($config->settings['DefaultTabTable'], 'table');
$GLOBALS['errorUrl'] .= Url::getCommon(UrlParams::$params, '&');
$databaseName = DatabaseName::tryFrom($request->getParam('db'));
if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) {
@ -92,12 +88,6 @@ final class RoutinesController implements InvocableController
} else {
Current::$table = '';
$GLOBALS['errorUrl'] = Util::getScriptNameForOption(
$config->settings['DefaultTabDatabase'],
'database',
);
$GLOBALS['errorUrl'] .= Url::getCommon(['db' => Current::$database], '&');
$databaseName = DatabaseName::tryFrom($request->getParam('db'));
if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) {
$this->response->redirectToRoute(

8
src/Controllers/Database/SearchController.php
View File

@ -35,8 +35,6 @@ final class SearchController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] ??= null;
$this->response->addScriptFiles(['database/search.js', 'sql.js', 'makegrid.js']);
if (Current::$database === '') {
@ -44,8 +42,8 @@ final class SearchController implements InvocableController
}
$config = Config::getInstance();
$GLOBALS['errorUrl'] = Util::getScriptNameForOption($config->settings['DefaultTabDatabase'], 'database');
$GLOBALS['errorUrl'] .= Url::getCommon(['db' => Current::$database], '&');
$errorUrl = Util::getScriptNameForOption($config->settings['DefaultTabDatabase'], 'database');
$errorUrl .= Url::getCommon(['db' => Current::$database], '&');
$databaseName = DatabaseName::tryFrom($request->getParam('db'));
if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) {
@ -75,7 +73,7 @@ final class SearchController implements InvocableController
$this->response->render('error/simple', [
'error_message' => $errorMessage,
'back_url' => $GLOBALS['errorUrl'],
'back_url' => $errorUrl,
]);
return $this->response->response();

10
src/Controllers/Database/SqlController.php
View File

@ -4,7 +4,6 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Database;
use PhpMyAdmin\Config;
use PhpMyAdmin\Config\PageSettings;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
@ -17,7 +16,6 @@ use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\SqlQueryForm;
use PhpMyAdmin\Url;
use PhpMyAdmin\UrlParams;
use PhpMyAdmin\Util;
use function __;
use function htmlspecialchars;
@ -37,8 +35,6 @@ class SqlController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] ??= null;
$this->response->addScriptFiles(['makegrid.js', 'vendor/jquery/jquery.uitablefilter.js', 'sql.js']);
$this->pageSettings->init('Sql');
@ -49,12 +45,6 @@ class SqlController implements InvocableController
return $this->response->missingParameterError('db');
}
$GLOBALS['errorUrl'] = Util::getScriptNameForOption(
Config::getInstance()->settings['DefaultTabDatabase'],
'database',
);
$GLOBALS['errorUrl'] .= Url::getCommon(['db' => Current::$database], '&');
$databaseName = DatabaseName::tryFrom($request->getParam('db'));
if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) {
if ($request->isAjax()) {

6
src/Controllers/Database/Structure/FavoriteTableController.php
View File

@ -19,8 +19,6 @@ use PhpMyAdmin\Identifiers\TableName;
use PhpMyAdmin\Message;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
use PhpMyAdmin\Url;
use PhpMyAdmin\Util;
use function __;
use function count;
@ -41,15 +39,11 @@ final class FavoriteTableController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] ??= null;
if (Current::$database === '') {
return $this->response->response();
}
$config = Config::getInstance();
$GLOBALS['errorUrl'] = Util::getScriptNameForOption($config->settings['DefaultTabDatabase'], 'database');
$GLOBALS['errorUrl'] .= Url::getCommon(['db' => Current::$database], '&');
if (! $request->isAjax()) {
return $this->response->response();

10
src/Controllers/Database/Structure/RealRowCountController.php
View File

@ -4,7 +4,6 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Database\Structure;
use PhpMyAdmin\Config;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\DatabaseInterface;
@ -14,7 +13,6 @@ use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\Identifiers\DatabaseName;
use PhpMyAdmin\Message;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Url;
use PhpMyAdmin\Util;
use function __;
@ -33,8 +31,6 @@ final class RealRowCountController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] ??= null;
$parameters = [
'real_row_count_all' => $_REQUEST['real_row_count_all'] ?? null,
'table' => $_REQUEST['table'] ?? null,
@ -44,12 +40,6 @@ final class RealRowCountController implements InvocableController
return $this->response->missingParameterError('db');
}
$GLOBALS['errorUrl'] = Util::getScriptNameForOption(
Config::getInstance()->settings['DefaultTabDatabase'],
'database',
);
$GLOBALS['errorUrl'] .= Url::getCommon(['db' => Current::$database], '&');
if (! $request->isAjax()) {
return $this->response->response();
}

4
src/Controllers/Database/StructureController.php
View File

@ -123,8 +123,6 @@ final class StructureController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] ??= null;
$parameters = ['sort' => $_REQUEST['sort'] ?? null, 'sort_order' => $_REQUEST['sort_order'] ?? null];
if (Current::$database === '') {
@ -132,8 +130,6 @@ final class StructureController implements InvocableController
}
$config = Config::getInstance();
$GLOBALS['errorUrl'] = Util::getScriptNameForOption($config->settings['DefaultTabDatabase'], 'database');
$GLOBALS['errorUrl'] .= Url::getCommon(['db' => Current::$database], '&');
$databaseName = DatabaseName::tryFrom($request->getParam('db'));
if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) {

5
src/Controllers/Database/TrackingController.php
View File

@ -19,7 +19,6 @@ use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Tracking\Tracking;
use PhpMyAdmin\Url;
use PhpMyAdmin\UrlParams;
use PhpMyAdmin\Util;
use function __;
use function htmlspecialchars;
@ -40,8 +39,6 @@ final class TrackingController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] ??= null;
$this->response->addScriptFiles(['vendor/jquery/jquery.tablesorter.js', 'database/tracking.js']);
if (Current::$database === '') {
@ -49,8 +46,6 @@ final class TrackingController implements InvocableController
}
$config = Config::getInstance();
$GLOBALS['errorUrl'] = Util::getScriptNameForOption($config->settings['DefaultTabDatabase'], 'database');
$GLOBALS['errorUrl'] .= Url::getCommon(['db' => Current::$database], '&');
$databaseName = DatabaseName::tryFrom($request->getParam('db'));
if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) {

42
src/Controllers/Export/ExportController.php
View File

@ -26,7 +26,6 @@ use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Sanitize;
use PhpMyAdmin\SqlParser\Parser;
use PhpMyAdmin\SqlParser\Statements\SelectStatement;
use PhpMyAdmin\Url;
use PhpMyAdmin\Util;
use Webmozart\Assert\Assert;
@ -52,7 +51,6 @@ final class ExportController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['export_type'] ??= null;
$GLOBALS['errorUrl'] ??= null;
$GLOBALS['message'] ??= null;
$GLOBALS['compression'] ??= null;
$GLOBALS['asfile'] ??= null;
@ -141,7 +139,6 @@ final class ExportController implements InvocableController
$GLOBALS['buffer_needed'] = false;
$GLOBALS['save_filename'] = '';
$GLOBALS['file_handle'] = '';
$GLOBALS['errorUrl'] = '';
$filename = '';
$separateFiles = '';
@ -169,22 +166,24 @@ final class ExportController implements InvocableController
$tableNames = [];
// Generate error url and check for needed variables
if ($GLOBALS['export_type'] === 'server') {
$GLOBALS['errorUrl'] = Url::getFromRoute('/server/export');
} elseif ($GLOBALS['export_type'] === 'database' && Current::$database !== '') {
$GLOBALS['errorUrl'] = Url::getFromRoute('/database/export', ['db' => Current::$database]);
if ($GLOBALS['export_type'] === 'database') {
if (Current::$database === '') {
return $this->response->missingParameterError('db');
}
// Check if we have something to export
$tableNames = $GLOBALS['table_select'] ?? [];
Assert::isArray($tableNames);
Assert::allString($tableNames);
} elseif ($GLOBALS['export_type'] === 'table' && Current::$database !== '' && Current::$table !== '') {
$GLOBALS['errorUrl'] = Url::getFromRoute('/table/export', [
'db' => Current::$database,
'table' => Current::$table,
]);
} elseif ($GLOBALS['export_type'] === 'raw') {
$GLOBALS['errorUrl'] = Url::getFromRoute('/server/export', ['sql_query' => Current::$sqlQuery]);
} else {
} elseif ($GLOBALS['export_type'] === 'table') {
if (Current::$database === '') {
return $this->response->missingParameterError('db');
}
if (Current::$table === '') {
return $this->response->missingParameterError('table');
}
} elseif ($GLOBALS['export_type'] !== 'raw' && $GLOBALS['export_type'] !== 'server') {
$this->response->setRequestStatus(false);
$this->response->addHTML(Message::error(__('Bad parameters!'))->getDisplay());
@ -362,7 +361,6 @@ final class ExportController implements InvocableController
$dbSelect,
$whatStrucOrData,
$exportPlugin,
$GLOBALS['errorUrl'],
$GLOBALS['export_type'],
$doRelation,
$doComments,
@ -395,7 +393,6 @@ final class ExportController implements InvocableController
$tableStructure,
$GLOBALS['table_data'],
$exportPlugin,
$GLOBALS['errorUrl'],
$GLOBALS['export_type'],
$doRelation,
$doComments,
@ -415,7 +412,6 @@ final class ExportController implements InvocableController
$tableStructure,
$GLOBALS['table_data'],
$exportPlugin,
$GLOBALS['errorUrl'],
$GLOBALS['export_type'],
$doRelation,
$doComments,
@ -426,13 +422,7 @@ final class ExportController implements InvocableController
);
}
} elseif ($GLOBALS['export_type'] === 'raw') {
Export::exportRaw(
$whatStrucOrData,
$exportPlugin,
$GLOBALS['errorUrl'],
Current::$database,
Current::$sqlQuery,
);
Export::exportRaw($whatStrucOrData, $exportPlugin, Current::$database, Current::$sqlQuery);
} else {
// We export just one table
@ -448,7 +438,6 @@ final class ExportController implements InvocableController
Current::$table,
$whatStrucOrData,
$exportPlugin,
$GLOBALS['errorUrl'],
$GLOBALS['export_type'],
$doRelation,
$doComments,
@ -469,7 +458,6 @@ final class ExportController implements InvocableController
Current::$table,
$whatStrucOrData,
$exportPlugin,
$GLOBALS['errorUrl'],
$GLOBALS['export_type'],
$doRelation,
$doComments,

2
src/Controllers/HomeController.php
View File

@ -67,7 +67,6 @@ final class HomeController implements InvocableController
$GLOBALS['message'] ??= null;
$GLOBALS['show_query'] ??= null;
$GLOBALS['errorUrl'] ??= null;
if ($request->isAjax() && ! empty($_REQUEST['access_time'])) {
return $this->response->response();
@ -81,7 +80,6 @@ final class HomeController implements InvocableController
Current::$database = $request->getParsedBodyParamAsString('db', '');
Current::$table = '';
$GLOBALS['show_query'] = '1';
$GLOBALS['errorUrl'] = Url::getFromRoute('/');
if (Current::$server > 0 && $this->dbi->isSuperUser()) {
$this->dbi->selectDb('mysql');

1
src/Controllers/Import/ImportController.php
View File

@ -65,7 +65,6 @@ final class ImportController implements InvocableController
$GLOBALS['ajax_reload'] ??= null;
$GLOBALS['import_text'] ??= null;
$GLOBALS['message'] ??= null;
$GLOBALS['errorUrl'] ??= null;
$GLOBALS['error'] ??= null;
$GLOBALS['result'] ??= null;

10
src/Controllers/Operations/Database/CollationController.php
View File

@ -4,7 +4,6 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Operations\Database;
use PhpMyAdmin\Config;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\DatabaseInterface;
@ -15,7 +14,6 @@ use PhpMyAdmin\Identifiers\DatabaseName;
use PhpMyAdmin\Message;
use PhpMyAdmin\Operations;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Url;
use PhpMyAdmin\Util;
use function __;
@ -32,8 +30,6 @@ final class CollationController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] ??= null;
if (! $request->isAjax()) {
return $this->response->response();
}
@ -50,12 +46,6 @@ final class CollationController implements InvocableController
return $this->response->missingParameterError('db');
}
$GLOBALS['errorUrl'] = Util::getScriptNameForOption(
Config::getInstance()->settings['DefaultTabDatabase'],
'database',
);
$GLOBALS['errorUrl'] .= Url::getCommon(['db' => Current::$database], '&');
$databaseName = DatabaseName::tryFrom($request->getParam('db'));
if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) {
$this->response->setRequestStatus(false);

3
src/Controllers/Operations/DatabaseController.php
View File

@ -50,7 +50,6 @@ final class DatabaseController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['message'] ??= null;
$GLOBALS['errorUrl'] ??= null;
$GLOBALS['single_table'] ??= null;
$userPrivileges = $this->userPrivilegesFactory->getPrivileges();
@ -230,8 +229,6 @@ final class DatabaseController implements InvocableController
}
$config = Config::getInstance();
$GLOBALS['errorUrl'] = Util::getScriptNameForOption($config->settings['DefaultTabDatabase'], 'database');
$GLOBALS['errorUrl'] .= Url::getCommon(['db' => Current::$database], '&');
$databaseName = DatabaseName::tryFrom($request->getParam('db'));
if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) {

3
src/Controllers/Operations/TableController.php
View File

@ -57,7 +57,6 @@ final class TableController implements InvocableController
{
$GLOBALS['auto_increment'] ??= null;
$GLOBALS['message_to_show'] ??= null;
$GLOBALS['errorUrl'] ??= null;
$userPrivileges = $this->userPrivilegesFactory->getPrivileges();
@ -80,8 +79,6 @@ final class TableController implements InvocableController
$isSystemSchema = Utilities::isSystemSchema(Current::$database);
UrlParams::$params = ['db' => Current::$database, 'table' => Current::$table];
$config = Config::getInstance();
$GLOBALS['errorUrl'] = Util::getScriptNameForOption($config->settings['DefaultTabTable'], 'table');
$GLOBALS['errorUrl'] .= Url::getCommon(UrlParams::$params, '&');
$databaseName = DatabaseName::tryFrom($request->getParam('db'));
if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) {

8
src/Controllers/Operations/ViewController.php
View File

@ -4,7 +4,6 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Operations;
use PhpMyAdmin\Config;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\DatabaseInterface;
@ -19,7 +18,6 @@ use PhpMyAdmin\MessageType;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Url;
use PhpMyAdmin\UrlParams;
use PhpMyAdmin\Util;
use function __;
use function array_map;
@ -42,7 +40,6 @@ final class ViewController implements InvocableController
{
$tableObject = $this->dbi->getTable(Current::$database, Current::$table);
$GLOBALS['errorUrl'] ??= null;
$this->response->addScriptFiles(['table/operations.js']);
if (Current::$database === '') {
@ -54,11 +51,6 @@ final class ViewController implements InvocableController
}
UrlParams::$params = ['db' => Current::$database, 'table' => Current::$table];
$GLOBALS['errorUrl'] = Util::getScriptNameForOption(
Config::getInstance()->settings['DefaultTabTable'],
'table',
);
$GLOBALS['errorUrl'] .= Url::getCommon(UrlParams::$params, '&');
$databaseName = DatabaseName::tryFrom($request->getParam('db'));
if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) {

3
src/Controllers/Server/BinlogController.php
View File

@ -12,7 +12,6 @@ use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\Message;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Url;
use PhpMyAdmin\Util;
use function array_key_exists;
@ -39,8 +38,6 @@ final class BinlogController implements InvocableController
$log = $request->getParsedBodyParamAsString('log');
$position = (int) $request->getParsedBodyParamAsString('pos', '');
$GLOBALS['errorUrl'] = Url::getFromRoute('/');
if ($this->dbi->isSuperUser()) {
$this->dbi->selectDb('mysql');
}

3
src/Controllers/Server/CollationsController.php
View File

@ -13,7 +13,6 @@ use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Url;
/**
* Handles viewing character sets and collations
@ -43,8 +42,6 @@ final class CollationsController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] = Url::getFromRoute('/');
if ($this->dbi->isSuperUser()) {
$this->dbi->selectDb('mysql');
}

3
src/Controllers/Server/Databases/DestroyController.php
View File

@ -13,7 +13,6 @@ use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\Message;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Transformations;
use PhpMyAdmin\Url;
use PhpMyAdmin\UserPrivilegesFactory;
use PhpMyAdmin\Util;
@ -36,7 +35,6 @@ final class DestroyController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['selected'] ??= null;
$GLOBALS['errorUrl'] ??= null;
$userPrivileges = $this->userPrivilegesFactory->getPrivileges();
@ -66,7 +64,6 @@ final class DestroyController implements InvocableController
return $this->response->response();
}
$GLOBALS['errorUrl'] = Url::getFromRoute('/server/databases');
$GLOBALS['selected'] = $selectedDbs;
$numberOfDatabases = count($selectedDbs);

3
src/Controllers/Server/DatabasesController.php
View File

@ -67,8 +67,6 @@ final class DatabasesController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] ??= null;
$userPrivileges = $this->userPrivilegesFactory->getPrivileges();
$this->hasStatistics = ! empty($request->getParam('statistics'));
@ -83,7 +81,6 @@ final class DatabasesController implements InvocableController
$this->sortOrder = strtolower($sortOrder) !== 'desc' ? 'asc' : 'desc';
$this->response->addScriptFiles(['server/databases.js']);
$GLOBALS['errorUrl'] = Url::getFromRoute('/');
if ($this->dbi->isSuperUser()) {
$this->dbi->selectDb('mysql');

3
src/Controllers/Server/EnginesController.php
View File

@ -10,7 +10,6 @@ use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\StorageEngine;
use PhpMyAdmin\Url;
/**
* Handles viewing storage engine details
@ -23,8 +22,6 @@ final class EnginesController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] = Url::getFromRoute('/');
if ($this->dbi->isSuperUser()) {
$this->dbi->selectDb('mysql');
}

2
src/Controllers/Server/ExportController.php
View File

@ -14,7 +14,6 @@ use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\Message;
use PhpMyAdmin\Plugins;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Url;
use function __;
use function array_merge;
@ -32,7 +31,6 @@ final class ExportController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['unlim_num_rows'] ??= null;
$GLOBALS['errorUrl'] = Url::getFromRoute('/');
$GLOBALS['tmp_select'] ??= null;
$GLOBALS['select_item'] ??= null;

3
src/Controllers/Server/ImportController.php
View File

@ -19,7 +19,6 @@ use PhpMyAdmin\Import\ImportSettings;
use PhpMyAdmin\Message;
use PhpMyAdmin\Plugins;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Url;
use PhpMyAdmin\Util;
use PhpMyAdmin\Utils\ForeignKey;
@ -38,14 +37,12 @@ final class ImportController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['SESSION_KEY'] ??= null;
$GLOBALS['errorUrl'] ??= null;
$this->pageSettings->init('Import');
$pageSettingsErrorHtml = $this->pageSettings->getErrorHTML();
$pageSettingsHtml = $this->pageSettings->getHTML();
$this->response->addScriptFiles(['import.js']);
$GLOBALS['errorUrl'] = Url::getFromRoute('/');
if ($this->dbi->isSuperUser()) {
$this->dbi->selectDb('mysql');

3
src/Controllers/Server/PluginsController.php
View File

@ -10,7 +10,6 @@ use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Server\Plugins;
use PhpMyAdmin\Url;
use function array_keys;
use function ksort;
@ -31,8 +30,6 @@ final class PluginsController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] = Url::getFromRoute('/');
if ($this->dbi->isSuperUser()) {
$this->dbi->selectDb('mysql');
}

5
src/Controllers/Server/PrivilegesController.php
View File

@ -46,7 +46,6 @@ final class PrivilegesController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] ??= null;
$GLOBALS['message'] ??= null;
$GLOBALS['username'] ??= null;
$GLOBALS['hostname'] ??= null;
@ -76,7 +75,7 @@ final class PrivilegesController implements InvocableController
]);
}
$GLOBALS['errorUrl'] = Url::getFromRoute('/');
$errorUrl = Url::getFromRoute('/');
if ($this->dbi->isSuperUser()) {
$this->dbi->selectDb('mysql');
@ -253,7 +252,7 @@ final class PrivilegesController implements InvocableController
*/
if ($request->hasBodyParam('change_pw')) {
$GLOBALS['message'] = $serverPrivileges->updatePassword(
$GLOBALS['errorUrl'],
$errorUrl,
$GLOBALS['username'] ?? '',
$GLOBALS['hostname'] ?? '',
);

5
src/Controllers/Server/ReplicationController.php
View File

@ -14,7 +14,6 @@ use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\Replication\ReplicationGui;
use PhpMyAdmin\Replication\ReplicationInfo;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Url;
use PhpMyAdmin\UrlParams;
use function is_array;
@ -33,14 +32,10 @@ final class ReplicationController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] ??= null;
$hasReplicaClearScreen = (bool) $request->getParsedBodyParamAsStringOrNull('replica_clear_screen');
$replicaConfigure = $request->getParsedBodyParam('replica_configure');
$primaryConfigure = $request->getParsedBodyParam('primary_configure');
$GLOBALS['errorUrl'] = Url::getFromRoute('/');
if ($this->dbi->isSuperUser()) {
$this->dbi->selectDb('mysql');
}

3
src/Controllers/Server/ShowEngineController.php
View File

@ -10,7 +10,6 @@ use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\StorageEngine;
use PhpMyAdmin\Url;
use function is_array;
use function is_string;
@ -31,8 +30,6 @@ final class ShowEngineController implements InvocableController
{
$this->setEngineAndPageProperties($request->getAttribute('routeVars'));
$GLOBALS['errorUrl'] = Url::getFromRoute('/');
if ($this->dbi->isSuperUser()) {
$this->dbi->selectDb('mysql');
}

4
src/Controllers/Server/SqlController.php
View File

@ -11,7 +11,6 @@ use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\SqlQueryForm;
use PhpMyAdmin\Url;
/**
* Server SQL executor
@ -28,14 +27,11 @@ final class SqlController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] ??= null;
$this->response->addScriptFiles(['makegrid.js', 'vendor/jquery/jquery.uitablefilter.js', 'sql.js']);
$this->pageSettings->init('Sql');
$this->response->addHTML($this->pageSettings->getErrorHTML());
$this->response->addHTML($this->pageSettings->getHTML());
$GLOBALS['errorUrl'] = Url::getFromRoute('/');
if ($this->dbi->isSuperUser()) {
$this->dbi->selectDb('mysql');

4
src/Controllers/Server/Status/Monitor/ChartingDataController.php
View File

@ -13,7 +13,6 @@ use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Server\Status\Data;
use PhpMyAdmin\Server\Status\Monitor;
use PhpMyAdmin\Template;
use PhpMyAdmin\Url;
final class ChartingDataController extends AbstractController implements InvocableController
{
@ -29,10 +28,7 @@ final class ChartingDataController extends AbstractController implements Invocab
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] ??= null;
$requiredData = $request->getParsedBodyParamAsString('requiredData', '');
$GLOBALS['errorUrl'] = Url::getFromRoute('/');
if ($this->dbi->isSuperUser()) {
$this->dbi->selectDb('mysql');

5
src/Controllers/Server/Status/Monitor/GeneralLogController.php
View File

@ -13,7 +13,6 @@ use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Server\Status\Data;
use PhpMyAdmin\Server\Status\Monitor;
use PhpMyAdmin\Template;
use PhpMyAdmin\Url;
final class GeneralLogController extends AbstractController implements InvocableController
{
@ -29,10 +28,6 @@ final class GeneralLogController extends AbstractController implements Invocable
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] ??= null;
$GLOBALS['errorUrl'] = Url::getFromRoute('/');
if ($this->dbi->isSuperUser()) {
$this->dbi->selectDb('mysql');
}

5
src/Controllers/Server/Status/Monitor/LogVarsController.php
View File

@ -13,7 +13,6 @@ use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Server\Status\Data;
use PhpMyAdmin\Server\Status\Monitor;
use PhpMyAdmin\Template;
use PhpMyAdmin\Url;
final class LogVarsController extends AbstractController implements InvocableController
{
@ -29,10 +28,6 @@ final class LogVarsController extends AbstractController implements InvocableCon
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] ??= null;
$GLOBALS['errorUrl'] = Url::getFromRoute('/');
if ($this->dbi->isSuperUser()) {
$this->dbi->selectDb('mysql');
}

5
src/Controllers/Server/Status/Monitor/QueryAnalyzerController.php
View File

@ -13,7 +13,6 @@ use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Server\Status\Data;
use PhpMyAdmin\Server\Status\Monitor;
use PhpMyAdmin\Template;
use PhpMyAdmin\Url;
final class QueryAnalyzerController extends AbstractController implements InvocableController
{
@ -29,10 +28,6 @@ final class QueryAnalyzerController extends AbstractController implements Invoca
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] ??= null;
$GLOBALS['errorUrl'] = Url::getFromRoute('/');
if ($this->dbi->isSuperUser()) {
$this->dbi->selectDb('mysql');
}

5
src/Controllers/Server/Status/Monitor/SlowLogController.php
View File

@ -13,7 +13,6 @@ use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Server\Status\Data;
use PhpMyAdmin\Server\Status\Monitor;
use PhpMyAdmin\Template;
use PhpMyAdmin\Url;
final class SlowLogController extends AbstractController implements InvocableController
{
@ -29,10 +28,6 @@ final class SlowLogController extends AbstractController implements InvocableCon
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] ??= null;
$GLOBALS['errorUrl'] = Url::getFromRoute('/');
if ($this->dbi->isSuperUser()) {
$this->dbi->selectDb('mysql');
}

3
src/Controllers/Server/Status/MonitorController.php
View File

@ -12,7 +12,6 @@ use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Server\Status\Data;
use PhpMyAdmin\Server\SysInfo\SysInfo;
use PhpMyAdmin\Template;
use PhpMyAdmin\Url;
use function is_numeric;
use function microtime;
@ -30,8 +29,6 @@ final class MonitorController extends AbstractController implements InvocableCon
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] = Url::getFromRoute('/');
if ($this->dbi->isSuperUser()) {
$this->dbi->selectDb('mysql');
}

3
src/Controllers/Server/Status/ProcessesController.php
View File

@ -12,7 +12,6 @@ use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Server\Status\Data;
use PhpMyAdmin\Server\Status\Processes;
use PhpMyAdmin\Template;
use PhpMyAdmin\Url;
final class ProcessesController extends AbstractController implements InvocableController
{
@ -28,8 +27,6 @@ final class ProcessesController extends AbstractController implements InvocableC
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] = Url::getFromRoute('/');
$showExecuting = $request->hasBodyParam('showExecuting');
$full = $request->getParsedBodyParam('full') === '1';
$orderByField = $request->getParsedBodyParamAsString('order_by_field', '');

3
src/Controllers/Server/Status/QueriesController.php
View File

@ -14,7 +14,6 @@ use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Server\Status\Data;
use PhpMyAdmin\Template;
use PhpMyAdmin\Url;
use function __;
use function array_keys;
@ -40,8 +39,6 @@ final class QueriesController extends AbstractController implements InvocableCon
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] = Url::getFromRoute('/');
if ($this->dbi->isSuperUser()) {
$this->dbi->selectDb('mysql');
}

3
src/Controllers/Server/Status/StatusController.php
View File

@ -13,7 +13,6 @@ use PhpMyAdmin\Replication\ReplicationGui;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Server\Status\Data;
use PhpMyAdmin\Template;
use PhpMyAdmin\Url;
use PhpMyAdmin\Util;
use function __;
@ -36,8 +35,6 @@ final class StatusController extends AbstractController implements InvocableCont
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] = Url::getFromRoute('/');
if ($this->dbi->isSuperUser()) {
$this->dbi->selectDb('mysql');
}

4
src/Controllers/Server/Status/VariablesController.php
View File

@ -15,7 +15,6 @@ use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Server\Status\Data;
use PhpMyAdmin\Template;
use PhpMyAdmin\Url;
use function __;
use function in_array;
@ -35,13 +34,10 @@ final class VariablesController extends AbstractController implements InvocableC
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] ??= null;
$filterAlert = $request->getParsedBodyParam('filterAlert');
$filterText = $request->getParsedBodyParam('filterText');
$filterCategory = $request->getParsedBodyParam('filterCategory');
$dontFormat = $request->getParsedBodyParam('dontFormat');
$GLOBALS['errorUrl'] = Url::getFromRoute('/');
if ($this->dbi->isSuperUser()) {
$this->dbi->selectDb('mysql');

3
src/Controllers/Server/VariablesController.php
View File

@ -12,7 +12,6 @@ use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\Providers\ServerVariables\ServerVariablesProvider;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
use PhpMyAdmin\Url;
use PhpMyAdmin\Util;
use function implode;
@ -36,8 +35,6 @@ final class VariablesController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] = Url::getFromRoute('/');
if ($this->dbi->isSuperUser()) {
$this->dbi->selectDb('mysql');
}

27
src/Controllers/Sql/SqlController.php
View File

@ -43,7 +43,6 @@ class SqlController implements InvocableController
{
$GLOBALS['display_query'] ??= null;
$GLOBALS['ajax_reload'] ??= null;
$GLOBALS['errorUrl'] ??= null;
$GLOBALS['unlim_num_rows'] ??= null;
$GLOBALS['import_text'] ??= null;
$GLOBALS['disp_query'] ??= null;
@ -82,19 +81,17 @@ class SqlController implements InvocableController
}
}
if (! isset($GLOBALS['errorUrl'])) {
$GLOBALS['errorUrl'] = UrlParams::$back !== '' ? UrlParams::$back : UrlParams::$goto;
$GLOBALS['errorUrl'] .= Url::getCommon(
['db' => Current::$database],
! str_contains($GLOBALS['errorUrl'], '?') ? '?' : '&',
);
if (
(mb_strpos(' ' . $GLOBALS['errorUrl'], 'db_') !== 1
|| ! str_contains($GLOBALS['errorUrl'], '?route=/database/'))
&& Current::$table !== ''
) {
$GLOBALS['errorUrl'] .= '&amp;table=' . urlencode(Current::$table);
}
$errorUrl = UrlParams::$back !== '' ? UrlParams::$back : UrlParams::$goto;
$errorUrl .= Url::getCommon(
['db' => Current::$database],
! str_contains($errorUrl, '?') ? '?' : '&',
);
if (
(mb_strpos(' ' . $errorUrl, 'db_') !== 1
|| ! str_contains($errorUrl, '?route=/database/'))
&& Current::$table !== ''
) {
$errorUrl .= '&amp;table=' . urlencode(Current::$table);
}
/** @var array<string>|null $bkmFields */
@ -162,7 +159,7 @@ class SqlController implements InvocableController
__('"DROP DATABASE" statements are disabled.'),
'',
false,
$GLOBALS['errorUrl'],
$errorUrl,
);
}

12
src/Controllers/Table/AddFieldController.php
View File

@ -23,7 +23,6 @@ use PhpMyAdmin\Table\ColumnsDefinition;
use PhpMyAdmin\Transformations;
use PhpMyAdmin\Url;
use PhpMyAdmin\UserPrivilegesFactory;
use PhpMyAdmin\Util;
use function __;
use function is_array;
@ -49,7 +48,6 @@ final class AddFieldController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] ??= null;
$GLOBALS['message'] ??= null;
$numberOfFields = $request->getParsedBodyParamAsStringOrNull('num_fields');
@ -71,7 +69,7 @@ final class AddFieldController implements InvocableController
/**
* Defines the url to return to in case of error in a sql statement
*/
$GLOBALS['errorUrl'] = Url::getFromRoute(
$errorUrl = Url::getFromRoute(
'/table/sql',
['db' => Current::$database, 'table' => Current::$table],
);
@ -102,11 +100,11 @@ final class AddFieldController implements InvocableController
$result = $createAddField->tryColumnCreationQuery(
DatabaseName::from(Current::$database),
Current::$sqlQuery,
$GLOBALS['errorUrl'],
$errorUrl,
);
if (! $result) {
$errorMessageHtml = Generator::mysqlDie('', '', false, $GLOBALS['errorUrl'], false);
$errorMessageHtml = Generator::mysqlDie('', '', false, $errorUrl, false);
$this->response->addHTML($errorMessageHtml ?? '');
$this->response->setRequestStatus(false);
@ -156,10 +154,6 @@ final class AddFieldController implements InvocableController
return $this->response->response();
}
$urlParams = ['db' => Current::$database, 'table' => Current::$table];
$GLOBALS['errorUrl'] = Util::getScriptNameForOption($cfg['DefaultTabTable'], 'table');
$GLOBALS['errorUrl'] .= Url::getCommon($urlParams, '&');
$databaseName = DatabaseName::tryFrom($request->getParam('db'));
if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) {
if ($request->isAjax()) {

7
src/Controllers/Table/ChangeController.php
View File

@ -52,7 +52,6 @@ class ChangeController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['disp_message'] ??= null;
$GLOBALS['errorUrl'] ??= null;
$GLOBALS['where_clause'] ??= null;
$GLOBALS['unsaved_values'] ??= null;
$GLOBALS['current_result'] ??= null;
@ -141,7 +140,7 @@ class ChangeController implements InvocableController
UrlParams::$params['table'] = Current::$table;
}
$GLOBALS['errorUrl'] = UrlParams::$goto . Url::getCommon(
$errorUrl = UrlParams::$goto . Url::getCommon(
UrlParams::$params,
! str_contains(UrlParams::$goto, '?') ? '?' : '&',
);
@ -181,7 +180,7 @@ class ChangeController implements InvocableController
Current::$table,
$whereClauses,
$whereClauseArray,
$GLOBALS['errorUrl'],
$errorUrl,
);
/**
@ -283,7 +282,7 @@ class ChangeController implements InvocableController
Current::$table,
Current::$database,
$whereClauseArray,
$GLOBALS['errorUrl'],
$errorUrl,
);
}

14
src/Controllers/Table/ChartController.php
View File

@ -44,8 +44,6 @@ final class ChartController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] ??= null;
if (isset($_REQUEST['pos'], $_REQUEST['session_max_rows']) && $request->isAjax()) {
$this->ajax($request);
@ -80,8 +78,6 @@ final class ChartController implements InvocableController
}
$urlParams = ['db' => Current::$database, 'table' => Current::$table];
$GLOBALS['errorUrl'] = Util::getScriptNameForOption($config->settings['DefaultTabTable'], 'table');
$GLOBALS['errorUrl'] .= Url::getCommon($urlParams, '&');
$databaseName = DatabaseName::tryFrom($request->getParam('db'));
if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) {
@ -118,9 +114,6 @@ final class ChartController implements InvocableController
$urlParams['goto'] = Util::getScriptNameForOption($config->settings['DefaultTabDatabase'], 'database');
$urlParams['back'] = Url::getFromRoute('/sql');
$GLOBALS['errorUrl'] = Util::getScriptNameForOption($config->settings['DefaultTabDatabase'], 'database');
$GLOBALS['errorUrl'] .= Url::getCommon(['db' => Current::$database], '&');
$databaseName = DatabaseName::tryFrom($request->getParam('db'));
if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) {
if ($request->isAjax()) {
@ -137,7 +130,6 @@ final class ChartController implements InvocableController
} else {
$urlParams['goto'] = Util::getScriptNameForOption($config->settings['DefaultTabServer'], 'server');
$urlParams['back'] = Url::getFromRoute('/sql');
$GLOBALS['errorUrl'] = Url::getFromRoute('/');
if ($this->dbi->isSuperUser()) {
$this->dbi->selectDb('mysql');
@ -199,14 +191,8 @@ final class ChartController implements InvocableController
*/
public function ajax(ServerRequest $request): void
{
$GLOBALS['errorUrl'] ??= null;
if (Current::$table !== '' && Current::$database !== '') {
UrlParams::$params = ['db' => Current::$database, 'table' => Current::$table];
$GLOBALS['errorUrl'] = Util::getScriptNameForOption(
Config::getInstance()->settings['DefaultTabTable'],
'table',
);
$GLOBALS['errorUrl'] .= Url::getCommon(UrlParams::$params, '&');
$databaseName = DatabaseName::tryFrom($request->getParam('db'));
if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) {

10
src/Controllers/Table/DeleteConfirmController.php
View File

@ -4,7 +4,6 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Table;
use PhpMyAdmin\Config;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\DbTableExists;
@ -14,9 +13,7 @@ use PhpMyAdmin\Identifiers\DatabaseName;
use PhpMyAdmin\Identifiers\TableName;
use PhpMyAdmin\Message;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Url;
use PhpMyAdmin\UrlParams;
use PhpMyAdmin\Util;
use PhpMyAdmin\Utils\ForeignKey;
use function __;
@ -32,8 +29,6 @@ final class DeleteConfirmController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] ??= null;
$selected = $_POST['rows_to_delete'] ?? null;
if (! isset($selected) || ! is_array($selected)) {
@ -52,11 +47,6 @@ final class DeleteConfirmController implements InvocableController
}
UrlParams::$params = ['db' => Current::$database, 'table' => Current::$table];
$GLOBALS['errorUrl'] = Util::getScriptNameForOption(
Config::getInstance()->settings['DefaultTabTable'],
'table',
);
$GLOBALS['errorUrl'] .= Url::getCommon(UrlParams::$params, '&');
$databaseName = DatabaseName::tryFrom($request->getParam('db'));
if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) {

8
src/Controllers/Table/ExportController.php
View File

@ -4,7 +4,6 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Table;
use PhpMyAdmin\Config;
use PhpMyAdmin\Config\PageSettings;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
@ -19,7 +18,6 @@ use PhpMyAdmin\SqlParser\Statements\SelectStatement;
use PhpMyAdmin\SqlParser\Utils\Query;
use PhpMyAdmin\Url;
use PhpMyAdmin\UrlParams;
use PhpMyAdmin\Util;
use function __;
use function array_merge;
@ -37,7 +35,6 @@ class ExportController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] ??= null;
$GLOBALS['where_clause'] ??= null;
$GLOBALS['unlim_num_rows'] ??= null;
@ -56,11 +53,6 @@ class ExportController implements InvocableController
}
UrlParams::$params = ['db' => Current::$database, 'table' => Current::$table];
$GLOBALS['errorUrl'] = Util::getScriptNameForOption(
Config::getInstance()->settings['DefaultTabTable'],
'table',
);
$GLOBALS['errorUrl'] .= Url::getCommon(UrlParams::$params, '&');
UrlParams::$params['goto'] = Url::getFromRoute('/table/export');
UrlParams::$params['back'] = Url::getFromRoute('/table/export');

7
src/Controllers/Table/FindReplaceController.php
View File

@ -18,7 +18,6 @@ use PhpMyAdmin\Message;
use PhpMyAdmin\MessageType;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
use PhpMyAdmin\Url;
use PhpMyAdmin\UrlParams;
use PhpMyAdmin\Util;
@ -55,7 +54,6 @@ final class FindReplaceController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] ??= null;
if (Current::$database === '') {
return $this->response->missingParameterError('db');
}
@ -65,11 +63,6 @@ final class FindReplaceController implements InvocableController
}
UrlParams::$params = ['db' => Current::$database, 'table' => Current::$table];
$GLOBALS['errorUrl'] = Util::getScriptNameForOption(
Config::getInstance()->settings['DefaultTabTable'],
'table',
);
$GLOBALS['errorUrl'] .= Url::getCommon(UrlParams::$params, '&');
$databaseName = DatabaseName::tryFrom($request->getParam('db'));
if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) {

6
src/Controllers/Table/GisVisualizationController.php
View File

@ -53,12 +53,6 @@ final class GisVisualizationController implements InvocableController
return $this->response->missingParameterError('db');
}
$GLOBALS['errorUrl'] = Util::getScriptNameForOption(
Config::getInstance()->settings['DefaultTabDatabase'],
'database',
);
$GLOBALS['errorUrl'] .= Url::getCommon(['db' => Current::$database], '&');
$databaseName = DatabaseName::tryFrom($request->getParam('db'));
if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) {
if ($request->isAjax()) {

3
src/Controllers/Table/ImportController.php
View File

@ -43,7 +43,6 @@ final class ImportController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['SESSION_KEY'] ??= null;
$GLOBALS['errorUrl'] ??= null;
$this->pageSettings->init('Import');
$pageSettingsErrorHtml = $this->pageSettings->getErrorHTML();
@ -61,8 +60,6 @@ final class ImportController implements InvocableController
UrlParams::$params = ['db' => Current::$database, 'table' => Current::$table];
$config = Config::getInstance();
$GLOBALS['errorUrl'] = Util::getScriptNameForOption($config->settings['DefaultTabTable'], 'table');
$GLOBALS['errorUrl'] .= Url::getCommon(UrlParams::$params, '&');
$databaseName = DatabaseName::tryFrom($request->getParam('db'));
if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) {

10
src/Controllers/Table/IndexRenameController.php
View File

@ -4,7 +4,6 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Table;
use PhpMyAdmin\Config;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\DatabaseInterface;
@ -20,9 +19,7 @@ use PhpMyAdmin\MessageType;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Table\Indexes;
use PhpMyAdmin\Template;
use PhpMyAdmin\Url;
use PhpMyAdmin\UrlParams;
use PhpMyAdmin\Util;
use function __;
@ -39,8 +36,6 @@ final class IndexRenameController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] ??= null;
if (Current::$database === '') {
return $this->response->missingParameterError('db');
}
@ -50,11 +45,6 @@ final class IndexRenameController implements InvocableController
}
UrlParams::$params = ['db' => Current::$database, 'table' => Current::$table];
$GLOBALS['errorUrl'] = Util::getScriptNameForOption(
Config::getInstance()->settings['DefaultTabTable'],
'table',
);
$GLOBALS['errorUrl'] .= Url::getCommon(UrlParams::$params, '&');
$databaseName = DatabaseName::tryFrom($request->getParam('db'));
if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) {

9
src/Controllers/Table/IndexesController.php
View File

@ -21,9 +21,7 @@ use PhpMyAdmin\MessageType;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Table\Indexes;
use PhpMyAdmin\Template;
use PhpMyAdmin\Url;
use PhpMyAdmin\UrlParams;
use PhpMyAdmin\Util;
use function __;
use function count;
@ -48,8 +46,6 @@ final class IndexesController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] ??= null;
if (! isset($_POST['create_edit_table'])) {
if (Current::$database === '') {
return $this->response->missingParameterError('db');
@ -60,11 +56,6 @@ final class IndexesController implements InvocableController
}
UrlParams::$params = ['db' => Current::$database, 'table' => Current::$table];
$GLOBALS['errorUrl'] = Util::getScriptNameForOption(
Config::getInstance()->settings['DefaultTabTable'],
'table',
);
$GLOBALS['errorUrl'] .= Url::getCommon(UrlParams::$params, '&');
$databaseName = DatabaseName::tryFrom($request->getParam('db'));
if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) {

4
src/Controllers/Table/ReplaceController.php
View File

@ -72,7 +72,6 @@ final class ReplaceController implements InvocableController
return $this->response->missingParameterError('goto');
}
$GLOBALS['errorUrl'] ??= null;
$GLOBALS['unsaved_values'] ??= null;
$GLOBALS['disp_query'] ??= null;
$GLOBALS['disp_message'] ??= null;
@ -99,9 +98,6 @@ final class ReplaceController implements InvocableController
//get $goto_include for different cases
$gotoInclude = $this->insertEdit->getGotoInclude(false);
// Defines the url to return in case of failure of the query
$GLOBALS['errorUrl'] = $this->insertEdit->getErrorUrl(UrlParams::$params);
/**
* Prepares the update/insert of a row
*/

6
src/Controllers/Table/SearchController.php
View File

@ -22,7 +22,6 @@ use PhpMyAdmin\Sql;
use PhpMyAdmin\Table\Search;
use PhpMyAdmin\Template;
use PhpMyAdmin\Transformations;
use PhpMyAdmin\Url;
use PhpMyAdmin\UrlParams;
use PhpMyAdmin\Util;
use PhpMyAdmin\Utils\Gis;
@ -165,11 +164,6 @@ final class SearchController implements InvocableController
}
UrlParams::$params = ['db' => Current::$database, 'table' => Current::$table];
$GLOBALS['errorUrl'] = Util::getScriptNameForOption(
Config::getInstance()->settings['DefaultTabTable'],
'table',
);
$GLOBALS['errorUrl'] .= Url::getCommon(UrlParams::$params, '&');
$databaseName = DatabaseName::tryFrom($request->getParam('db'));
if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) {

11
src/Controllers/Table/SqlController.php
View File

@ -4,7 +4,6 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Table;
use PhpMyAdmin\Config;
use PhpMyAdmin\Config\PageSettings;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
@ -18,7 +17,6 @@ use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\SqlQueryForm;
use PhpMyAdmin\Url;
use PhpMyAdmin\UrlParams;
use PhpMyAdmin\Util;
use function __;
use function htmlspecialchars;
@ -38,8 +36,6 @@ class SqlController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] ??= null;
$this->response->addScriptFiles(['makegrid.js', 'vendor/jquery/jquery.uitablefilter.js', 'sql.js']);
$this->pageSettings->init('Sql');
@ -54,13 +50,6 @@ class SqlController implements InvocableController
return $this->response->missingParameterError('table');
}
$urlParams = ['db' => Current::$database, 'table' => Current::$table];
$GLOBALS['errorUrl'] = Util::getScriptNameForOption(
Config::getInstance()->settings['DefaultTabTable'],
'table',
);
$GLOBALS['errorUrl'] .= Url::getCommon($urlParams, '&');
$databaseName = DatabaseName::tryFrom($request->getParam('db'));
if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) {
if ($request->isAjax()) {

8
src/Controllers/Table/Structure/PrimaryController.php
View File

@ -4,7 +4,6 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Table\Structure;
use PhpMyAdmin\Config;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Controllers\Table\StructureController;
use PhpMyAdmin\Current;
@ -16,7 +15,6 @@ use PhpMyAdmin\Identifiers\DatabaseName;
use PhpMyAdmin\Identifiers\TableName;
use PhpMyAdmin\Message;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Url;
use PhpMyAdmin\UrlParams;
use PhpMyAdmin\Util;
@ -37,7 +35,6 @@ final class PrimaryController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['message'] ??= null;
$GLOBALS['errorUrl'] ??= null;
/** @var string[]|null $selected */
$selected = $request->getParsedBodyParam('selected_fld', $request->getParsedBodyParam('selected'));
@ -64,11 +61,6 @@ final class PrimaryController implements InvocableController
}
UrlParams::$params = ['db' => Current::$database, 'table' => Current::$table];
$GLOBALS['errorUrl'] = Util::getScriptNameForOption(
Config::getInstance()->settings['DefaultTabTable'],
'table',
);
$GLOBALS['errorUrl'] .= Url::getCommon(UrlParams::$params, '&');
$databaseName = DatabaseName::tryFrom($request->getParam('db'));
if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) {

9
src/Controllers/Table/StructureController.php
View File

@ -32,7 +32,6 @@ use PhpMyAdmin\Table\Table;
use PhpMyAdmin\Template;
use PhpMyAdmin\Tracking\Tracker;
use PhpMyAdmin\Transformations;
use PhpMyAdmin\Url;
use PhpMyAdmin\Util;
use PhpMyAdmin\Utils\ForeignKey;
use stdClass;
@ -63,8 +62,6 @@ class StructureController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] ??= null;
$this->dbi->selectDb(Current::$database);
$this->pageSettings->init('TableStructure');
@ -84,12 +81,6 @@ class StructureController implements InvocableController
}
$isSystemSchema = Utilities::isSystemSchema(Current::$database);
$urlParams = ['db' => Current::$database, 'table' => Current::$table];
$GLOBALS['errorUrl'] = Util::getScriptNameForOption(
Config::getInstance()->settings['DefaultTabTable'],
'table',
);
$GLOBALS['errorUrl'] .= Url::getCommon($urlParams, '&');
$databaseName = DatabaseName::tryFrom($request->getParam('db'));
if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) {

9
src/Controllers/Table/TrackingController.php
View File

@ -5,7 +5,6 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Table;
use DateTimeImmutable;
use PhpMyAdmin\Config;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Core;
use PhpMyAdmin\Current;
@ -23,7 +22,6 @@ use PhpMyAdmin\Tracking\Tracking;
use PhpMyAdmin\Tracking\TrackingChecker;
use PhpMyAdmin\Url;
use PhpMyAdmin\UrlParams;
use PhpMyAdmin\Util;
use Throwable;
use Webmozart\Assert\Assert;
@ -49,8 +47,6 @@ final class TrackingController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] ??= null;
$this->response->addScriptFiles(['vendor/jquery/jquery.tablesorter.js', 'table/tracking.js']);
if (Current::$database === '') {
@ -62,11 +58,6 @@ final class TrackingController implements InvocableController
}
UrlParams::$params = ['db' => Current::$database, 'table' => Current::$table];
$GLOBALS['errorUrl'] = Util::getScriptNameForOption(
Config::getInstance()->settings['DefaultTabTable'],
'table',
);
$GLOBALS['errorUrl'] .= Url::getCommon(UrlParams::$params, '&');
$databaseName = DatabaseName::tryFrom($request->getParam('db'));
if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) {

4
src/Controllers/Table/ZoomSearchController.php
View File

@ -20,7 +20,6 @@ use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Table\Search;
use PhpMyAdmin\Template;
use PhpMyAdmin\UniqueCondition;
use PhpMyAdmin\Url;
use PhpMyAdmin\UrlParams;
use PhpMyAdmin\Util;
use PhpMyAdmin\Utils\Gis;
@ -82,7 +81,6 @@ final class ZoomSearchController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] ??= null;
if (Current::$database === '') {
return $this->response->missingParameterError('db');
}
@ -93,8 +91,6 @@ final class ZoomSearchController implements InvocableController
UrlParams::$params = ['db' => Current::$database, 'table' => Current::$table];
$config = Config::getInstance();
$GLOBALS['errorUrl'] = Util::getScriptNameForOption($config->settings['DefaultTabTable'], 'table');
$GLOBALS['errorUrl'] .= Url::getCommon(UrlParams::$params, '&');
$databaseName = DatabaseName::tryFrom($request->getParam('db'));
if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) {

12
src/Controllers/Triggers/IndexController.php
View File

@ -4,7 +4,6 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Triggers;
use PhpMyAdmin\Config;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\DatabaseInterface;
@ -19,7 +18,6 @@ use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
use PhpMyAdmin\Triggers\Trigger;
use PhpMyAdmin\Triggers\Triggers;
use PhpMyAdmin\Url;
use PhpMyAdmin\UrlParams;
use PhpMyAdmin\Util;
@ -48,12 +46,10 @@ final class IndexController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errors'] ??= null;
$GLOBALS['errorUrl'] ??= null;
$this->response->addScriptFiles(['triggers.js', 'sql.js']);
if (! $request->isAjax()) {
$config = Config::getInstance();
if (Current::$database === '') {
return $this->response->missingParameterError('db');
}
@ -63,8 +59,6 @@ final class IndexController implements InvocableController
*/
if (Current::$table !== '' && in_array(Current::$table, $this->dbi->getTables(Current::$database), true)) {
UrlParams::$params = ['db' => Current::$database, 'table' => Current::$table];
$GLOBALS['errorUrl'] = Util::getScriptNameForOption($config->settings['DefaultTabTable'], 'table');
$GLOBALS['errorUrl'] .= Url::getCommon(UrlParams::$params, '&');
$databaseName = DatabaseName::tryFrom($request->getParam('db'));
if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) {
@ -85,12 +79,6 @@ final class IndexController implements InvocableController
} else {
Current::$table = '';
$GLOBALS['errorUrl'] = Util::getScriptNameForOption(
$config->settings['DefaultTabDatabase'],
'database',
);
$GLOBALS['errorUrl'] .= Url::getCommon(['db' => Current::$database], '&');
$databaseName = DatabaseName::tryFrom($request->getParam('db'));
if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) {
$this->response->redirectToRoute(

7
src/Controllers/View/CreateController.php
View File

@ -4,7 +4,6 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\View;
use PhpMyAdmin\Config;
use PhpMyAdmin\Container\ContainerBuilder;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Controllers\Table\StructureController;
@ -61,12 +60,6 @@ final class CreateController implements InvocableController
$GLOBALS['message'] ??= null;
$GLOBALS['errorUrl'] = Util::getScriptNameForOption(
Config::getInstance()->settings['DefaultTabDatabase'],
'database',
);
$GLOBALS['errorUrl'] .= Url::getCommon(['db' => Current::$database], '&');
$databaseName = DatabaseName::tryFrom($request->getParam('db'));
if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) {
if ($request->isAjax()) {

15
src/Export/Export.php
View File

@ -495,7 +495,6 @@ class Export
* @param string|mixed[] $dbSelect the selected databases to export
* @param string $whatStrucOrData structure or data or both
* @param ExportPlugin $exportPlugin the selected export plugin
* @param string $errorUrl the URL in case of error
* @param string $exportType the export type
* @param bool $doRelation whether to export relation info
* @param bool $doComments whether to add comments
@ -508,7 +507,6 @@ class Export
string|array $dbSelect,
string $whatStrucOrData,
ExportPlugin $exportPlugin,
string $errorUrl,
string $exportType,
bool $doRelation,
bool $doComments,
@ -536,7 +534,6 @@ class Export
$tables,
$tables,
$exportPlugin,
$errorUrl,
$exportType,
$doRelation,
$doComments,
@ -562,7 +559,6 @@ class Export
* @param string[] $tableStructure whether to export structure for each table
* @param string[] $tableData whether to export data for each table
* @param ExportPlugin $exportPlugin the selected export plugin
* @param string $errorUrl the URL in case of error
* @param string $exportType the export type
* @param bool $doRelation whether to export relation info
* @param bool $doComments whether to add comments
@ -578,7 +574,6 @@ class Export
array $tableStructure,
array $tableData,
ExportPlugin $exportPlugin,
string $errorUrl,
string $exportType,
bool $doRelation,
bool $doComments,
@ -707,7 +702,7 @@ class Export
. ' FROM ' . Util::backquote($db->getName())
. '.' . Util::backquote($table);
if (! $exportPlugin->exportData($db->getName(), $table, $errorUrl, $localQuery, $aliases)) {
if (! $exportPlugin->exportData($db->getName(), $table, $localQuery, $aliases)) {
break;
}
}
@ -823,14 +818,12 @@ class Export
*
* @param string $whatStrucOrData whether to export structure for each table or raw
* @param ExportPlugin $exportPlugin the selected export plugin
* @param string $errorUrl the URL in case of error
* @param string|null $db the database where the query is executed
* @param string $sqlQuery the query to be executed
*/
public static function exportRaw(
string $whatStrucOrData,
ExportPlugin $exportPlugin,
string $errorUrl,
string|null $db,
string $sqlQuery,
): void {
@ -839,7 +832,7 @@ class Export
return;
}
if ($exportPlugin->exportRawQuery($errorUrl, $db, $sqlQuery)) {
if ($exportPlugin->exportRawQuery($db, $sqlQuery)) {
return;
}
@ -857,7 +850,6 @@ class Export
* @param string $table the table to export
* @param string $whatStrucOrData structure or data or both
* @param ExportPlugin $exportPlugin the selected export plugin
* @param string $errorUrl the URL in case of error
* @param string $exportType the export type
* @param bool $doRelation whether to export relation info
* @param bool $doComments whether to add comments
@ -874,7 +866,6 @@ class Export
string $table,
string $whatStrucOrData,
ExportPlugin $exportPlugin,
string $errorUrl,
string $exportType,
bool $doRelation,
bool $doComments,
@ -963,7 +954,7 @@ class Export
. '.' . Util::backquote($table) . $addQuery;
}
if (! $exportPlugin->exportData($db, $table, $errorUrl, $localQuery, $aliases)) {
if (! $exportPlugin->exportData($db, $table, $localQuery, $aliases)) {
return;
}
}

2
src/Plugins/Export/ExportCodegen.php
View File

@ -130,14 +130,12 @@ class ExportCodegen extends ExportPlugin
*
* @param string $db database name
* @param string $table table name
* @param string $errorUrl the url to go back in case of error
* @param string $sqlQuery SQL query for obtaining data
* @param mixed[] $aliases Aliases of db/table/columns
*/
public function exportData(
string $db,
string $table,
string $errorUrl,
string $sqlQuery,
array $aliases = [],
): bool {

7
src/Plugins/Export/ExportCsv.php
View File

@ -188,14 +188,12 @@ class ExportCsv extends ExportPlugin
*
* @param string $db database name
* @param string $table table name
* @param string $errorUrl the url to go back in case of error
* @param string $sqlQuery SQL query for obtaining data
* @param mixed[] $aliases Aliases of db/table/columns
*/
public function exportData(
string $db,
string $table,
string $errorUrl,
string $sqlQuery,
array $aliases = [],
): bool {
@ -307,16 +305,15 @@ class ExportCsv extends ExportPlugin
/**
* Outputs result of raw query in CSV format
*
* @param string $errorUrl the url to go back in case of error
* @param string|null $db the database where the query is executed
* @param string $sqlQuery the rawquery to output
*/
public function exportRawQuery(string $errorUrl, string|null $db, string $sqlQuery): bool
public function exportRawQuery(string|null $db, string $sqlQuery): bool
{
if ($db !== null) {
DatabaseInterface::getInstance()->selectDb($db);
}
return $this->exportData($db ?? '', '', $errorUrl, $sqlQuery);
return $this->exportData($db ?? '', '', $sqlQuery);
}
}

2
src/Plugins/Export/ExportHtmlword.php
View File

@ -166,14 +166,12 @@ class ExportHtmlword extends ExportPlugin
*
* @param string $db database name
* @param string $table table name
* @param string $errorUrl the url to go back in case of error
* @param string $sqlQuery SQL query for obtaining data
* @param mixed[] $aliases Aliases of db/table/columns
*/
public function exportData(
string $db,
string $table,
string $errorUrl,
string $sqlQuery,
array $aliases = [],
): bool {

5
src/Plugins/Export/ExportJson.php
View File

@ -170,14 +170,12 @@ class ExportJson extends ExportPlugin
*
* @param string $db database name
* @param string $table table name
* @param string $errorUrl the url to go back in case of error
* @param string $sqlQuery SQL query for obtaining data
* @param mixed[] $aliases Aliases of db/table/columns
*/
public function exportData(
string $db,
string $table,
string $errorUrl,
string $sqlQuery,
array $aliases = [],
): bool {
@ -305,11 +303,10 @@ class ExportJson extends ExportPlugin
/**
* Outputs result raw query in JSON format
*
* @param string $errorUrl the url to go back in case of error
* @param string|null $db the database where the query is executed
* @param string $sqlQuery the rawquery to output
*/
public function exportRawQuery(string $errorUrl, string|null $db, string $sqlQuery): bool
public function exportRawQuery(string|null $db, string $sqlQuery): bool
{
$buffer = $this->encode(['type' => 'raw', 'data' => '@@DATA@@']);
if ($buffer === false) {

7
src/Plugins/Export/ExportLatex.php
View File

@ -272,14 +272,12 @@ class ExportLatex extends ExportPlugin
*
* @param string $db database name
* @param string $table table name
* @param string $errorUrl the url to go back in case of error
* @param string $sqlQuery SQL query for obtaining data
* @param mixed[] $aliases Aliases of db/table/columns
*/
public function exportData(
string $db,
string $table,
string $errorUrl,
string $sqlQuery,
array $aliases = [],
): bool {
@ -400,17 +398,16 @@ class ExportLatex extends ExportPlugin
/**
* Outputs result raw query
*
* @param string $errorUrl the url to go back in case of error
* @param string|null $db the database where the query is executed
* @param string $sqlQuery the rawquery to output
*/
public function exportRawQuery(string $errorUrl, string|null $db, string $sqlQuery): bool
public function exportRawQuery(string|null $db, string $sqlQuery): bool
{
if ($db !== null) {
DatabaseInterface::getInstance()->selectDb($db);
}
return $this->exportData($db ?? '', '', $errorUrl, $sqlQuery);
return $this->exportData($db ?? '', '', $sqlQuery);
}
/**

7
src/Plugins/Export/ExportMediawiki.php
View File

@ -242,14 +242,12 @@ class ExportMediawiki extends ExportPlugin
*
* @param string $db database name
* @param string $table table name
* @param string $errorUrl the url to go back in case of error
* @param string $sqlQuery SQL query for obtaining data
* @param mixed[] $aliases Aliases of db/table/columns
*/
public function exportData(
string $db,
string $table,
string $errorUrl,
string $sqlQuery,
array $aliases = [],
): bool {
@ -320,17 +318,16 @@ class ExportMediawiki extends ExportPlugin
/**
* Outputs result raw query in MediaWiki format
*
* @param string $errorUrl the url to go back in case of error
* @param string|null $db the database where the query is executed
* @param string $sqlQuery the rawquery to output
*/
public function exportRawQuery(string $errorUrl, string|null $db, string $sqlQuery): bool
public function exportRawQuery(string|null $db, string $sqlQuery): bool
{
if ($db !== null) {
DatabaseInterface::getInstance()->selectDb($db);
}
return $this->exportData($db ?? '', '', $errorUrl, $sqlQuery);
return $this->exportData($db ?? '', '', $sqlQuery);
}
/**

7
src/Plugins/Export/ExportOds.php
View File

@ -186,14 +186,12 @@ class ExportOds extends ExportPlugin
*
* @param string $db database name
* @param string $table table name
* @param string $errorUrl the url to go back in case of error
* @param string $sqlQuery SQL query for obtaining data
* @param mixed[] $aliases Aliases of db/table/columns
*/
public function exportData(
string $db,
string $table,
string $errorUrl,
string $sqlQuery,
array $aliases = [],
): bool {
@ -306,16 +304,15 @@ class ExportOds extends ExportPlugin
/**
* Outputs result raw query in ODS format
*
* @param string $errorUrl the url to go back in case of error
* @param string|null $db the database where the query is executed
* @param string $sqlQuery the rawquery to output
*/
public function exportRawQuery(string $errorUrl, string|null $db, string $sqlQuery): bool
public function exportRawQuery(string|null $db, string $sqlQuery): bool
{
if ($db !== null) {
DatabaseInterface::getInstance()->selectDb($db);
}
return $this->exportData($db ?? '', '', $errorUrl, $sqlQuery);
return $this->exportData($db ?? '', '', $sqlQuery);
}
}

7
src/Plugins/Export/ExportOdt.php
View File

@ -212,14 +212,12 @@ class ExportOdt extends ExportPlugin
*
* @param string $db database name
* @param string $table table name
* @param string $errorUrl the url to go back in case of error
* @param string $sqlQuery SQL query for obtaining data
* @param mixed[] $aliases Aliases of db/table/columns
*/
public function exportData(
string $db,
string $table,
string $errorUrl,
string $sqlQuery,
array $aliases = [],
): bool {
@ -314,17 +312,16 @@ class ExportOdt extends ExportPlugin
/**
* Outputs result raw query in ODT format
*
* @param string $errorUrl the url to go back in case of error
* @param string|null $db the database where the query is executed
* @param string $sqlQuery the rawquery to output
*/
public function exportRawQuery(string $errorUrl, string|null $db, string $sqlQuery): bool
public function exportRawQuery(string|null $db, string $sqlQuery): bool
{
if ($db !== null) {
DatabaseInterface::getInstance()->selectDb($db);
}
return $this->exportData($db ?? '', '', $errorUrl, $sqlQuery);
return $this->exportData($db ?? '', '', $sqlQuery);
}
/**

5
src/Plugins/Export/ExportPdf.php
View File

@ -158,14 +158,12 @@ class ExportPdf extends ExportPlugin
*
* @param string $db database name
* @param string $table table name
* @param string $errorUrl the url to go back in case of error
* @param string $sqlQuery SQL query for obtaining data
* @param mixed[] $aliases Aliases of db/table/columns
*/
public function exportData(
string $db,
string $table,
string $errorUrl,
string $sqlQuery,
array $aliases = [],
): bool {
@ -187,11 +185,10 @@ class ExportPdf extends ExportPlugin
/**
* Outputs result of raw query in PDF format
*
* @param string $errorUrl the url to go back in case of error
* @param string|null $db the database where the query is executed
* @param string $sqlQuery the rawquery to output
*/
public function exportRawQuery(string $errorUrl, string|null $db, string $sqlQuery): bool
public function exportRawQuery(string|null $db, string $sqlQuery): bool
{
$pdf = $this->getPdf();
$pdf->setDbAlias('----');

7
src/Plugins/Export/ExportPhparray.php
View File

@ -143,14 +143,12 @@ class ExportPhparray extends ExportPlugin
*
* @param string $db database name
* @param string $table table name
* @param string $errorUrl the url to go back in case of error
* @param string $sqlQuery SQL query for obtaining data
* @param mixed[] $aliases Aliases of db/table/columns
*/
public function exportData(
string $db,
string $table,
string $errorUrl,
string $sqlQuery,
array $aliases = [],
): bool {
@ -232,16 +230,15 @@ class ExportPhparray extends ExportPlugin
/**
* Outputs result of raw query as PHP array
*
* @param string $errorUrl the url to go back in case of error
* @param string|null $db the database where the query is executed
* @param string $sqlQuery the rawquery to output
*/
public function exportRawQuery(string $errorUrl, string|null $db, string $sqlQuery): bool
public function exportRawQuery(string|null $db, string $sqlQuery): bool
{
if ($db !== null) {
DatabaseInterface::getInstance()->selectDb($db);
}
return $this->exportData($db ?? '', '', $errorUrl, $sqlQuery);
return $this->exportData($db ?? '', '', $sqlQuery);
}
}

10
src/Plugins/Export/ExportSql.php
View File

@ -1130,7 +1130,6 @@ class ExportSql extends ExportPlugin
! $this->exportData(
$relationParameters->pdfFeature->database->getName(),
$relationParameters->pdfFeature->pdfPages->getName(),
'',
$sqlQueryRow,
$aliases,
)
@ -1156,7 +1155,6 @@ class ExportSql extends ExportPlugin
! $this->exportData(
$relationParameters->pdfFeature->database->getName(),
$relationParameters->pdfFeature->tableCoords->getName(),
'',
$sqlQueryCoords,
$aliases,
)
@ -1195,7 +1193,6 @@ class ExportSql extends ExportPlugin
! $this->exportData(
(string) $relationParameters->db,
(string) $relationParams[$type],
'',
$sqlQuery,
$aliases,
)
@ -1859,17 +1856,16 @@ class ExportSql extends ExportPlugin
/**
* Outputs a raw query
*
* @param string $errorUrl the url to go back in case of error
* @param string|null $db the database where the query is executed
* @param string $sqlQuery the rawquery to output
*/
public function exportRawQuery(string $errorUrl, string|null $db, string $sqlQuery): bool
public function exportRawQuery(string|null $db, string $sqlQuery): bool
{
if ($db !== null) {
DatabaseInterface::getInstance()->selectDb($db);
}
return $this->exportData($db ?? '', '', $errorUrl, $sqlQuery);
return $this->exportData($db ?? '', '', $sqlQuery);
}
/**
@ -2033,14 +2029,12 @@ class ExportSql extends ExportPlugin
*
* @param string $db database name
* @param string $table table name
* @param string $errorUrl the url to go back in case of error
* @param string $sqlQuery SQL query for obtaining data
* @param mixed[] $aliases Aliases of db/table/columns
*/
public function exportData(
string $db,
string $table,
string $errorUrl,
string $sqlQuery,
array $aliases = [],
): bool {

7
src/Plugins/Export/ExportTexytext.php
View File

@ -150,14 +150,12 @@ class ExportTexytext extends ExportPlugin
*
* @param string $db database name
* @param string $table table name
* @param string $errorUrl the url to go back in case of error
* @param string $sqlQuery SQL query for obtaining data
* @param mixed[] $aliases Aliases of db/table/columns
*/
public function exportData(
string $db,
string $table,
string $errorUrl,
string $sqlQuery,
array $aliases = [],
): bool {
@ -232,17 +230,16 @@ class ExportTexytext extends ExportPlugin
/**
* Outputs result raw query in TexyText format
*
* @param string $errorUrl the url to go back in case of error
* @param string|null $db the database where the query is executed
* @param string $sqlQuery the rawquery to output
*/
public function exportRawQuery(string $errorUrl, string|null $db, string $sqlQuery): bool
public function exportRawQuery(string|null $db, string $sqlQuery): bool
{
if ($db !== null) {
DatabaseInterface::getInstance()->selectDb($db);
}
return $this->exportData($db ?? '', '', $errorUrl, $sqlQuery);
return $this->exportData($db ?? '', '', $sqlQuery);
}
/**

2
src/Plugins/Export/ExportXml.php
View File

@ -397,14 +397,12 @@ class ExportXml extends ExportPlugin
*
* @param string $db database name
* @param string $table table name
* @param string $errorUrl the url to go back in case of error
* @param string $sqlQuery SQL query for obtaining data
* @param mixed[] $aliases Aliases of db/table/columns
*/
public function exportData(
string $db,
string $table,
string $errorUrl,
string $sqlQuery,
array $aliases = [],
): bool {

7
src/Plugins/Export/ExportYaml.php
View File

@ -118,14 +118,12 @@ class ExportYaml extends ExportPlugin
*
* @param string $db database name
* @param string $table table name
* @param string $errorUrl the url to go back in case of error
* @param string $sqlQuery SQL query for obtaining data
* @param mixed[] $aliases Aliases of db/table/columns
*/
public function exportData(
string $db,
string $table,
string $errorUrl,
string $sqlQuery,
array $aliases = [],
): bool {
@ -196,16 +194,15 @@ class ExportYaml extends ExportPlugin
/**
* Outputs result raw query in YAML format
*
* @param string $errorUrl the url to go back in case of error
* @param string|null $db the database where the query is executed
* @param string $sqlQuery the rawquery to output
*/
public function exportRawQuery(string $errorUrl, string|null $db, string $sqlQuery): bool
public function exportRawQuery(string|null $db, string $sqlQuery): bool
{
if ($db !== null) {
DatabaseInterface::getInstance()->selectDb($db);
}
return $this->exportData($db ?? '', '', $errorUrl, $sqlQuery);
return $this->exportData($db ?? '', '', $sqlQuery);
}
}

2
src/Plugins/Export/README.md
View File

@ -178,7 +178,6 @@ class Export[Name] extends PhpMyAdmin\Plugins\ExportPlugin
*
* @param string $db database name
* @param string $table table name
* @param string $errorUrl the url to go back in case of error
* @param string $sqlQuery SQL query for obtaining data
* @param array $aliases Aliases of db/table/columns
*
@ -187,7 +186,6 @@ class Export[Name] extends PhpMyAdmin\Plugins\ExportPlugin
public function exportData(
$db,
$table,
$errorUrl,
$sqlQuery,
array $aliases = []
) {

5
src/Plugins/ExportPlugin.php
View File

@ -76,14 +76,12 @@ abstract class ExportPlugin implements Plugin
*
* @param string $db database name
* @param string $table table name
* @param string $errorUrl the url to go back in case of error
* @param string $sqlQuery SQL query for obtaining data
* @param mixed[] $aliases Aliases of db/table/columns
*/
abstract public function exportData(
string $db,
string $table,
string $errorUrl,
string $sqlQuery,
array $aliases = [],
): bool;
@ -117,11 +115,10 @@ abstract class ExportPlugin implements Plugin
/**
* Outputs for raw query
*
* @param string $errorUrl the url to go back in case of error
* @param string|null $db the database where the query is executed
* @param string $sqlQuery the rawquery to output
*/
public function exportRawQuery(string $errorUrl, string|null $db, string $sqlQuery): bool
public function exportRawQuery(string|null $db, string $sqlQuery): bool
{
return false;
}

1
src/Plugins/Import/ImportCsv.php
View File

@ -193,7 +193,6 @@ class ImportCsv extends AbstractImportCsv
{
$GLOBALS['error'] ??= null;
$GLOBALS['message'] ??= null;
$GLOBALS['errorUrl'] ??= null;
$replacements = ['\\n' => "\n", '\\t' => "\t", '\\r' => "\r"];
$this->terminated = strtr($this->terminated, $replacements);

2
src/Table/TableMover.php
View File

@ -46,8 +46,6 @@ class TableMover
MoveMode $mode,
bool $addDropIfExists,
): bool {
$GLOBALS['errorUrl'] ??= null;
// Try moving the tables directly, using native `RENAME` statement.
if ($what === MoveScope::Move) {
$tbl = new Table($sourceTable, $sourceDb, $this->dbi);

2
tests/unit/Export/ExportTest.php
View File

@ -140,7 +140,6 @@ class ExportTest extends AbstractTestCase
['test_table'],
['test_table'],
new ExportSql(new Relation($dbi), $export, new Transformations()),
'index.php?route=/database/export&db=test_db',
'database',
false,
true,
@ -221,7 +220,6 @@ SQL;
['test_db'],
'structure_and_data',
new ExportSql(new Relation($dbi), $export, new Transformations()),
'index.php?route=/server/export',
'server',
false,
true,

4
tests/unit/Plugins/Export/ExportCodegenTest.php
View File

@ -174,7 +174,7 @@ class ExportCodegenTest extends AbstractTestCase
$GLOBALS['save_on_server'] = false;
ob_start();
$this->object->exportData('test_db', 'test_table', 'localhost', 'SELECT * FROM `test_db`.`test_table`;');
$this->object->exportData('test_db', 'test_table', 'SELECT * FROM `test_db`.`test_table`;');
$result = ob_get_clean();
self::assertIsString($result);
@ -199,7 +199,7 @@ class ExportCodegenTest extends AbstractTestCase
$GLOBALS['codegen_format'] = 4;
$this->object->exportData('test_db', 'test_table', 'localhost', 'SELECT * FROM `test_db`.`test_table`;');
$this->object->exportData('test_db', 'test_table', 'SELECT * FROM `test_db`.`test_table`;');
$this->expectOutputString('4 is not supported.');
}

6
tests/unit/Plugins/Export/ExportCsvTest.php
View File

@ -383,7 +383,6 @@ class ExportCsvTest extends AbstractTestCase
self::assertFalse($this->object->exportData(
'test_db',
'test_table',
'localhost',
'SELECT * FROM `test_db`.`test_table`;',
));
ob_get_clean();
@ -403,7 +402,6 @@ class ExportCsvTest extends AbstractTestCase
self::assertTrue($this->object->exportData(
'test_db',
'test_table',
'localhost',
'SELECT * FROM `test_db`.`test_table`;',
));
$result = ob_get_clean();
@ -421,7 +419,6 @@ class ExportCsvTest extends AbstractTestCase
self::assertTrue($this->object->exportData(
'test_db',
'test_table',
'localhost',
'SELECT * FROM `test_db`.`test_table`;',
));
$result = ob_get_clean();
@ -442,7 +439,6 @@ class ExportCsvTest extends AbstractTestCase
self::assertTrue($this->object->exportData(
'test_db',
'test_table',
'localhost',
'SELECT * FROM `test_db`.`test_table`;',
));
$result = ob_get_clean();
@ -462,7 +458,6 @@ class ExportCsvTest extends AbstractTestCase
self::assertTrue($this->object->exportData(
'test_db',
'test_table',
'localhost',
'SELECT * FROM `test_db`.`test_table`;',
));
$result = ob_get_clean();
@ -481,7 +476,6 @@ class ExportCsvTest extends AbstractTestCase
self::assertTrue($this->object->exportData(
'test_db',
'test_table',
'localhost',
'SELECT * FROM `test_db`.`test_table`;',
));
$result = ob_get_clean();

1
tests/unit/Plugins/Export/ExportHtmlwordTest.php
View File

@ -304,7 +304,6 @@ class ExportHtmlwordTest extends AbstractTestCase
self::assertTrue($this->object->exportData(
'test_db',
'test_table',
'localhost',
'SELECT * FROM `test_db`.`test_table`;',
));
$result = ob_get_clean();

3
tests/unit/Plugins/Export/ExportJsonTest.php
View File

@ -179,7 +179,6 @@ class ExportJsonTest extends AbstractTestCase
self::assertTrue($this->object->exportData(
'test_db',
'test_table',
'localhost',
'SELECT * FROM `test_db`.`test_table`;',
));
}
@ -202,7 +201,6 @@ class ExportJsonTest extends AbstractTestCase
$this->object->exportData(
'test_db',
'test_table_complex',
'example.com',
'SELECT * FROM `test_db`.`test_table_complex`;',
),
);
@ -223,7 +221,6 @@ class ExportJsonTest extends AbstractTestCase
self::assertTrue(
$this->object->exportRawQuery(
'example.com',
null,
'SELECT * FROM `test_db`.`test_table_complex`;',
),

2
tests/unit/Plugins/Export/ExportLatexTest.php
View File

@ -492,7 +492,6 @@ class ExportLatexTest extends AbstractTestCase
self::assertTrue($this->object->exportData(
'test_db',
'test_table',
'localhost',
'SELECT * FROM `test_db`.`test_table`;',
));
$result = ob_get_clean();
@ -523,7 +522,6 @@ class ExportLatexTest extends AbstractTestCase
self::assertTrue($this->object->exportData(
'test_db',
'test_table',
'localhost',
'SELECT * FROM `test_db`.`test_table`;',
));
$result = ob_get_clean();

1
tests/unit/Plugins/Export/ExportMediawikiTest.php
View File

@ -294,7 +294,6 @@ class ExportMediawikiTest extends AbstractTestCase
$this->object->exportData(
'test_db',
'test_table',
'localhost',
'SELECT * FROM `test_db`.`test_table`;',
),
);

3
tests/unit/Plugins/Export/ExportOdsTest.php
View File

@ -264,7 +264,6 @@ class ExportOdsTest extends AbstractTestCase
$this->object->exportData(
'db',
'table',
'example.com',
'SELECT',
),
);
@ -340,7 +339,6 @@ class ExportOdsTest extends AbstractTestCase
$this->object->exportData(
'db',
'table',
'example.com',
'SELECT',
),
);
@ -392,7 +390,6 @@ class ExportOdsTest extends AbstractTestCase
$this->object->exportData(
'db',
'table',
'example.com',
'SELECT',
),
);

3
tests/unit/Plugins/Export/ExportOdtTest.php
View File

@ -399,7 +399,6 @@ class ExportOdtTest extends AbstractTestCase
$this->object->exportData(
'db',
'ta<ble',
'example.com',
'SELECT',
),
);
@ -468,7 +467,6 @@ class ExportOdtTest extends AbstractTestCase
$this->object->exportData(
'db',
'table',
'example.com',
'SELECT',
),
);
@ -522,7 +520,6 @@ class ExportOdtTest extends AbstractTestCase
$this->object->exportData(
'db',
'table',
'example.com',
'SELECT',
),
);

1
tests/unit/Plugins/Export/ExportPdfTest.php
View File

@ -233,7 +233,6 @@ class ExportPdfTest extends AbstractTestCase
$this->object->exportData(
'db',
'table',
'phpmyadmin.net/err',
'SELECT',
),
);

2
tests/unit/Plugins/Export/ExportPhparrayTest.php
View File

@ -173,7 +173,6 @@ class ExportPhparrayTest extends AbstractTestCase
$this->object->exportData(
'test_db',
'test_table',
'phpmyadmin.net/err',
'SELECT * FROM `test_db`.`test_table`;',
),
);
@ -195,7 +194,6 @@ class ExportPhparrayTest extends AbstractTestCase
$this->object->exportData(
'test_db',
'0`932table',
'phpmyadmin.net/err',
'SELECT * FROM `test_db`.`test_table`;',
),
);

8
tests/unit/Plugins/Export/ExportSqlTest.php
View File

@ -1095,7 +1095,7 @@ SQL;
$this->object->useSqlBackquotes(true);
ob_start();
$this->object->exportData('db', 'table', 'example.com/err', 'SELECT a FROM b WHERE 1');
$this->object->exportData('db', 'table', 'SELECT a FROM b WHERE 1');
$result = ob_get_clean();
self::assertIsString($result);
@ -1191,7 +1191,7 @@ SQL;
$this->object->useSqlBackquotes(true);
ob_start();
$this->object->exportData('db', 'table', 'example.com/err', 'SELECT a FROM b WHERE 1');
$this->object->exportData('db', 'table', 'SELECT a FROM b WHERE 1');
$result = ob_get_clean();
self::assertIsString($result);
@ -1234,7 +1234,7 @@ SQL;
ob_start();
self::assertTrue(
$this->object->exportData('db', 'tbl', 'err.com', 'SELECT'),
$this->object->exportData('db', 'tbl', 'SELECT'),
);
$result = ob_get_clean();
@ -1279,7 +1279,7 @@ SQL;
ob_start();
self::assertTrue(
$this->object->exportData('db', 'table', 'err.com', 'SELECT'),
$this->object->exportData('db', 'table', 'SELECT'),
);
$result = ob_get_clean();

1
tests/unit/Plugins/Export/ExportTexytextTest.php
View File

@ -220,7 +220,6 @@ class ExportTexytextTest extends AbstractTestCase
$this->object->exportData(
'test_db',
'test_table',
'localhost',
'SELECT * FROM `test_db`.`test_table`;',
),
);

1
tests/unit/Plugins/Export/ExportXmlTest.php
View File

@ -380,7 +380,6 @@ class ExportXmlTest extends AbstractTestCase
$this->object->exportData(
'test_db',
'test_table',
'localhost',
'SELECT * FROM `test_db`.`test_table`;',
),
);

1
tests/unit/Plugins/Export/ExportYamlTest.php
View File

@ -163,7 +163,6 @@ class ExportYamlTest extends AbstractTestCase
$this->object->exportData(
'test_db',
'test_table',
'localhost',
'SELECT * FROM `test_db`.`test_table_yaml`;',
),
);