diff --git a/app/services.php b/app/services.php index 74cd4c07d1..0449392fd6 100644 --- a/app/services.php +++ b/app/services.php @@ -16,7 +16,7 @@ use PhpMyAdmin\Database\Designer; use PhpMyAdmin\Database\Designer\Common; use PhpMyAdmin\Database\Events; use PhpMyAdmin\Database\Routines; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Error\ErrorHandler; use PhpMyAdmin\Error\ErrorReport; diff --git a/bin/console b/bin/console index b2855dc002..6262a21978 100755 --- a/bin/console +++ b/bin/console @@ -4,11 +4,11 @@ use PhpMyAdmin\Command\CacheWarmupCommand; use PhpMyAdmin\Command\FixPoTwigCommand; use PhpMyAdmin\Command\SetVersionCommand; -use PhpMyAdmin\Command\WriteGitRevisionCommand; use PhpMyAdmin\Command\TwigLintCommand; +use PhpMyAdmin\Command\WriteGitRevisionCommand; use PhpMyAdmin\Config; use PhpMyAdmin\Container\ContainerBuilder; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Tests\Stubs\DbiDummy; use Symfony\Component\Console\Application; diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 6e1ac2f400..6ef2f47d60 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -494,7 +494,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -640,7 +640,7 @@ parameters: path: src/Config.php - - message: '#^Parameter \#1 \$collation of method PhpMyAdmin\\DatabaseInterface\:\:setCollation\(\) expects string, mixed given\.$#' + message: '#^Parameter \#1 \$collation of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:setCollation\(\) expects string, mixed given\.$#' identifier: argument.type count: 1 path: src/Config.php @@ -1855,7 +1855,7 @@ parameters: path: src/ConfigStorage/Relation.php - - message: '#^Parameter \#1 \$dbName of method PhpMyAdmin\\DatabaseInterface\:\:getTable\(\) expects string, mixed given\.$#' + message: '#^Parameter \#1 \$dbName of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:getTable\(\) expects string, mixed given\.$#' identifier: argument.type count: 2 path: src/ConfigStorage/Relation.php @@ -1897,14 +1897,14 @@ parameters: path: src/ConfigStorage/Relation.php - - message: '#^Parameter \#2 \$tableName of method PhpMyAdmin\\DatabaseInterface\:\:getTable\(\) expects string, mixed given\.$#' + message: '#^Parameter \#2 \$tableName of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:getTable\(\) expects string, mixed given\.$#' identifier: argument.type count: 2 path: src/ConfigStorage/Relation.php - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -2351,7 +2351,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -2626,7 +2626,7 @@ parameters: path: src/Controllers/Database/StructureController.php - - message: '#^Parameter \#2 \$tableName of method PhpMyAdmin\\DatabaseInterface\:\:getTable\(\) expects string, mixed given\.$#' + message: '#^Parameter \#2 \$tableName of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:getTable\(\) expects string, mixed given\.$#' identifier: argument.type count: 4 path: src/Controllers/Database/StructureController.php @@ -4417,7 +4417,7 @@ parameters: path: src/Controllers/Table/FindReplaceController.php - - message: '#^Parameter \#1 \$str of method PhpMyAdmin\\DatabaseInterface\:\:quoteString\(\) expects string, mixed given\.$#' + message: '#^Parameter \#1 \$str of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:quoteString\(\) expects string, mixed given\.$#' identifier: argument.type count: 2 path: src/Controllers/Table/FindReplaceController.php @@ -4600,7 +4600,7 @@ parameters: path: src/Controllers/Table/RelationController.php - - message: '#^Parameter \#1 \$dbName of method PhpMyAdmin\\DatabaseInterface\:\:getTable\(\) expects string, mixed given\.$#' + message: '#^Parameter \#1 \$dbName of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:getTable\(\) expects string, mixed given\.$#' identifier: argument.type count: 1 path: src/Controllers/Table/RelationController.php @@ -4654,7 +4654,7 @@ parameters: path: src/Controllers/Table/RelationController.php - - message: '#^Parameter \#2 \$tableName of method PhpMyAdmin\\DatabaseInterface\:\:getTable\(\) expects string, mixed given\.$#' + message: '#^Parameter \#2 \$tableName of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:getTable\(\) expects string, mixed given\.$#' identifier: argument.type count: 1 path: src/Controllers/Table/RelationController.php @@ -5695,7 +5695,7 @@ parameters: path: src/Controllers/View/CreateController.php - - message: '#^Parameter \#1 \$dbName of method PhpMyAdmin\\DatabaseInterface\:\:getTable\(\) expects string, mixed given\.$#' + message: '#^Parameter \#1 \$dbName of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:getTable\(\) expects string, mixed given\.$#' identifier: argument.type count: 1 path: src/Controllers/View/CreateController.php @@ -5719,7 +5719,7 @@ parameters: path: src/Controllers/View/CreateController.php - - message: '#^Parameter \#1 \$str of method PhpMyAdmin\\DatabaseInterface\:\:quoteString\(\) expects string, mixed given\.$#' + message: '#^Parameter \#1 \$str of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:quoteString\(\) expects string, mixed given\.$#' identifier: argument.type count: 2 path: src/Controllers/View/CreateController.php @@ -5731,7 +5731,7 @@ parameters: path: src/Controllers/View/CreateController.php - - message: '#^Parameter \#2 \$tableName of method PhpMyAdmin\\DatabaseInterface\:\:getTable\(\) expects string, mixed given\.$#' + message: '#^Parameter \#2 \$tableName of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:getTable\(\) expects string, mixed given\.$#' identifier: argument.type count: 1 path: src/Controllers/View/CreateController.php @@ -5998,7 +5998,7 @@ parameters: path: src/CreateAddField.php - - message: '#^Parameter \#1 \$str of method PhpMyAdmin\\DatabaseInterface\:\:quoteString\(\) expects string, mixed given\.$#' + message: '#^Parameter \#1 \$str of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:quoteString\(\) expects string, mixed given\.$#' identifier: argument.type count: 3 path: src/CreateAddField.php @@ -6154,7 +6154,7 @@ parameters: path: src/Database/CentralColumns.php - - message: '#^Parameter \#1 \$str of method PhpMyAdmin\\DatabaseInterface\:\:quoteString\(\) expects string, mixed given\.$#' + message: '#^Parameter \#1 \$str of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:quoteString\(\) expects string, mixed given\.$#' identifier: argument.type count: 1 path: src/Database/CentralColumns.php @@ -6346,13 +6346,13 @@ parameters: path: src/Database/Designer/Common.php - - message: '#^Parameter \#1 \$str of method PhpMyAdmin\\DatabaseInterface\:\:quoteString\(\) expects string, mixed given\.$#' + message: '#^Parameter \#1 \$str of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:quoteString\(\) expects string, mixed given\.$#' identifier: argument.type count: 4 path: src/Database/Designer/Common.php - - message: '#^Parameter \#1 \$str of method PhpMyAdmin\\DatabaseInterface\:\:quoteString\(\) expects string, string\|false given\.$#' + message: '#^Parameter \#1 \$str of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:quoteString\(\) expects string, string\|false given\.$#' identifier: argument.type count: 2 path: src/Database/Designer/Common.php @@ -6445,13 +6445,13 @@ parameters: path: src/Database/Events.php - - message: '#^Parameter \#1 \$query of method PhpMyAdmin\\DatabaseInterface\:\:tryQuery\(\) expects string, string\|null given\.$#' + message: '#^Parameter \#1 \$query of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:tryQuery\(\) expects string, string\|null given\.$#' identifier: argument.type count: 1 path: src/Database/Events.php - - message: '#^Parameter \#1 \$str of method PhpMyAdmin\\DatabaseInterface\:\:quoteString\(\) expects string, mixed given\.$#' + message: '#^Parameter \#1 \$str of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:quoteString\(\) expects string, mixed given\.$#' identifier: argument.type count: 4 path: src/Database/Events.php @@ -6485,7 +6485,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -6652,7 +6652,7 @@ parameters: path: src/Database/Routines.php - - message: '#^Parameter \#1 \$str of method PhpMyAdmin\\DatabaseInterface\:\:quoteString\(\) expects string, mixed given\.$#' + message: '#^Parameter \#1 \$str of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:quoteString\(\) expects string, mixed given\.$#' identifier: argument.type count: 7 path: src/Database/Routines.php @@ -6778,31 +6778,31 @@ parameters: ''' identifier: staticProperty.deprecated count: 1 - path: src/DatabaseInterface.php + path: src/Dbal/DatabaseInterface.php - message: '#^Binary operation "\+" between int\|string\|null and int\|string\|null results in an error\.$#' identifier: binaryOp.invalid count: 3 - path: src/DatabaseInterface.php + path: src/Dbal/DatabaseInterface.php - message: '#^Binary operation "\+" between string\|null and string\|null results in an error\.$#' identifier: binaryOp.invalid count: 1 - path: src/DatabaseInterface.php + path: src/Dbal/DatabaseInterface.php - message: '#^Binary operation "\+\=" between \(float\|int\) and mixed results in an error\.$#' identifier: assignOp.invalid count: 1 - path: src/DatabaseInterface.php + path: src/Dbal/DatabaseInterface.php - message: '#^Binary operation "\+\=" between mixed and string\|null results in an error\.$#' identifier: assignOp.invalid count: 5 - path: src/DatabaseInterface.php + path: src/Dbal/DatabaseInterface.php - message: ''' @@ -6811,181 +6811,181 @@ parameters: ''' identifier: staticMethod.deprecated count: 1 - path: src/DatabaseInterface.php + path: src/Dbal/DatabaseInterface.php - message: '#^Cannot access an offset on mixed\.$#' identifier: offsetAccess.nonOffsetAccessible count: 1 - path: src/DatabaseInterface.php + path: src/Dbal/DatabaseInterface.php - message: '#^Cannot access offset string\|null on mixed\.$#' identifier: offsetAccess.nonOffsetAccessible count: 3 - path: src/DatabaseInterface.php + path: src/Dbal/DatabaseInterface.php - message: '#^Cannot cast mixed to string\.$#' identifier: cast.string count: 1 - path: src/DatabaseInterface.php + path: src/Dbal/DatabaseInterface.php - message: '#^Construct empty\(\) is not allowed\. Use more strict comparison\.$#' identifier: empty.notAllowed count: 1 - path: src/DatabaseInterface.php + path: src/Dbal/DatabaseInterface.php - message: '#^Foreach overwrites \$database with its value variable\.$#' identifier: foreach.valueOverwrite count: 1 - path: src/DatabaseInterface.php + path: src/Dbal/DatabaseInterface.php - message: '#^Foreach overwrites \$table with its value variable\.$#' identifier: foreach.valueOverwrite count: 1 - path: src/DatabaseInterface.php + path: src/Dbal/DatabaseInterface.php - message: '#^Loose comparison via "\=\=" is not allowed\.$#' identifier: equal.notAllowed count: 1 - path: src/DatabaseInterface.php + path: src/Dbal/DatabaseInterface.php - - message: '#^Method PhpMyAdmin\\DatabaseInterface\:\:getColumnNames\(\) should return list\ but returns list\\.$#' + message: '#^Method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:getColumnNames\(\) should return list\ but returns list\\.$#' identifier: return.type count: 1 - path: src/DatabaseInterface.php + path: src/Dbal/DatabaseInterface.php - - message: '#^Method PhpMyAdmin\\DatabaseInterface\:\:getColumnsFull\(\) should return array\ but returns mixed\.$#' + message: '#^Method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:getColumnsFull\(\) should return array\ but returns mixed\.$#' identifier: return.type count: 1 - path: src/DatabaseInterface.php + path: src/Dbal/DatabaseInterface.php - - message: '#^Method PhpMyAdmin\\DatabaseInterface\:\:getCurrentRoles\(\) should return list\ but returns mixed\.$#' + message: '#^Method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:getCurrentRoles\(\) should return list\ but returns mixed\.$#' identifier: return.type count: 1 - path: src/DatabaseInterface.php + path: src/Dbal/DatabaseInterface.php - - message: '#^Method PhpMyAdmin\\DatabaseInterface\:\:getCurrentUser\(\) should return string but returns mixed\.$#' + message: '#^Method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:getCurrentUser\(\) should return string but returns mixed\.$#' identifier: return.type count: 1 - path: src/DatabaseInterface.php + path: src/Dbal/DatabaseInterface.php - - message: '#^Method PhpMyAdmin\\DatabaseInterface\:\:getCurrentUser\(\) should return string but returns string\|null\.$#' + message: '#^Method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:getCurrentUser\(\) should return string but returns string\|null\.$#' identifier: return.type count: 1 - path: src/DatabaseInterface.php + path: src/Dbal/DatabaseInterface.php - - message: '#^Method PhpMyAdmin\\DatabaseInterface\:\:getTableIndexes\(\) should return array\ but returns list\\>\.$#' + message: '#^Method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:getTableIndexes\(\) should return array\ but returns list\\>\.$#' identifier: return.type count: 1 - path: src/DatabaseInterface.php + path: src/Dbal/DatabaseInterface.php - message: '#^Only booleans are allowed in &&, int\|false given on the left side\.$#' identifier: booleanAnd.leftNotBoolean count: 3 - path: src/DatabaseInterface.php + path: src/Dbal/DatabaseInterface.php - message: '#^Only booleans are allowed in a negated boolean, PhpMyAdmin\\Dbal\\ResultInterface\|false given\.$#' identifier: booleanNot.exprNotBoolean count: 3 - path: src/DatabaseInterface.php + path: src/Dbal/DatabaseInterface.php - message: '#^Only booleans are allowed in a ternary operator condition, bool\|string given\.$#' identifier: ternary.condNotBoolean count: 1 - path: src/DatabaseInterface.php + path: src/Dbal/DatabaseInterface.php - message: '#^Only booleans are allowed in an if condition, int\|false given\.$#' identifier: if.condNotBoolean count: 2 - path: src/DatabaseInterface.php + path: src/Dbal/DatabaseInterface.php - message: '#^Parameter \#1 \$a of static method PhpMyAdmin\\Query\\Utilities\:\:usortComparisonCallback\(\) expects array\, mixed given\.$#' identifier: argument.type count: 1 - path: src/DatabaseInterface.php + path: src/Dbal/DatabaseInterface.php - message: '#^Parameter \#1 \$callback of function array_map expects \(callable\(mixed\)\: mixed\)\|null, Closure\(string\)\: non\-empty\-string given\.$#' identifier: argument.type count: 1 - path: src/DatabaseInterface.php + path: src/Dbal/DatabaseInterface.php - message: '#^Parameter \#1 \$callback of function array_map expects \(callable\(mixed\)\: mixed\)\|null, Closure\(string, PhpMyAdmin\\Dbal\\ConnectionType\=\)\: non\-empty\-string given\.$#' identifier: argument.type count: 1 - path: src/DatabaseInterface.php + path: src/Dbal/DatabaseInterface.php - message: '#^Parameter \#1 \$haystack of function stripos expects string, mixed given\.$#' identifier: argument.type count: 2 - path: src/DatabaseInterface.php + path: src/Dbal/DatabaseInterface.php - message: '#^Parameter \#1 \$path of function basename expects string, mixed given\.$#' identifier: argument.type count: 1 - path: src/DatabaseInterface.php + path: src/Dbal/DatabaseInterface.php - message: '#^Parameter \#1 \$string of function strtolower expects string, int\|string given\.$#' identifier: argument.type count: 1 - path: src/DatabaseInterface.php + path: src/Dbal/DatabaseInterface.php - message: '#^Parameter \#1 \$version of static method PhpMyAdmin\\Query\\Utilities\:\:versionToInt\(\) expects string, mixed given\.$#' identifier: argument.type count: 1 - path: src/DatabaseInterface.php + path: src/Dbal/DatabaseInterface.php - - message: '#^Parameter \#2 \$arrays of function array_diff expects an array of values castable to string, array\ given\.$#' + message: '#^Parameter \#2 \$arrays of function array_diff expects an array of values castable to string, array\ given\.$#' identifier: argument.type count: 1 - path: src/DatabaseInterface.php + path: src/Dbal/DatabaseInterface.php - message: '#^Parameter \#2 \$b of static method PhpMyAdmin\\Query\\Utilities\:\:usortComparisonCallback\(\) expects array\, mixed given\.$#' identifier: argument.type count: 1 - path: src/DatabaseInterface.php + path: src/Dbal/DatabaseInterface.php - - message: '#^Property PhpMyAdmin\\DatabaseInterface\:\:\$versionComment \(string\) does not accept mixed\.$#' + message: '#^Property PhpMyAdmin\\Dbal\\DatabaseInterface\:\:\$versionComment \(string\) does not accept mixed\.$#' identifier: assign.propertyType count: 1 - path: src/DatabaseInterface.php + path: src/Dbal/DatabaseInterface.php - - message: '#^Property PhpMyAdmin\\DatabaseInterface\:\:\$versionString \(string\) does not accept mixed\.$#' + message: '#^Property PhpMyAdmin\\Dbal\\DatabaseInterface\:\:\$versionString \(string\) does not accept mixed\.$#' identifier: assign.propertyType count: 1 - path: src/DatabaseInterface.php + path: src/Dbal/DatabaseInterface.php - message: '#^Variable \$roleHost on left side of \?\? always exists and is not nullable\.$#' identifier: nullCoalesce.variable count: 2 - path: src/DatabaseInterface.php + path: src/Dbal/DatabaseInterface.php - message: ''' @@ -7655,7 +7655,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -8069,7 +8069,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -8165,7 +8165,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -8227,7 +8227,7 @@ parameters: path: src/Favorites/RecentFavoriteTables.php - - message: '#^Parameter \#1 \$str of method PhpMyAdmin\\DatabaseInterface\:\:quoteString\(\) expects string, string\|false given\.$#' + message: '#^Parameter \#1 \$str of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:quoteString\(\) expects string, string\|false given\.$#' identifier: argument.type count: 1 path: src/Favorites/RecentFavoriteTables.php @@ -8900,7 +8900,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -9113,7 +9113,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -9173,7 +9173,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -9293,7 +9293,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -9308,7 +9308,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -9323,7 +9323,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -9347,7 +9347,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -9554,7 +9554,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -9683,7 +9683,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -10009,13 +10009,13 @@ parameters: path: src/InsertEdit.php - - message: '#^Parameter \#1 \$query of method PhpMyAdmin\\DatabaseInterface\:\:query\(\) expects string, mixed given\.$#' + message: '#^Parameter \#1 \$query of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:query\(\) expects string, mixed given\.$#' identifier: argument.type count: 1 path: src/InsertEdit.php - - message: '#^Parameter \#1 \$query of method PhpMyAdmin\\DatabaseInterface\:\:tryQuery\(\) expects string, mixed given\.$#' + message: '#^Parameter \#1 \$query of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:tryQuery\(\) expects string, mixed given\.$#' identifier: argument.type count: 1 path: src/InsertEdit.php @@ -10430,7 +10430,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -10474,7 +10474,7 @@ parameters: path: src/Navigation/Nodes/Node.php - - message: '#^Parameter \#1 \$str of method PhpMyAdmin\\DatabaseInterface\:\:quoteString\(\) expects string, mixed given\.$#' + message: '#^Parameter \#1 \$str of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:quoteString\(\) expects string, mixed given\.$#' identifier: argument.type count: 5 path: src/Navigation/Nodes/Node.php @@ -10529,7 +10529,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -10544,7 +10544,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -10553,7 +10553,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -10756,13 +10756,13 @@ parameters: path: src/Normalization.php - - message: '#^Parameter \#2 \$table of method PhpMyAdmin\\DatabaseInterface\:\:getColumnNames\(\) expects string, \(int\|string\) given\.$#' + message: '#^Parameter \#2 \$table of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:getColumnNames\(\) expects string, \(int\|string\) given\.$#' identifier: argument.type count: 1 path: src/Normalization.php - - message: '#^Parameter \#2 \$table of method PhpMyAdmin\\DatabaseInterface\:\:getColumnNames\(\) expects string, mixed given\.$#' + message: '#^Parameter \#2 \$table of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:getColumnNames\(\) expects string, mixed given\.$#' identifier: argument.type count: 1 path: src/Normalization.php @@ -10906,19 +10906,19 @@ parameters: path: src/Operations.php - - message: '#^Parameter \#1 \$query of method PhpMyAdmin\\DatabaseInterface\:\:query\(\) expects string, mixed given\.$#' + message: '#^Parameter \#1 \$query of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:query\(\) expects string, mixed given\.$#' identifier: argument.type count: 1 path: src/Operations.php - - message: '#^Parameter \#1 \$query of method PhpMyAdmin\\DatabaseInterface\:\:query\(\) expects string, string\|null given\.$#' + message: '#^Parameter \#1 \$query of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:query\(\) expects string, string\|null given\.$#' identifier: argument.type count: 1 path: src/Operations.php - - message: '#^Parameter \#1 \$str of method PhpMyAdmin\\DatabaseInterface\:\:quoteString\(\) expects string, mixed given\.$#' + message: '#^Parameter \#1 \$str of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:quoteString\(\) expects string, mixed given\.$#' identifier: argument.type count: 1 path: src/Operations.php @@ -10955,7 +10955,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -11306,7 +11306,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -11501,7 +11501,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -11636,7 +11636,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -11690,7 +11690,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -11741,7 +11741,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -11828,7 +11828,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -11885,7 +11885,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -11927,7 +11927,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -12002,7 +12002,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -12041,7 +12041,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -12110,7 +12110,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -12197,7 +12197,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -12230,7 +12230,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -12296,7 +12296,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -12533,7 +12533,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -12599,7 +12599,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -12680,7 +12680,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -12797,7 +12797,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -13118,7 +13118,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -13196,7 +13196,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -13394,7 +13394,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -13805,7 +13805,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -13862,7 +13862,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -13955,7 +13955,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -14162,7 +14162,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -14171,7 +14171,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -14180,7 +14180,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -14189,7 +14189,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -14252,7 +14252,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -14992,7 +14992,7 @@ parameters: path: src/Replication/Replication.php - - message: '#^Parameter \#1 \$str of method PhpMyAdmin\\DatabaseInterface\:\:quoteString\(\) expects string, mixed given\.$#' + message: '#^Parameter \#1 \$str of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:quoteString\(\) expects string, mixed given\.$#' identifier: argument.type count: 2 path: src/Replication/Replication.php @@ -15008,7 +15008,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -15158,7 +15158,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -15616,13 +15616,13 @@ parameters: path: src/Server/Privileges.php - - message: '#^Parameter \#1 \$query of method PhpMyAdmin\\DatabaseInterface\:\:query\(\) expects string, mixed given\.$#' + message: '#^Parameter \#1 \$query of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:query\(\) expects string, mixed given\.$#' identifier: argument.type count: 1 path: src/Server/Privileges.php - - message: '#^Parameter \#1 \$query of method PhpMyAdmin\\DatabaseInterface\:\:tryQuery\(\) expects string, mixed given\.$#' + message: '#^Parameter \#1 \$query of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:tryQuery\(\) expects string, mixed given\.$#' identifier: argument.type count: 1 path: src/Server/Privileges.php @@ -15634,13 +15634,13 @@ parameters: path: src/Server/Privileges.php - - message: '#^Parameter \#1 \$str of method PhpMyAdmin\\DatabaseInterface\:\:quoteString\(\) expects string, mixed given\.$#' + message: '#^Parameter \#1 \$str of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:quoteString\(\) expects string, mixed given\.$#' identifier: argument.type count: 5 path: src/Server/Privileges.php - - message: '#^Parameter \#1 \$str of method PhpMyAdmin\\DatabaseInterface\:\:quoteString\(\) expects string, string\|null given\.$#' + message: '#^Parameter \#1 \$str of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:quoteString\(\) expects string, string\|null given\.$#' identifier: argument.type count: 2 path: src/Server/Privileges.php @@ -15961,7 +15961,7 @@ parameters: path: src/Server/Status/Monitor.php - - message: '#^Parameter \#1 \$query of method PhpMyAdmin\\DatabaseInterface\:\:tryQuery\(\) expects string, string\|null given\.$#' + message: '#^Parameter \#1 \$query of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:tryQuery\(\) expects string, string\|null given\.$#' identifier: argument.type count: 1 path: src/Server/Status/Monitor.php @@ -16523,7 +16523,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -16639,7 +16639,7 @@ parameters: path: src/SystemDatabase.php - - message: '#^Parameter \#1 \$str of method PhpMyAdmin\\DatabaseInterface\:\:quoteString\(\) expects string, string\|null given\.$#' + message: '#^Parameter \#1 \$str of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:quoteString\(\) expects string, string\|null given\.$#' identifier: argument.type count: 4 path: src/SystemDatabase.php @@ -16828,7 +16828,7 @@ parameters: path: src/Table/Search.php - - message: '#^Parameter \#1 \$str of method PhpMyAdmin\\DatabaseInterface\:\:quoteString\(\) expects string, mixed given\.$#' + message: '#^Parameter \#1 \$str of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:quoteString\(\) expects string, mixed given\.$#' identifier: argument.type count: 3 path: src/Table/Search.php @@ -16886,7 +16886,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -17140,7 +17140,7 @@ parameters: path: src/Table/TableMover.php - - message: '#^Parameter \#1 \$str of method PhpMyAdmin\\DatabaseInterface\:\:quoteString\(\) expects string, string\|null given\.$#' + message: '#^Parameter \#1 \$str of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:quoteString\(\) expects string, string\|null given\.$#' identifier: argument.type count: 6 path: src/Table/TableMover.php @@ -17246,7 +17246,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -17314,7 +17314,7 @@ parameters: path: src/Tracking/Tracker.php - - message: '#^Parameter \#1 \$str of method PhpMyAdmin\\DatabaseInterface\:\:quoteString\(\) expects string, mixed given\.$#' + message: '#^Parameter \#1 \$str of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:quoteString\(\) expects string, mixed given\.$#' identifier: argument.type count: 2 path: src/Tracking/Tracker.php @@ -17443,13 +17443,13 @@ parameters: path: src/Tracking/Tracking.php - - message: '#^Parameter \#1 \$str of method PhpMyAdmin\\DatabaseInterface\:\:quoteString\(\) expects string, string\|null given\.$#' + message: '#^Parameter \#1 \$str of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:quoteString\(\) expects string, string\|null given\.$#' identifier: argument.type count: 2 path: src/Tracking/Tracking.php - - message: '#^Parameter \#2 \$tableName of method PhpMyAdmin\\DatabaseInterface\:\:getTable\(\) expects string, mixed given\.$#' + message: '#^Parameter \#2 \$tableName of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:getTable\(\) expects string, mixed given\.$#' identifier: argument.type count: 1 path: src/Tracking/Tracking.php @@ -17462,7 +17462,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -17573,7 +17573,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -17582,7 +17582,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -17660,7 +17660,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -17743,7 +17743,7 @@ parameters: path: src/UserPreferences.php - - message: '#^Parameter \#1 \$str of method PhpMyAdmin\\DatabaseInterface\:\:quoteString\(\) expects string, string\|false given\.$#' + message: '#^Parameter \#1 \$str of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:quoteString\(\) expects string, string\|false given\.$#' identifier: argument.type count: 2 path: src/UserPreferences.php @@ -17873,7 +17873,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -18031,7 +18031,7 @@ parameters: path: src/Util.php - - message: '#^Parameter \#1 \$str of method PhpMyAdmin\\DatabaseInterface\:\:escapeMysqlWildcards\(\) expects string, mixed given\.$#' + message: '#^Parameter \#1 \$str of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:escapeMysqlWildcards\(\) expects string, mixed given\.$#' identifier: argument.type count: 1 path: src/Util.php @@ -18043,7 +18043,7 @@ parameters: path: src/Util.php - - message: '#^Parameter \#2 \$table of method PhpMyAdmin\\DatabaseInterface\:\:getTablesFull\(\) expects array\\|string, mixed given\.$#' + message: '#^Parameter \#2 \$table of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:getTablesFull\(\) expects array\\|string, mixed given\.$#' identifier: argument.type count: 1 path: src/Util.php @@ -18065,7 +18065,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -18122,7 +18122,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -18224,7 +18224,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -18833,7 +18833,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -18893,7 +18893,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -19076,7 +19076,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -19322,7 +19322,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -19358,7 +19358,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -19385,7 +19385,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -19421,7 +19421,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -19604,7 +19604,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -19628,7 +19628,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -19676,7 +19676,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -19694,7 +19694,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -19730,7 +19730,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -19748,7 +19748,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -19766,7 +19766,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -19802,7 +19802,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -19847,7 +19847,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -19883,7 +19883,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -19901,7 +19901,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -19919,7 +19919,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -19955,7 +19955,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -19979,7 +19979,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -19997,7 +19997,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -20075,7 +20075,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -20129,7 +20129,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -20180,7 +20180,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -20189,7 +20189,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -20288,7 +20288,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -20342,7 +20342,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -20366,7 +20366,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -20390,7 +20390,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -20408,7 +20408,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -20417,7 +20417,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -20441,7 +20441,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -20630,7 +20630,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -20807,7 +20807,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -20942,7 +20942,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -20989,7 +20989,7 @@ parameters: path: tests/unit/IpAllowDenyTest.php - - message: '#^Call to static method PHPUnit\\Framework\\Assert\:\:assertSame\(\) with array\{\} and array\{\000PhpMyAdmin\\ListDatabase\000dbi\: PhpMyAdmin\\DatabaseInterface, \000PhpMyAdmin\\ListDatabase\000config\: PhpMyAdmin\\Config, \000PhpMyAdmin\\ListDatabase\000userPrivilegesFactory\: PhpMyAdmin\\UserPrivilegesFactory\} will always evaluate to false\.$#' + message: '#^Call to static method PHPUnit\\Framework\\Assert\:\:assertSame\(\) with array\{\} and array\{\000PhpMyAdmin\\ListDatabase\000dbi\: PhpMyAdmin\\Dbal\\DatabaseInterface, \000PhpMyAdmin\\ListDatabase\000config\: PhpMyAdmin\\Config, \000PhpMyAdmin\\ListDatabase\000userPrivilegesFactory\: PhpMyAdmin\\UserPrivilegesFactory\} will always evaluate to false\.$#' identifier: staticMethod.impossibleType count: 1 path: tests/unit/ListDatabaseTest.php @@ -21620,7 +21620,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -21644,7 +21644,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -21695,7 +21695,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -21896,7 +21896,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -21971,7 +21971,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -22016,7 +22016,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -22064,7 +22064,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated @@ -22109,7 +22109,7 @@ parameters: - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\DatabaseInterface\: + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 4d8f427cc9..8e57dc5c9f 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -4169,7 +4169,7 @@ - + @@ -4296,7 +4296,6 @@ - @@ -4316,12 +4315,6 @@ - - - - - - diff --git a/src/Advisory/Advisor.php b/src/Advisory/Advisor.php index d6b26ef773..8f62d6831f 100644 --- a/src/Advisory/Advisor.php +++ b/src/Advisory/Advisor.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Advisory; use PhpMyAdmin\Core; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Server\SysInfo\SysInfo; use PhpMyAdmin\Url; use PhpMyAdmin\Util; diff --git a/src/Bookmarks/Bookmark.php b/src/Bookmarks/Bookmark.php index 478af296dd..cc0a0f0a21 100644 --- a/src/Bookmarks/Bookmark.php +++ b/src/Bookmarks/Bookmark.php @@ -8,8 +8,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Bookmarks; use PhpMyAdmin\ConfigStorage\Features\BookmarkFeature; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Util; use function count; diff --git a/src/Bookmarks/BookmarkRepository.php b/src/Bookmarks/BookmarkRepository.php index 9d68f99221..aedb73c591 100644 --- a/src/Bookmarks/BookmarkRepository.php +++ b/src/Bookmarks/BookmarkRepository.php @@ -10,8 +10,8 @@ namespace PhpMyAdmin\Bookmarks; use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Features\BookmarkFeature; use PhpMyAdmin\ConfigStorage\Relation; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Util; diff --git a/src/Charsets.php b/src/Charsets.php index 12e06da63c..3b5a573bdb 100644 --- a/src/Charsets.php +++ b/src/Charsets.php @@ -9,6 +9,7 @@ namespace PhpMyAdmin; use PhpMyAdmin\Charsets\Charset; use PhpMyAdmin\Charsets\Collation; +use PhpMyAdmin\Dbal\DatabaseInterface; use function __; use function array_keys; diff --git a/src/Command/CacheWarmupCommand.php b/src/Command/CacheWarmupCommand.php index 66bcf72f0c..af0b0c92a9 100644 --- a/src/Command/CacheWarmupCommand.php +++ b/src/Command/CacheWarmupCommand.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Command; use PhpMyAdmin\Config; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Routing\Routing; use PhpMyAdmin\Template; use PhpMyAdmin\Tests\Stubs\DbiDummy; diff --git a/src/Config.php b/src/Config.php index 8ec77cdd5a..56298ff79f 100644 --- a/src/Config.php +++ b/src/Config.php @@ -8,6 +8,7 @@ use PhpMyAdmin\Config\Settings; use PhpMyAdmin\Config\Settings\Server; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Exceptions\ConfigException; use PhpMyAdmin\I18n\LanguageManager; use PhpMyAdmin\Routing\Routing; diff --git a/src/ConfigStorage/Relation.php b/src/ConfigStorage/Relation.php index ec98f98a81..c543ae7dad 100644 --- a/src/ConfigStorage/Relation.php +++ b/src/ConfigStorage/Relation.php @@ -7,8 +7,8 @@ namespace PhpMyAdmin\ConfigStorage; use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Features\PdfFeature; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\InternalRelations; diff --git a/src/ConfigStorage/RelationCleanup.php b/src/ConfigStorage/RelationCleanup.php index 38b2c7b77b..e8f3380f2a 100644 --- a/src/ConfigStorage/RelationCleanup.php +++ b/src/ConfigStorage/RelationCleanup.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace PhpMyAdmin\ConfigStorage; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Util; use function sprintf; diff --git a/src/ConfigStorage/UserGroups.php b/src/ConfigStorage/UserGroups.php index acb89d3464..66a6d742fe 100644 --- a/src/ConfigStorage/UserGroups.php +++ b/src/ConfigStorage/UserGroups.php @@ -8,8 +8,8 @@ declare(strict_types=1); namespace PhpMyAdmin\ConfigStorage; use PhpMyAdmin\ConfigStorage\Features\ConfigurableMenusFeature; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Template; use PhpMyAdmin\Url; diff --git a/src/Controllers/ColumnController.php b/src/Controllers/ColumnController.php index f2c7493047..78aeab95e1 100644 --- a/src/Controllers/ColumnController.php +++ b/src/Controllers/ColumnController.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; diff --git a/src/Controllers/Database/DataDictionaryController.php b/src/Controllers/Database/DataDictionaryController.php index 5b546d79a7..42292a03ea 100644 --- a/src/Controllers/Database/DataDictionaryController.php +++ b/src/Controllers/Database/DataDictionaryController.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Controllers\Database; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Index; diff --git a/src/Controllers/Database/EventsController.php b/src/Controllers/Database/EventsController.php index 5b797b2ada..6808c0d662 100644 --- a/src/Controllers/Database/EventsController.php +++ b/src/Controllers/Database/EventsController.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Controllers\Database; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; use PhpMyAdmin\Database\Events; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; diff --git a/src/Controllers/Database/ImportController.php b/src/Controllers/Database/ImportController.php index dd5b4b61cc..49721b62c6 100644 --- a/src/Controllers/Database/ImportController.php +++ b/src/Controllers/Database/ImportController.php @@ -9,7 +9,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\Config\PageSettings; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Encoding; use PhpMyAdmin\Http\Response; diff --git a/src/Controllers/Database/MultiTableQuery/TablesController.php b/src/Controllers/Database/MultiTableQuery/TablesController.php index 6da9db31d4..5cf4bb84be 100644 --- a/src/Controllers/Database/MultiTableQuery/TablesController.php +++ b/src/Controllers/Database/MultiTableQuery/TablesController.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Database\MultiTableQuery; use PhpMyAdmin\Controllers\InvocableController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Query\Generator as QueryGenerator; diff --git a/src/Controllers/Database/MultiTableQueryController.php b/src/Controllers/Database/MultiTableQueryController.php index 6c74f5bdeb..e1bc6860ec 100644 --- a/src/Controllers/Database/MultiTableQueryController.php +++ b/src/Controllers/Database/MultiTableQueryController.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Controllers\Database; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; use PhpMyAdmin\Database\MultiTableQuery; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; diff --git a/src/Controllers/Database/PrivilegesController.php b/src/Controllers/Database/PrivilegesController.php index ad298e808e..ce9e74d9b1 100644 --- a/src/Controllers/Database/PrivilegesController.php +++ b/src/Controllers/Database/PrivilegesController.php @@ -9,7 +9,7 @@ namespace PhpMyAdmin\Controllers\Database; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\InvocableController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Identifiers\DatabaseName; diff --git a/src/Controllers/Database/RoutinesController.php b/src/Controllers/Database/RoutinesController.php index df754e24a4..db059d1e8a 100644 --- a/src/Controllers/Database/RoutinesController.php +++ b/src/Controllers/Database/RoutinesController.php @@ -9,7 +9,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; use PhpMyAdmin\Database\Routines; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; diff --git a/src/Controllers/Database/SearchController.php b/src/Controllers/Database/SearchController.php index b3b2b1c128..c5b16dc6e5 100644 --- a/src/Controllers/Database/SearchController.php +++ b/src/Controllers/Database/SearchController.php @@ -8,7 +8,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; use PhpMyAdmin\Database\Search; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Html\MySQLDocumentation; use PhpMyAdmin\Http\Response; diff --git a/src/Controllers/Database/SqlAutoCompleteController.php b/src/Controllers/Database/SqlAutoCompleteController.php index d2f94de788..d4a024bfa6 100644 --- a/src/Controllers/Database/SqlAutoCompleteController.php +++ b/src/Controllers/Database/SqlAutoCompleteController.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Controllers\Database; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\InvocableController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Identifiers\DatabaseName; diff --git a/src/Controllers/Database/Structure/AddPrefixTableController.php b/src/Controllers/Database/Structure/AddPrefixTableController.php index bf762aeb69..9d50161e82 100644 --- a/src/Controllers/Database/Structure/AddPrefixTableController.php +++ b/src/Controllers/Database/Structure/AddPrefixTableController.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Controllers\Database\Structure; use PhpMyAdmin\Controllers\Database\StructureController; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; diff --git a/src/Controllers/Database/Structure/CentralColumns/AddController.php b/src/Controllers/Database/Structure/CentralColumns/AddController.php index 7c6938ff6f..aa79d5e98e 100644 --- a/src/Controllers/Database/Structure/CentralColumns/AddController.php +++ b/src/Controllers/Database/Structure/CentralColumns/AddController.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Controllers\Database\Structure\CentralColumns; use PhpMyAdmin\Controllers\Database\StructureController; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Database\CentralColumns; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Identifiers\DatabaseName; diff --git a/src/Controllers/Database/Structure/CentralColumns/MakeConsistentController.php b/src/Controllers/Database/Structure/CentralColumns/MakeConsistentController.php index e22f61d5b5..724bed6c59 100644 --- a/src/Controllers/Database/Structure/CentralColumns/MakeConsistentController.php +++ b/src/Controllers/Database/Structure/CentralColumns/MakeConsistentController.php @@ -8,7 +8,7 @@ use PhpMyAdmin\Controllers\Database\StructureController; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; use PhpMyAdmin\Database\CentralColumns; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; diff --git a/src/Controllers/Database/Structure/CentralColumns/RemoveController.php b/src/Controllers/Database/Structure/CentralColumns/RemoveController.php index e09bf61b33..7802606237 100644 --- a/src/Controllers/Database/Structure/CentralColumns/RemoveController.php +++ b/src/Controllers/Database/Structure/CentralColumns/RemoveController.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Controllers\Database\Structure\CentralColumns; use PhpMyAdmin\Controllers\Database\StructureController; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Database\CentralColumns; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; diff --git a/src/Controllers/Database/Structure/CopyFormController.php b/src/Controllers/Database/Structure/CopyFormController.php index a345e7fb9c..f57ff53dab 100644 --- a/src/Controllers/Database/Structure/CopyFormController.php +++ b/src/Controllers/Database/Structure/CopyFormController.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Controllers\Database\Structure; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Factory\ResponseFactory; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; diff --git a/src/Controllers/Database/Structure/DropFormController.php b/src/Controllers/Database/Structure/DropFormController.php index b22dccf671..7c82a76dc5 100644 --- a/src/Controllers/Database/Structure/DropFormController.php +++ b/src/Controllers/Database/Structure/DropFormController.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Controllers\Database\Structure; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; diff --git a/src/Controllers/Database/Structure/DropTableController.php b/src/Controllers/Database/Structure/DropTableController.php index f3ec50efa7..c5de7c18f1 100644 --- a/src/Controllers/Database/Structure/DropTableController.php +++ b/src/Controllers/Database/Structure/DropTableController.php @@ -8,7 +8,7 @@ use PhpMyAdmin\ConfigStorage\RelationCleanup; use PhpMyAdmin\Controllers\Database\StructureController; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; diff --git a/src/Controllers/Database/Structure/EmptyTableController.php b/src/Controllers/Database/Structure/EmptyTableController.php index 9b9a005c54..f376e0e75d 100644 --- a/src/Controllers/Database/Structure/EmptyTableController.php +++ b/src/Controllers/Database/Structure/EmptyTableController.php @@ -11,7 +11,7 @@ use PhpMyAdmin\ConfigStorage\RelationCleanup; use PhpMyAdmin\Controllers\Database\StructureController; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\FlashMessenger; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; diff --git a/src/Controllers/Database/Structure/RealRowCountController.php b/src/Controllers/Database/Structure/RealRowCountController.php index e95ca1c65a..30f9ee2ab0 100644 --- a/src/Controllers/Database/Structure/RealRowCountController.php +++ b/src/Controllers/Database/Structure/RealRowCountController.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Controllers\Database\Structure; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; diff --git a/src/Controllers/Database/Structure/ReplacePrefixController.php b/src/Controllers/Database/Structure/ReplacePrefixController.php index f407a74938..5ff504348b 100644 --- a/src/Controllers/Database/Structure/ReplacePrefixController.php +++ b/src/Controllers/Database/Structure/ReplacePrefixController.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Controllers\Database\Structure; use Fig\Http\Message\StatusCodeInterface; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\FlashMessenger; use PhpMyAdmin\Http\Factory\ResponseFactory; use PhpMyAdmin\Http\Response; diff --git a/src/Controllers/Database/Structure/ShowCreateController.php b/src/Controllers/Database/Structure/ShowCreateController.php index 9847a1756d..ddfe543690 100644 --- a/src/Controllers/Database/Structure/ShowCreateController.php +++ b/src/Controllers/Database/Structure/ShowCreateController.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Controllers\Database\Structure; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Core; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; diff --git a/src/Controllers/Database/StructureController.php b/src/Controllers/Database/StructureController.php index 2303114b29..080183f2dd 100644 --- a/src/Controllers/Database/StructureController.php +++ b/src/Controllers/Database/StructureController.php @@ -11,7 +11,7 @@ use PhpMyAdmin\Config\PageSettings; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Favorites\RecentFavoriteTable; use PhpMyAdmin\Favorites\RecentFavoriteTables; diff --git a/src/Controllers/Database/TrackingController.php b/src/Controllers/Database/TrackingController.php index 0f78d460c8..e77f3eb202 100644 --- a/src/Controllers/Database/TrackingController.php +++ b/src/Controllers/Database/TrackingController.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Controllers\Database; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\Response; diff --git a/src/Controllers/DatabaseController.php b/src/Controllers/DatabaseController.php index 263b6fc07d..516d678a06 100644 --- a/src/Controllers/DatabaseController.php +++ b/src/Controllers/DatabaseController.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; diff --git a/src/Controllers/ErrorReportController.php b/src/Controllers/ErrorReportController.php index fc673daa81..c8ed9892eb 100644 --- a/src/Controllers/ErrorReportController.php +++ b/src/Controllers/ErrorReportController.php @@ -9,7 +9,7 @@ namespace PhpMyAdmin\Controllers; use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Error\ErrorHandler; use PhpMyAdmin\Error\ErrorReport; use PhpMyAdmin\Http\Response; diff --git a/src/Controllers/HomeController.php b/src/Controllers/HomeController.php index 98a21fd0ae..0200e1b7d5 100644 --- a/src/Controllers/HomeController.php +++ b/src/Controllers/HomeController.php @@ -10,7 +10,7 @@ use PhpMyAdmin\Charsets; use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Favorites\RecentFavoriteTables; use PhpMyAdmin\Favorites\TableType; use PhpMyAdmin\Git; diff --git a/src/Controllers/Import/ImportController.php b/src/Controllers/Import/ImportController.php index b446d0538c..594fa9c2ca 100644 --- a/src/Controllers/Import/ImportController.php +++ b/src/Controllers/Import/ImportController.php @@ -11,7 +11,7 @@ use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Core; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Encoding; use PhpMyAdmin\File; use PhpMyAdmin\Html\Generator; diff --git a/src/Controllers/Operations/Database/CollationController.php b/src/Controllers/Operations/Database/CollationController.php index c490d6ddcd..1a6693966a 100644 --- a/src/Controllers/Operations/Database/CollationController.php +++ b/src/Controllers/Operations/Database/CollationController.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Controllers\Operations\Database; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; diff --git a/src/Controllers/Operations/DatabaseController.php b/src/Controllers/Operations/DatabaseController.php index 5c39a877f3..a4fedfb6ef 100644 --- a/src/Controllers/Operations/DatabaseController.php +++ b/src/Controllers/Operations/DatabaseController.php @@ -10,7 +10,7 @@ use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationCleanup; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\Response; diff --git a/src/Controllers/Operations/TableController.php b/src/Controllers/Operations/TableController.php index 3d80851692..b5111e7b6f 100644 --- a/src/Controllers/Operations/TableController.php +++ b/src/Controllers/Operations/TableController.php @@ -9,7 +9,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\Response; diff --git a/src/Controllers/Operations/ViewController.php b/src/Controllers/Operations/ViewController.php index 478fc2645b..13c2858842 100644 --- a/src/Controllers/Operations/ViewController.php +++ b/src/Controllers/Operations/ViewController.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Controllers\Operations; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\Response; diff --git a/src/Controllers/Server/BinlogController.php b/src/Controllers/Server/BinlogController.php index 2e02f196b2..1c7e5eeb2f 100644 --- a/src/Controllers/Server/BinlogController.php +++ b/src/Controllers/Server/BinlogController.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Controllers\Server; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\InvocableController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; diff --git a/src/Controllers/Server/CollationsController.php b/src/Controllers/Server/CollationsController.php index 9d31e62cef..1991d077e4 100644 --- a/src/Controllers/Server/CollationsController.php +++ b/src/Controllers/Server/CollationsController.php @@ -9,7 +9,7 @@ use PhpMyAdmin\Charsets\Charset; use PhpMyAdmin\Charsets\Collation; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\InvocableController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; diff --git a/src/Controllers/Server/Databases/CreateController.php b/src/Controllers/Server/Databases/CreateController.php index 7a13456f0c..063b8b38cc 100644 --- a/src/Controllers/Server/Databases/CreateController.php +++ b/src/Controllers/Server/Databases/CreateController.php @@ -8,7 +8,7 @@ use PhpMyAdmin\Charsets; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; diff --git a/src/Controllers/Server/Databases/DestroyController.php b/src/Controllers/Server/Databases/DestroyController.php index a42e04d753..8f10849257 100644 --- a/src/Controllers/Server/Databases/DestroyController.php +++ b/src/Controllers/Server/Databases/DestroyController.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Controllers\Server\Databases; use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\RelationCleanup; use PhpMyAdmin\Controllers\InvocableController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; diff --git a/src/Controllers/Server/DatabasesController.php b/src/Controllers/Server/DatabasesController.php index 29caee50c4..a8266cc24e 100644 --- a/src/Controllers/Server/DatabasesController.php +++ b/src/Controllers/Server/DatabasesController.php @@ -8,8 +8,8 @@ use PhpMyAdmin\Charsets; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Query\Utilities; diff --git a/src/Controllers/Server/EnginesController.php b/src/Controllers/Server/EnginesController.php index 7550e3f36f..59c25625bd 100644 --- a/src/Controllers/Server/EnginesController.php +++ b/src/Controllers/Server/EnginesController.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Server; use PhpMyAdmin\Controllers\InvocableController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; diff --git a/src/Controllers/Server/ExportController.php b/src/Controllers/Server/ExportController.php index c54ed2c107..442b8c81b8 100644 --- a/src/Controllers/Server/ExportController.php +++ b/src/Controllers/Server/ExportController.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Controllers\Server; use PhpMyAdmin\Config\PageSettings; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Export\Options; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; diff --git a/src/Controllers/Server/ImportController.php b/src/Controllers/Server/ImportController.php index 28b6272a58..c1b1f129d1 100644 --- a/src/Controllers/Server/ImportController.php +++ b/src/Controllers/Server/ImportController.php @@ -9,7 +9,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\Config\PageSettings; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Encoding; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; diff --git a/src/Controllers/Server/PluginsController.php b/src/Controllers/Server/PluginsController.php index 64ed4acbdc..12ce81632d 100644 --- a/src/Controllers/Server/PluginsController.php +++ b/src/Controllers/Server/PluginsController.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Server; use PhpMyAdmin\Controllers\InvocableController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; diff --git a/src/Controllers/Server/PrivilegesController.php b/src/Controllers/Server/PrivilegesController.php index 8c16097a28..30a089abda 100644 --- a/src/Controllers/Server/PrivilegesController.php +++ b/src/Controllers/Server/PrivilegesController.php @@ -9,7 +9,7 @@ use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationCleanup; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; diff --git a/src/Controllers/Server/ReplicationController.php b/src/Controllers/Server/ReplicationController.php index 238bf92059..ffe5df62a1 100644 --- a/src/Controllers/Server/ReplicationController.php +++ b/src/Controllers/Server/ReplicationController.php @@ -8,7 +8,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Server; use PhpMyAdmin\Controllers\InvocableController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Replication\ReplicationGui; diff --git a/src/Controllers/Server/ShowEngineController.php b/src/Controllers/Server/ShowEngineController.php index 6358297005..314fe04ed3 100644 --- a/src/Controllers/Server/ShowEngineController.php +++ b/src/Controllers/Server/ShowEngineController.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Server; use PhpMyAdmin\Controllers\InvocableController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; diff --git a/src/Controllers/Server/SqlController.php b/src/Controllers/Server/SqlController.php index 5bca38ce67..9eaa0245ef 100644 --- a/src/Controllers/Server/SqlController.php +++ b/src/Controllers/Server/SqlController.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Controllers\Server; use PhpMyAdmin\Config\PageSettings; use PhpMyAdmin\Controllers\InvocableController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; diff --git a/src/Controllers/Server/Status/Monitor/ChartingDataController.php b/src/Controllers/Server/Status/Monitor/ChartingDataController.php index b7cb2faaf1..79dd206d34 100644 --- a/src/Controllers/Server/Status/Monitor/ChartingDataController.php +++ b/src/Controllers/Server/Status/Monitor/ChartingDataController.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Controllers\Server\Status\Monitor; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Controllers\Server\Status\AbstractController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; diff --git a/src/Controllers/Server/Status/Monitor/GeneralLogController.php b/src/Controllers/Server/Status/Monitor/GeneralLogController.php index c48b48df6d..2d81de011e 100644 --- a/src/Controllers/Server/Status/Monitor/GeneralLogController.php +++ b/src/Controllers/Server/Status/Monitor/GeneralLogController.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Controllers\Server\Status\Monitor; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Controllers\Server\Status\AbstractController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; diff --git a/src/Controllers/Server/Status/Monitor/LogVarsController.php b/src/Controllers/Server/Status/Monitor/LogVarsController.php index a8185eec07..073c80e1ae 100644 --- a/src/Controllers/Server/Status/Monitor/LogVarsController.php +++ b/src/Controllers/Server/Status/Monitor/LogVarsController.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Controllers\Server\Status\Monitor; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Controllers\Server\Status\AbstractController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; diff --git a/src/Controllers/Server/Status/Monitor/QueryAnalyzerController.php b/src/Controllers/Server/Status/Monitor/QueryAnalyzerController.php index adba62949d..bd802dd670 100644 --- a/src/Controllers/Server/Status/Monitor/QueryAnalyzerController.php +++ b/src/Controllers/Server/Status/Monitor/QueryAnalyzerController.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Controllers\Server\Status\Monitor; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Controllers\Server\Status\AbstractController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; diff --git a/src/Controllers/Server/Status/Monitor/SlowLogController.php b/src/Controllers/Server/Status/Monitor/SlowLogController.php index d5598f5148..227b14964a 100644 --- a/src/Controllers/Server/Status/Monitor/SlowLogController.php +++ b/src/Controllers/Server/Status/Monitor/SlowLogController.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Controllers\Server\Status\Monitor; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Controllers\Server\Status\AbstractController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; diff --git a/src/Controllers/Server/Status/MonitorController.php b/src/Controllers/Server/Status/MonitorController.php index e6d30a9a71..9544e7e438 100644 --- a/src/Controllers/Server/Status/MonitorController.php +++ b/src/Controllers/Server/Status/MonitorController.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Server\Status; use PhpMyAdmin\Controllers\InvocableController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; diff --git a/src/Controllers/Server/Status/Processes/KillController.php b/src/Controllers/Server/Status/Processes/KillController.php index dc43440a70..3a75dcd533 100644 --- a/src/Controllers/Server/Status/Processes/KillController.php +++ b/src/Controllers/Server/Status/Processes/KillController.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Controllers\Server\Status\Processes; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Controllers\Server\Status\AbstractController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; diff --git a/src/Controllers/Server/Status/ProcessesController.php b/src/Controllers/Server/Status/ProcessesController.php index 4644fbc794..cec0760899 100644 --- a/src/Controllers/Server/Status/ProcessesController.php +++ b/src/Controllers/Server/Status/ProcessesController.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Server\Status; use PhpMyAdmin\Controllers\InvocableController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; diff --git a/src/Controllers/Server/Status/QueriesController.php b/src/Controllers/Server/Status/QueriesController.php index f452e6c149..7433059a5d 100644 --- a/src/Controllers/Server/Status/QueriesController.php +++ b/src/Controllers/Server/Status/QueriesController.php @@ -8,7 +8,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Server\Status; use PhpMyAdmin\Controllers\InvocableController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; diff --git a/src/Controllers/Server/Status/StatusController.php b/src/Controllers/Server/Status/StatusController.php index 6ae5b3b807..fb1c86d335 100644 --- a/src/Controllers/Server/Status/StatusController.php +++ b/src/Controllers/Server/Status/StatusController.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Controllers\Server\Status; use DateTimeImmutable; use PhpMyAdmin\Controllers\InvocableController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Replication\ReplicationGui; diff --git a/src/Controllers/Server/Status/VariablesController.php b/src/Controllers/Server/Status/VariablesController.php index 64725eb8d9..9215e519ca 100644 --- a/src/Controllers/Server/Status/VariablesController.php +++ b/src/Controllers/Server/Status/VariablesController.php @@ -8,7 +8,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Server\Status; use PhpMyAdmin\Controllers\InvocableController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; diff --git a/src/Controllers/Server/UserGroupsController.php b/src/Controllers/Server/UserGroupsController.php index 2a06cd8938..2b99c15e71 100644 --- a/src/Controllers/Server/UserGroupsController.php +++ b/src/Controllers/Server/UserGroupsController.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Controllers\Server; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\UserGroups; use PhpMyAdmin\Controllers\InvocableController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; diff --git a/src/Controllers/Server/UserGroupsFormController.php b/src/Controllers/Server/UserGroupsFormController.php index be8fab23d6..927b493c3e 100644 --- a/src/Controllers/Server/UserGroupsFormController.php +++ b/src/Controllers/Server/UserGroupsFormController.php @@ -8,8 +8,8 @@ use Fig\Http\Message\StatusCodeInterface; use PhpMyAdmin\ConfigStorage\Features\ConfigurableMenusFeature; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\InvocableController; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; diff --git a/src/Controllers/Server/Variables/GetVariableController.php b/src/Controllers/Server/Variables/GetVariableController.php index 6d02c04360..05f7210594 100644 --- a/src/Controllers/Server/Variables/GetVariableController.php +++ b/src/Controllers/Server/Variables/GetVariableController.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Server\Variables; use PhpMyAdmin\Controllers\InvocableController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Providers\ServerVariables\ServerVariablesProvider; diff --git a/src/Controllers/Server/Variables/SetVariableController.php b/src/Controllers/Server/Variables/SetVariableController.php index 6407108263..ada3d5b972 100644 --- a/src/Controllers/Server/Variables/SetVariableController.php +++ b/src/Controllers/Server/Variables/SetVariableController.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Server\Variables; use PhpMyAdmin\Controllers\InvocableController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Providers\ServerVariables\ServerVariablesProvider; diff --git a/src/Controllers/Server/VariablesController.php b/src/Controllers/Server/VariablesController.php index 8f35b751de..38e6e4d7d5 100644 --- a/src/Controllers/Server/VariablesController.php +++ b/src/Controllers/Server/VariablesController.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Server; use PhpMyAdmin\Controllers\InvocableController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; diff --git a/src/Controllers/Sql/ColumnPreferencesController.php b/src/Controllers/Sql/ColumnPreferencesController.php index 0dcbca9da0..45f08a0817 100644 --- a/src/Controllers/Sql/ColumnPreferencesController.php +++ b/src/Controllers/Sql/ColumnPreferencesController.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Controllers\Sql; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; diff --git a/src/Controllers/Sql/SqlController.php b/src/Controllers/Sql/SqlController.php index f6d25c06a4..d2a576102b 100644 --- a/src/Controllers/Sql/SqlController.php +++ b/src/Controllers/Sql/SqlController.php @@ -10,7 +10,7 @@ use PhpMyAdmin\Config\PageSettings; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Core; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; diff --git a/src/Controllers/Table/AddFieldController.php b/src/Controllers/Table/AddFieldController.php index 7298bb7a9b..7b64b0aa95 100644 --- a/src/Controllers/Table/AddFieldController.php +++ b/src/Controllers/Table/AddFieldController.php @@ -9,7 +9,7 @@ use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Core; use PhpMyAdmin\CreateAddField; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\Response; diff --git a/src/Controllers/Table/ChartController.php b/src/Controllers/Table/ChartController.php index 50ca824436..7f6c94b2e7 100644 --- a/src/Controllers/Table/ChartController.php +++ b/src/Controllers/Table/ChartController.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Controllers\Table; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\FieldMetadata; use PhpMyAdmin\Html\Generator; diff --git a/src/Controllers/Table/CreateController.php b/src/Controllers/Table/CreateController.php index ab85e7d654..0091eebfbe 100644 --- a/src/Controllers/Table/CreateController.php +++ b/src/Controllers/Table/CreateController.php @@ -9,7 +9,7 @@ use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Core; use PhpMyAdmin\CreateAddField; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; diff --git a/src/Controllers/Table/DeleteRowsController.php b/src/Controllers/Table/DeleteRowsController.php index 7b1bdbeedc..2c19c118ec 100644 --- a/src/Controllers/Table/DeleteRowsController.php +++ b/src/Controllers/Table/DeleteRowsController.php @@ -10,7 +10,7 @@ use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationCleanup; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; diff --git a/src/Controllers/Table/DropColumnController.php b/src/Controllers/Table/DropColumnController.php index bf80934f75..cbdc1ed904 100644 --- a/src/Controllers/Table/DropColumnController.php +++ b/src/Controllers/Table/DropColumnController.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Controllers\Table; use PhpMyAdmin\ConfigStorage\RelationCleanup; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\FlashMessenger; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; diff --git a/src/Controllers/Table/FindReplaceController.php b/src/Controllers/Table/FindReplaceController.php index 1c383508ff..b8d904e461 100644 --- a/src/Controllers/Table/FindReplaceController.php +++ b/src/Controllers/Table/FindReplaceController.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Controllers\Table; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\Response; diff --git a/src/Controllers/Table/GetFieldController.php b/src/Controllers/Table/GetFieldController.php index 66b10cc426..204b3922a6 100644 --- a/src/Controllers/Table/GetFieldController.php +++ b/src/Controllers/Table/GetFieldController.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Controllers\Table; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Core; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\Factory\ResponseFactory; use PhpMyAdmin\Http\Response; diff --git a/src/Controllers/Table/GisVisualizationController.php b/src/Controllers/Table/GisVisualizationController.php index d4963147ea..897aa59c11 100644 --- a/src/Controllers/Table/GisVisualizationController.php +++ b/src/Controllers/Table/GisVisualizationController.php @@ -8,7 +8,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Core; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\FieldMetadata; use PhpMyAdmin\Gis\GisVisualization; diff --git a/src/Controllers/Table/ImportController.php b/src/Controllers/Table/ImportController.php index b3ca3de045..9a27be545e 100644 --- a/src/Controllers/Table/ImportController.php +++ b/src/Controllers/Table/ImportController.php @@ -9,7 +9,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\Config\PageSettings; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Encoding; use PhpMyAdmin\Http\Response; diff --git a/src/Controllers/Table/IndexRenameController.php b/src/Controllers/Table/IndexRenameController.php index b08e465e37..ce025c3d3d 100644 --- a/src/Controllers/Table/IndexRenameController.php +++ b/src/Controllers/Table/IndexRenameController.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Controllers\Table; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\Response; diff --git a/src/Controllers/Table/IndexesController.php b/src/Controllers/Table/IndexesController.php index 051a761ee5..395ed28c7d 100644 --- a/src/Controllers/Table/IndexesController.php +++ b/src/Controllers/Table/IndexesController.php @@ -8,7 +8,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\Container\ContainerBuilder; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\Response; diff --git a/src/Controllers/Table/PrivilegesController.php b/src/Controllers/Table/PrivilegesController.php index 98de2083b0..d80fc0bafb 100644 --- a/src/Controllers/Table/PrivilegesController.php +++ b/src/Controllers/Table/PrivilegesController.php @@ -9,7 +9,7 @@ namespace PhpMyAdmin\Controllers\Table; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\InvocableController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Identifiers\DatabaseName; diff --git a/src/Controllers/Table/RelationController.php b/src/Controllers/Table/RelationController.php index 41a5c52094..f58ba3ec33 100644 --- a/src/Controllers/Table/RelationController.php +++ b/src/Controllers/Table/RelationController.php @@ -11,7 +11,7 @@ use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Core; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; diff --git a/src/Controllers/Table/ReplaceController.php b/src/Controllers/Table/ReplaceController.php index b79664c01d..9bee202bf5 100644 --- a/src/Controllers/Table/ReplaceController.php +++ b/src/Controllers/Table/ReplaceController.php @@ -11,7 +11,7 @@ use PhpMyAdmin\Controllers\Sql\SqlController; use PhpMyAdmin\Controllers\Table\SqlController as TableSqlController; use PhpMyAdmin\Core; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\EditField; use PhpMyAdmin\File; use PhpMyAdmin\Html\Generator; diff --git a/src/Controllers/Table/SearchController.php b/src/Controllers/Table/SearchController.php index 2dcbc82505..29363913ef 100644 --- a/src/Controllers/Table/SearchController.php +++ b/src/Controllers/Table/SearchController.php @@ -10,7 +10,7 @@ use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationCleanup; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; diff --git a/src/Controllers/Table/Structure/ChangeController.php b/src/Controllers/Table/Structure/ChangeController.php index 133deeec94..ff82c385a7 100644 --- a/src/Controllers/Table/Structure/ChangeController.php +++ b/src/Controllers/Table/Structure/ChangeController.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Controllers\Table\Structure; use PhpMyAdmin\ColumnFull; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; diff --git a/src/Controllers/Table/Structure/MoveColumnsController.php b/src/Controllers/Table/Structure/MoveColumnsController.php index 6ba3879cbb..b4c486d42e 100644 --- a/src/Controllers/Table/Structure/MoveColumnsController.php +++ b/src/Controllers/Table/Structure/MoveColumnsController.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Controllers\Table\Structure; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; diff --git a/src/Controllers/Table/Structure/PartitioningController.php b/src/Controllers/Table/Structure/PartitioningController.php index 3cfb8c51bf..8056aef8ff 100644 --- a/src/Controllers/Table/Structure/PartitioningController.php +++ b/src/Controllers/Table/Structure/PartitioningController.php @@ -9,7 +9,7 @@ use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Controllers\Table\StructureController; use PhpMyAdmin\CreateAddField; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; diff --git a/src/Controllers/Table/Structure/PrimaryController.php b/src/Controllers/Table/Structure/PrimaryController.php index ddc171e877..15f680c68c 100644 --- a/src/Controllers/Table/Structure/PrimaryController.php +++ b/src/Controllers/Table/Structure/PrimaryController.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Controllers\Table\Structure; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Controllers\Table\StructureController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; diff --git a/src/Controllers/Table/Structure/SaveController.php b/src/Controllers/Table/Structure/SaveController.php index c1acd23dbc..cca60c9660 100644 --- a/src/Controllers/Table/Structure/SaveController.php +++ b/src/Controllers/Table/Structure/SaveController.php @@ -10,7 +10,7 @@ use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Controllers\Table\StructureController; use PhpMyAdmin\Core; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; diff --git a/src/Controllers/Table/StructureController.php b/src/Controllers/Table/StructureController.php index 2868e6cf0c..e8ee0a5364 100644 --- a/src/Controllers/Table/StructureController.php +++ b/src/Controllers/Table/StructureController.php @@ -14,7 +14,7 @@ use PhpMyAdmin\ConfigStorage\RelationParameters; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; use PhpMyAdmin\Database\CentralColumns; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Engines\Innodb; use PhpMyAdmin\Html\Generator; diff --git a/src/Controllers/Table/ZoomSearchController.php b/src/Controllers/Table/ZoomSearchController.php index f3f6d8cdd3..3a0b175c2b 100644 --- a/src/Controllers/Table/ZoomSearchController.php +++ b/src/Controllers/Table/ZoomSearchController.php @@ -9,7 +9,7 @@ use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Core; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; diff --git a/src/Controllers/TableController.php b/src/Controllers/TableController.php index 0bb49f30af..6fd75adcfc 100644 --- a/src/Controllers/TableController.php +++ b/src/Controllers/TableController.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; diff --git a/src/Controllers/Transformation/WrapperController.php b/src/Controllers/Transformation/WrapperController.php index 4f9e682e32..721ac80c57 100644 --- a/src/Controllers/Transformation/WrapperController.php +++ b/src/Controllers/Transformation/WrapperController.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Controllers\Transformation; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Core; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Http\Factory\ResponseFactory; use PhpMyAdmin\Http\Response; diff --git a/src/Controllers/Triggers/IndexController.php b/src/Controllers/Triggers/IndexController.php index 3ef30a18ba..4ee5e0d6ed 100644 --- a/src/Controllers/Triggers/IndexController.php +++ b/src/Controllers/Triggers/IndexController.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Controllers\Triggers; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; diff --git a/src/Controllers/UserPasswordController.php b/src/Controllers/UserPasswordController.php index b340fb12ed..b5d73bc4b8 100644 --- a/src/Controllers/UserPasswordController.php +++ b/src/Controllers/UserPasswordController.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers; use PhpMyAdmin\Config; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; diff --git a/src/Controllers/View/CreateController.php b/src/Controllers/View/CreateController.php index 4cc34ac845..19a92d7867 100644 --- a/src/Controllers/View/CreateController.php +++ b/src/Controllers/View/CreateController.php @@ -8,7 +8,7 @@ use PhpMyAdmin\Container\ContainerBuilder; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Controllers\Table\StructureController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\Response; diff --git a/src/CreateAddField.php b/src/CreateAddField.php index a576ba4c53..6f27713395 100644 --- a/src/CreateAddField.php +++ b/src/CreateAddField.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Table\Table; diff --git a/src/Database/CentralColumns.php b/src/Database/CentralColumns.php index 9fcd94e2d6..9be1c7c024 100644 --- a/src/Database/CentralColumns.php +++ b/src/Database/CentralColumns.php @@ -8,8 +8,8 @@ use PhpMyAdmin\Charsets; use PhpMyAdmin\ColumnFull; use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Message; use PhpMyAdmin\Template; diff --git a/src/Database/Designer.php b/src/Database/Designer.php index 54462d8964..d676516157 100644 --- a/src/Database/Designer.php +++ b/src/Database/Designer.php @@ -9,7 +9,7 @@ use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Current; use PhpMyAdmin\Database\Designer\ColumnInfo; use PhpMyAdmin\Database\Designer\DesignerTable; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Message; use PhpMyAdmin\Plugins; use PhpMyAdmin\Template; diff --git a/src/Database/Designer/Common.php b/src/Database/Designer/Common.php index b56ccdb77e..3ff847d56e 100644 --- a/src/Database/Designer/Common.php +++ b/src/Database/Designer/Common.php @@ -7,8 +7,8 @@ namespace PhpMyAdmin\Database\Designer; use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Index; use PhpMyAdmin\Query\Generator as QueryGenerator; use PhpMyAdmin\Table\Table; diff --git a/src/Database/Events.php b/src/Database/Events.php index bfacccc5a9..06c78c83b7 100644 --- a/src/Database/Events.php +++ b/src/Database/Events.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Database; use PhpMyAdmin\Config; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Message; use PhpMyAdmin\Query\Generator as QueryGenerator; diff --git a/src/Database/MultiTableQuery.php b/src/Database/MultiTableQuery.php index 278269b24e..727c5f88f1 100644 --- a/src/Database/MultiTableQuery.php +++ b/src/Database/MultiTableQuery.php @@ -11,7 +11,7 @@ use PhpMyAdmin\Bookmarks\BookmarkRepository; use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationCleanup; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\ParseAnalyze; use PhpMyAdmin\Sql; use PhpMyAdmin\Template; diff --git a/src/Database/Routines.php b/src/Database/Routines.php index 348b4f91ef..103310c85f 100644 --- a/src/Database/Routines.php +++ b/src/Database/Routines.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Database; use PhpMyAdmin\Charsets; use PhpMyAdmin\Config; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Message; use PhpMyAdmin\Query\Generator as QueryGenerator; diff --git a/src/Database/Search.php b/src/Database/Search.php index 3eb57ef527..e6f5c0a4bc 100644 --- a/src/Database/Search.php +++ b/src/Database/Search.php @@ -8,7 +8,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Database; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Template; use PhpMyAdmin\Util; diff --git a/src/DbTableExists.php b/src/DbTableExists.php index 7b321630cf..51eac9f521 100644 --- a/src/DbTableExists.php +++ b/src/DbTableExists.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Identifiers\TableName; diff --git a/src/DatabaseInterface.php b/src/Dbal/DatabaseInterface.php similarity index 99% rename from src/DatabaseInterface.php rename to src/Dbal/DatabaseInterface.php index 75795d855a..008e116932 100644 --- a/src/DatabaseInterface.php +++ b/src/Dbal/DatabaseInterface.php @@ -2,30 +2,32 @@ declare(strict_types=1); -namespace PhpMyAdmin; +namespace PhpMyAdmin\Dbal; +use PhpMyAdmin\Column; +use PhpMyAdmin\ColumnFull; +use PhpMyAdmin\Config; use PhpMyAdmin\Config\Settings\Server; -use PhpMyAdmin\Dbal\Connection; -use PhpMyAdmin\Dbal\ConnectionException; -use PhpMyAdmin\Dbal\ConnectionType; -use PhpMyAdmin\Dbal\DbalInterface; -use PhpMyAdmin\Dbal\DbiExtension; -use PhpMyAdmin\Dbal\DbiMysqli; -use PhpMyAdmin\Dbal\ResultInterface; -use PhpMyAdmin\Dbal\Statement; -use PhpMyAdmin\Dbal\Warning; +use PhpMyAdmin\Current; use PhpMyAdmin\Error\ErrorHandler; +use PhpMyAdmin\FieldMetadata; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\I18n\LanguageManager; use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Index; +use PhpMyAdmin\ListDatabase; use PhpMyAdmin\Query\Cache; use PhpMyAdmin\Query\Compatibility; use PhpMyAdmin\Query\Generator as QueryGenerator; use PhpMyAdmin\Query\Utilities; use PhpMyAdmin\Routing\Routing; use PhpMyAdmin\SqlParser\Context; +use PhpMyAdmin\StorageEngine; use PhpMyAdmin\Table\Table; use PhpMyAdmin\Tracking\Tracker; +use PhpMyAdmin\Types; +use PhpMyAdmin\UserPrivilegesFactory; +use PhpMyAdmin\Util; use PhpMyAdmin\Utils\SessionCache; use stdClass; @@ -77,7 +79,7 @@ use const SORT_DESC; /** * Main interface for database interactions */ -class DatabaseInterface implements DbalInterface +class DatabaseInterface { public static self|null $instance = null; @@ -96,6 +98,9 @@ class DatabaseInterface implements DbalInterface */ public const GETVAR_GLOBAL = 2; + public const FETCH_NUM = 'NUM'; + public const FETCH_ASSOC = 'ASSOC'; + /** * Opened database connections. * @@ -1067,13 +1072,13 @@ class DatabaseInterface implements DbalInterface string $var, string $value, ConnectionType $connectionType = ConnectionType::User, - ): bool { + ): void { $currentValue = $this->getVariable($var, self::GETVAR_SESSION, $connectionType); if ($currentValue == $value) { - return true; + return; } - return (bool) $this->query('SET ' . $var . ' = ' . $value . ';', $connectionType); + $this->query('SET ' . $var . ' = ' . $value . ';', $connectionType); } public function getDefaultCharset(): string @@ -1215,7 +1220,7 @@ class DatabaseInterface implements DbalInterface */ public function fetchSingleRow( string $query, - string $type = DbalInterface::FETCH_ASSOC, + string $type = self::FETCH_ASSOC, ConnectionType $connectionType = ConnectionType::User, ): array { $result = $this->tryQuery($query, $connectionType, cacheAffectedRows: false); diff --git a/src/Dbal/DbalInterface.php b/src/Dbal/DbalInterface.php deleted file mode 100644 index dd818ec85d..0000000000 --- a/src/Dbal/DbalInterface.php +++ /dev/null @@ -1,584 +0,0 @@ - tables names - */ - public function getTables(string $database, ConnectionType $connectionType = ConnectionType::User): array; - - /** - * returns array of all tables in given db or dbs - * this function expects unquoted names: - * RIGHT: my_database - * WRONG: `my_database` - * WRONG: my\_database - * if $tbl_is_group is true, $table is used as filter for table names - * - * - * $dbi->getTablesFull('my_database'); - * $dbi->getTablesFull('my_database', 'my_table')); - * $dbi->getTablesFull('my_database', 'my_tables_', true)); - * - * - * @param string $database database - * @param string|mixed[] $table table name(s) - * @param bool $tableIsGroup $table is a table group - * @param int $limitOffset zero-based offset for the count - * @param bool|int $limitCount number of tables to return - * @param string $sortBy table attribute to sort by - * @param string $sortOrder direction to sort (ASC or DESC) - * @param string|null $tableType whether table or view - * - * @return mixed[] list of tables in given db(s) - * - * @todo move into Table - */ - public function getTablesFull( - string $database, - string|array $table = '', - bool $tableIsGroup = false, - int $limitOffset = 0, - bool|int $limitCount = false, - string $sortBy = 'Name', - string $sortOrder = 'ASC', - string|null $tableType = null, - ConnectionType $connectionType = ConnectionType::User, - ): array; - - /** - * returns array with databases containing extended infos about them - * - * @param string|null $database database - * @param bool $forceStats retrieve stats also for MySQL < 5 - * @param string $sortBy column to order by - * @param string $sortOrder ASC or DESC - * @param int $limitOffset starting offset for LIMIT - * @param bool|int $limitCount row count for LIMIT or true for $cfg['MaxDbList'] - * - * @return mixed[] - * - * @todo move into ListDatabase? - */ - public function getDatabasesFull( - string|null $database = null, - bool $forceStats = false, - ConnectionType $connectionType = ConnectionType::User, - string $sortBy = 'SCHEMA_NAME', - string $sortOrder = 'ASC', - int $limitOffset = 0, - bool|int $limitCount = false, - ): array; - - /** - * returns detailed array with all columns for given table in database, - * or all tables/databases - * - * @param string|null $database name of database - * @param string|null $table name of table to retrieve columns from - * @param string|null $column name of specific column - * - * @return mixed[] - */ - public function getColumnsFull( - string|null $database = null, - string|null $table = null, - string|null $column = null, - ConnectionType $connectionType = ConnectionType::User, - ): array; - - /** - * Returns description of a $column in given table - * - * @param string $database name of database - * @param string $table name of table to retrieve columns from - * @param string $column name of column - * @param T $full whether to return full info or only column names - * - * @psalm-return (T is true ? ColumnFull : Column)|null - * - * @template T of bool - */ - public function getColumn( - string $database, - string $table, - string $column, - bool $full = false, - ConnectionType $connectionType = ConnectionType::User, - ): ColumnFull|Column|null; - - /** - * Returns descriptions of columns in given table - * - * @param string $database name of database - * @param string $table name of table to retrieve columns from - * @param T $full whether to return full info or only column names - * - * @return ColumnFull[]|Column[] - * @psalm-return (T is true ? ColumnFull[] : Column[]) - * - * @template T of bool - */ - public function getColumns( - string $database, - string $table, - bool $full = false, - ConnectionType $connectionType = ConnectionType::User, - ): array; - - /** - * Returns all column names in given table - * - * @param string $database name of database - * @param string $table name of table to retrieve columns from - * - * @return list - */ - public function getColumnNames( - string $database, - string $table, - ConnectionType $connectionType = ConnectionType::User, - ): array; - - /** - * Returns indexes of a table - * - * @param string $database name of database - * @param string $table name of the table whose indexes are to be retrieved - * - * @return array> - * @psalm-return array - */ - public function getTableIndexes( - string $database, - string $table, - ConnectionType $connectionType = ConnectionType::User, - ): array; - - /** - * returns value of given mysql server variable - * - * @param string $var mysql server variable name - * @param int $type DatabaseInterface::GETVAR_SESSION | DatabaseInterface::GETVAR_GLOBAL - * - * @return false|string|null value for mysql server variable - */ - public function getVariable( - string $var, - int $type = DatabaseInterface::GETVAR_SESSION, - ConnectionType $connectionType = ConnectionType::User, - ): false|string|null; - - /** - * Sets new value for a variable if it is different from the current value - * - * @param string $var variable name - * @param string $value value to set - */ - public function setVariable( - string $var, - string $value, - ConnectionType $connectionType = ConnectionType::User, - ): bool; - - /** - * Function called just after a connection to the MySQL database server has - * been established. It sets the connection collation, and determines the - * version of MySQL which is running. - */ - public function postConnect(Server $currentServer): void; - - /** - * Sets collation connection for user link - * - * @param string $collation collation to set - */ - public function setCollation(string $collation): void; - - /** - * returns a single value from the given result or query, - * if the query or the result has more than one row or field - * the first field of the first row is returned - * - * - * $sql = 'SELECT `name` FROM `user` WHERE `id` = 123'; - * $user_name = $dbi->fetchValue($sql); - * // produces - * // $user_name = 'John Doe' - * - * - * @param string $query The query to execute - * @param int|string $field field to fetch the value from, starting at 0, with 0 being default - * - * @return string|false|null value of first field in first row from result - * or false if not found - */ - public function fetchValue( - string $query, - int|string $field = 0, - ConnectionType $connectionType = ConnectionType::User, - ): string|false|null; - - /** - * Returns only the first row from the result or null if result is empty. - * - * - * $sql = 'SELECT * FROM `user` WHERE `id` = 123'; - * $user = $dbi->fetchSingleRow($sql); - * // produces - * // $user = array('id' => 123, 'name' => 'John Doe') - * - * - * @param string $query The query to execute - * @param string $type NUM|ASSOC returned array should either numeric associative or both - * @psalm-param self::FETCH_NUM|self::FETCH_ASSOC $type - * - * @return array - */ - public function fetchSingleRow( - string $query, - string $type = DbalInterface::FETCH_ASSOC, - ConnectionType $connectionType = ConnectionType::User, - ): array; - - /** - * returns all rows in the resultset in one array - * - * - * $sql = 'SELECT * FROM `user`'; - * $users = $dbi->fetchResult($sql); - * // produces - * // $users[] = array('id' => 123, 'name' => 'John Doe') - * - * $sql = 'SELECT `id`, `name` FROM `user`'; - * $users = $dbi->fetchResult($sql, 'id'); - * // produces - * // $users['123'] = array('id' => 123, 'name' => 'John Doe') - * - * $sql = 'SELECT `id`, `name` FROM `user`'; - * $users = $dbi->fetchResult($sql, 0); - * // produces - * // $users['123'] = array(0 => 123, 1 => 'John Doe') - * - * $sql = 'SELECT `id`, `name` FROM `user`'; - * $users = $dbi->fetchResult($sql, 'id', 'name'); - * // or - * $users = $dbi->fetchResult($sql, 0, 1); - * // produces - * // $users['123'] = 'John Doe' - * - * $sql = 'SELECT `name` FROM `user`'; - * $users = $dbi->fetchResult($sql); - * // produces - * // $users[] = 'John Doe' - * - * $sql = 'SELECT `group`, `name` FROM `user`' - * $users = $dbi->fetchResult($sql, array('group', null), 'name'); - * // produces - * // $users['admin'][] = 'John Doe' - * - * $sql = 'SELECT `group`, `name` FROM `user`' - * $users = $dbi->fetchResult($sql, array('group', 'name'), 'id'); - * // produces - * // $users['admin']['John Doe'] = '123' - * - * - * @param string $query query to execute - * @param string|int|mixed[] $key field-name or offset used as key for array or array of those - * @param string|int|null $value value-name or offset used as value for array - * - * @return mixed[] resultrows or values indexed by $key - */ - public function fetchResult( - string $query, - string|int|array $key, - string|int|null $value = null, - ConnectionType $connectionType = ConnectionType::User, - ): array; - - /** - * Get supported SQL compatibility modes - * - * @return string[] supported SQL compatibility modes - */ - public function getCompatibilities(): array; - - /** - * returns warnings for last query - * - * @return Warning[] warnings - */ - public function getWarnings(ConnectionType $connectionType = ConnectionType::User): array; - - /** - * gets the current user with host - * - * @return string the current user i.e. user@host - */ - public function getCurrentUser(): string; - - /** - * Checks if current user is superuser - */ - public function isSuperUser(): bool; - - public function isGrantUser(): bool; - - public function isCreateUser(): bool; - - public function isConnected(): bool; - - /** - * Get the current user and host - * - * @return array array of username and hostname - */ - public function getCurrentUserAndHost(): array; - - /** - * Returns value for lower_case_table_names variable - * - * @see https://mariadb.com/kb/en/server-system-variables/#lower_case_table_names - * @see https://dev.mysql.com/doc/refman/en/server-system-variables.html#sysvar_lower_case_table_names - * - * @psalm-return 0|1|2 - */ - public function getLowerCaseNames(): int; - - /** - * Connects to the database server. - * - * @param ConnectionType|null $target How to store connection link, defaults to $connectionType - */ - public function connect( - Server $currentServer, - ConnectionType $connectionType, - ConnectionType|null $target = null, - ): Connection|null; - - /** - * selects given database - * - * @param string|DatabaseName $dbname database name to select - */ - public function selectDb(string|DatabaseName $dbname, ConnectionType $connectionType = ConnectionType::User): bool; - - /** - * Prepare next result from multi_query - */ - public function nextResult(ConnectionType $connectionType = ConnectionType::User): ResultInterface|false; - - /** - * Returns a string representing the type of connection used - * - * @return string|bool type of connection used - */ - public function getHostInfo(ConnectionType $connectionType = ConnectionType::User): string|bool; - - /** - * returns a string that represents the client library version - * - * @return string MySQL client library version - */ - public function getClientInfo(): string; - - /** - * Returns last error message or an empty string if no errors occurred. - */ - public function getError(ConnectionType $connectionType = ConnectionType::User): string; - - /** - * returns the number of rows returned by last query - * used with tryQuery as it accepts false - * - * @param string $query query to run - * - * @psalm-return int|numeric-string - */ - public function queryAndGetNumRows(string $query): string|int; - - /** - * returns last inserted auto_increment id for given $link - */ - public function insertId(ConnectionType $connectionType = ConnectionType::User): int; - - /** - * returns the number of rows affected by last query - * - * @param bool $getFromCache whether to retrieve from cache - * - * @psalm-return int|numeric-string - */ - public function affectedRows( - ConnectionType $connectionType = ConnectionType::User, - bool $getFromCache = true, - ): int|string; - - /** - * returns metainfo for fields in $result - * - * @param ResultInterface $result result set identifier - * - * @return FieldMetadata[] meta info for fields in $result - */ - public function getFieldsMeta(ResultInterface $result): array; - - /** - * Returns properly quoted string for use in MySQL queries. - * - * @param string $str string to be quoted - * - * @psalm-return non-empty-string - * - * @psalm-taint-escape sql - */ - public function quoteString(string $str, ConnectionType $connectionType = ConnectionType::User): string; - - /** - * Returns properly escaped string for use in MySQL LIKE clauses. - * This method escapes only _, %, and /. It does not escape quotes or any other characters. - * - * @param string $str string to be escaped - * - * @return string a MySQL escaped LIKE string - */ - public function escapeMysqlWildcards(string $str): string; - - /** - * Checks if this database server is running on Amazon RDS. - */ - public function isAmazonRds(): bool; - - /** - * Gets SQL for killing a process. - * - * @param int $process Process ID - */ - public function getKillQuery(int $process): string; - - /** - * Get a table with database name and table name - * - * @param string $dbName DB name - * @param string $tableName Table name - */ - public function getTable(string $dbName, string $tableName): Table; - - /** - * returns collation of given db - * - * @param string $db name of db - * - * @return string collation of $db - */ - public function getDbCollation(string $db): string; - - /** - * returns default server collation from show variables - */ - public function getServerCollation(): string; - - /** - * Server version as number - */ - public function getVersion(): int; - - /** - * Server version - */ - public function getVersionString(): string; - - /** - * Server version comment - */ - public function getVersionComment(): string; - - /** Whether connection is MySQL */ - public function isMySql(): bool; - - /** - * Whether connection is MariaDB - */ - public function isMariaDB(): bool; - - /** - * Whether connection is Percona - */ - public function isPercona(): bool; - - /** - * Prepare an SQL statement for execution. - * - * @param string $query The query, as a string. - */ - public function prepare(string $query, ConnectionType $connectionType = ConnectionType::User): Statement|null; -} diff --git a/src/Display/Results.php b/src/Display/Results.php index 2576c5e03f..367cde5537 100644 --- a/src/Display/Results.php +++ b/src/Display/Results.php @@ -10,7 +10,7 @@ use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Container\ContainerBuilder; use PhpMyAdmin\Core; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Dbal\ResultInterface; use PhpMyAdmin\FieldMetadata; use PhpMyAdmin\Html\Generator; @@ -23,7 +23,6 @@ use PhpMyAdmin\Plugins\Transformations\Output\Text_Plain_Sql; use PhpMyAdmin\Plugins\Transformations\Text_Plain_Link; use PhpMyAdmin\Plugins\TransformationsInterface; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Sql; use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Statements\SelectStatement; use PhpMyAdmin\SqlParser\Utils\Query; diff --git a/src/Engines/Innodb.php b/src/Engines/Innodb.php index 42d6aa05b5..7b1a538196 100644 --- a/src/Engines/Innodb.php +++ b/src/Engines/Innodb.php @@ -7,7 +7,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Engines; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\StorageEngine; use PhpMyAdmin\Util; diff --git a/src/Export/Export.php b/src/Export/Export.php index 6f00963889..b5f0e8d9a3 100644 --- a/src/Export/Export.php +++ b/src/Export/Export.php @@ -9,7 +9,7 @@ namespace PhpMyAdmin\Export; use PhpMyAdmin\Config; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Encoding; use PhpMyAdmin\Exceptions\ExportException; use PhpMyAdmin\FlashMessenger; diff --git a/src/Export/Options.php b/src/Export/Options.php index 9b442e6bfe..60001ea15d 100644 --- a/src/Export/Options.php +++ b/src/Export/Options.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Export; use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Core; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Encoding; use PhpMyAdmin\Plugins; use PhpMyAdmin\Plugins\ExportPlugin; diff --git a/src/Export/TemplateModel.php b/src/Export/TemplateModel.php index e64ebe503d..c9630c4c76 100644 --- a/src/Export/TemplateModel.php +++ b/src/Export/TemplateModel.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Export; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Plugins\ExportType; diff --git a/src/Favorites/RecentFavoriteTables.php b/src/Favorites/RecentFavoriteTables.php index 66abdb86df..f452cbb27f 100644 --- a/src/Favorites/RecentFavoriteTables.php +++ b/src/Favorites/RecentFavoriteTables.php @@ -10,8 +10,8 @@ namespace PhpMyAdmin\Favorites; use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Message; use PhpMyAdmin\Template; diff --git a/src/Gis/GisVisualization.php b/src/Gis/GisVisualization.php index 815a692da0..049200b14c 100644 --- a/src/Gis/GisVisualization.php +++ b/src/Gis/GisVisualization.php @@ -9,7 +9,7 @@ namespace PhpMyAdmin\Gis; use PhpMyAdmin\Config; use PhpMyAdmin\Core; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Gis\Ds\Extent; use PhpMyAdmin\Gis\Ds\ScaleData; use PhpMyAdmin\Image\ImageWrapper; diff --git a/src/Header.php b/src/Header.php index 9db308f9a2..67dac9c7c4 100644 --- a/src/Header.php +++ b/src/Header.php @@ -9,6 +9,7 @@ namespace PhpMyAdmin; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Container\ContainerBuilder; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\I18n\LanguageManager; use PhpMyAdmin\Navigation\Navigation; diff --git a/src/Html/Generator.php b/src/Html/Generator.php index d4cdb53f32..a2a69d26e2 100644 --- a/src/Html/Generator.php +++ b/src/Html/Generator.php @@ -10,7 +10,7 @@ namespace PhpMyAdmin\Html; use PhpMyAdmin\Config; use PhpMyAdmin\Core; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Message; use PhpMyAdmin\MessageType; use PhpMyAdmin\Profiling; diff --git a/src/Http/Middleware/Authentication.php b/src/Http/Middleware/Authentication.php index 50b54d582a..f7f10de54a 100644 --- a/src/Http/Middleware/Authentication.php +++ b/src/Http/Middleware/Authentication.php @@ -9,8 +9,8 @@ use PhpMyAdmin\Config; use PhpMyAdmin\Config\Settings\Server; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Container\ContainerBuilder; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Exceptions\AuthenticationFailure; use PhpMyAdmin\Exceptions\AuthenticationPluginException; use PhpMyAdmin\Exceptions\ExitException; diff --git a/src/Http/Middleware/DatabaseServerVersionChecking.php b/src/Http/Middleware/DatabaseServerVersionChecking.php index 716293ff14..ac52afaa75 100644 --- a/src/Http/Middleware/DatabaseServerVersionChecking.php +++ b/src/Http/Middleware/DatabaseServerVersionChecking.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Http\Middleware; use Fig\Http\Message\StatusCodeInterface; use PhpMyAdmin\Config; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Factory\ResponseFactory; use PhpMyAdmin\Template; use Psr\Http\Message\ResponseInterface; diff --git a/src/Http/Middleware/ProfilingChecking.php b/src/Http/Middleware/ProfilingChecking.php index 00eb73f9eb..a56a390381 100644 --- a/src/Http/Middleware/ProfilingChecking.php +++ b/src/Http/Middleware/ProfilingChecking.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Http\Middleware; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Profiling; use PhpMyAdmin\ResponseRenderer; use Psr\Http\Message\ResponseInterface; diff --git a/src/Http/Middleware/StatementHistory.php b/src/Http/Middleware/StatementHistory.php index 9c6f348bdd..908fe9817e 100644 --- a/src/Http/Middleware/StatementHistory.php +++ b/src/Http/Middleware/StatementHistory.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Http\Middleware; use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; diff --git a/src/Import/Import.php b/src/Import/Import.php index 2ea8e1a521..13a212cb7f 100644 --- a/src/Import/Import.php +++ b/src/Import/Import.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Import; use PhpMyAdmin\Config; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Encoding; use PhpMyAdmin\File; use PhpMyAdmin\FileListing; diff --git a/src/Import/SimulateDml.php b/src/Import/SimulateDml.php index 125f93cbb3..cb9358007d 100644 --- a/src/Import/SimulateDml.php +++ b/src/Import/SimulateDml.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Import; use PhpMyAdmin\Core; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Html; use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Statements\DeleteStatement; diff --git a/src/Index.php b/src/Index.php index df67437c86..a3acd21640 100644 --- a/src/Index.php +++ b/src/Index.php @@ -4,6 +4,8 @@ declare(strict_types=1); namespace PhpMyAdmin; +use PhpMyAdmin\Dbal\DatabaseInterface; + use function __; use function array_pop; use function count; diff --git a/src/InsertEdit.php b/src/InsertEdit.php index 8a138007dd..b32b430020 100644 --- a/src/InsertEdit.php +++ b/src/InsertEdit.php @@ -5,6 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin; use PhpMyAdmin\ConfigStorage\Relation; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Dbal\ResultInterface; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\I18n\LanguageManager; diff --git a/src/ListDatabase.php b/src/ListDatabase.php index 4ace28377e..6aff93a311 100644 --- a/src/ListDatabase.php +++ b/src/ListDatabase.php @@ -5,6 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin; use ArrayObject; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Query\Utilities; use function array_merge; diff --git a/src/Menu.php b/src/Menu.php index ee76af24f3..0db08c8dbf 100644 --- a/src/Menu.php +++ b/src/Menu.php @@ -7,6 +7,7 @@ namespace PhpMyAdmin; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\UserGroupLevel; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Query\Utilities; use PhpMyAdmin\Routing\Routing; use PhpMyAdmin\Tracking\Tracker; diff --git a/src/Navigation/Navigation.php b/src/Navigation/Navigation.php index 067c7974ce..81a9be561d 100644 --- a/src/Navigation/Navigation.php +++ b/src/Navigation/Navigation.php @@ -13,8 +13,8 @@ use PhpMyAdmin\Config\PageSettings; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Container\ContainerBuilder; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Sanitize; use PhpMyAdmin\Server\Select; diff --git a/src/Navigation/NavigationTree.php b/src/Navigation/NavigationTree.php index 8620f2d189..3ed6777a1a 100644 --- a/src/Navigation/NavigationTree.php +++ b/src/Navigation/NavigationTree.php @@ -11,7 +11,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationParameters; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Favorites\RecentFavoriteTables; use PhpMyAdmin\Favorites\TableType; use PhpMyAdmin\Html\Generator; diff --git a/src/Navigation/Nodes/Node.php b/src/Navigation/Nodes/Node.php index 2170141069..8e03d0c7db 100644 --- a/src/Navigation/Nodes/Node.php +++ b/src/Navigation/Nodes/Node.php @@ -10,8 +10,8 @@ namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Features\NavigationItemsHidingFeature; use PhpMyAdmin\ConfigStorage\RelationParameters; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Navigation\NodeType; use PhpMyAdmin\UserPrivileges; diff --git a/src/Navigation/Nodes/NodeDatabase.php b/src/Navigation/Nodes/NodeDatabase.php index 4bf61de8c2..a08c054c59 100644 --- a/src/Navigation/Nodes/NodeDatabase.php +++ b/src/Navigation/Nodes/NodeDatabase.php @@ -10,8 +10,8 @@ namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Features\NavigationItemsHidingFeature; use PhpMyAdmin\ConfigStorage\RelationParameters; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Dbal\ResultInterface; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Url; diff --git a/src/Navigation/Nodes/NodeDatabaseContainer.php b/src/Navigation/Nodes/NodeDatabaseContainer.php index f513226699..972ecac65d 100644 --- a/src/Navigation/Nodes/NodeDatabaseContainer.php +++ b/src/Navigation/Nodes/NodeDatabaseContainer.php @@ -8,7 +8,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Config; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Navigation\NodeType; use PhpMyAdmin\UserPrivilegesFactory; diff --git a/src/Navigation/Nodes/NodeTable.php b/src/Navigation/Nodes/NodeTable.php index 6e92dd1e2f..246baabe23 100644 --- a/src/Navigation/Nodes/NodeTable.php +++ b/src/Navigation/Nodes/NodeTable.php @@ -9,7 +9,7 @@ namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\RelationParameters; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Url; use PhpMyAdmin\UserPrivileges; use PhpMyAdmin\Util; diff --git a/src/Navigation/Nodes/ObjectFetcher.php b/src/Navigation/Nodes/ObjectFetcher.php index 84f2c21a4d..a61089ff19 100644 --- a/src/Navigation/Nodes/ObjectFetcher.php +++ b/src/Navigation/Nodes/ObjectFetcher.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Config; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Util; use function in_array; diff --git a/src/Normalization.php b/src/Normalization.php index 7b578eae22..74c4d58a6e 100644 --- a/src/Normalization.php +++ b/src/Normalization.php @@ -5,6 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin; use PhpMyAdmin\ConfigStorage\Relation; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Query\Compatibility; diff --git a/src/Operations.php b/src/Operations.php index abcc6dcad7..e7b255f707 100644 --- a/src/Operations.php +++ b/src/Operations.php @@ -7,6 +7,7 @@ namespace PhpMyAdmin; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Database\Events; use PhpMyAdmin\Database\Routines; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Engines\Innodb; use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Partitioning\Partition; diff --git a/src/Partitioning/Maintenance.php b/src/Partitioning/Maintenance.php index f83a8b58ac..a354033522 100644 --- a/src/Partitioning/Maintenance.php +++ b/src/Partitioning/Maintenance.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Partitioning; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Table\Table; diff --git a/src/Partitioning/Partition.php b/src/Partitioning/Partition.php index 1440b83073..991d9f8b73 100644 --- a/src/Partitioning/Partition.php +++ b/src/Partitioning/Partition.php @@ -7,7 +7,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Partitioning; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use function array_values; diff --git a/src/Plugins/Auth/AuthenticationConfig.php b/src/Plugins/Auth/AuthenticationConfig.php index 8bb09392cc..79a900b6b5 100644 --- a/src/Plugins/Auth/AuthenticationConfig.php +++ b/src/Plugins/Auth/AuthenticationConfig.php @@ -8,7 +8,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Auth; use PhpMyAdmin\Config; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Error\ErrorHandler; use PhpMyAdmin\Exceptions\AuthenticationFailure; use PhpMyAdmin\Html\Generator; diff --git a/src/Plugins/Auth/AuthenticationHttp.php b/src/Plugins/Auth/AuthenticationHttp.php index c120fdf4a8..13d7531712 100644 --- a/src/Plugins/Auth/AuthenticationHttp.php +++ b/src/Plugins/Auth/AuthenticationHttp.php @@ -11,7 +11,7 @@ namespace PhpMyAdmin\Plugins\Auth; use Fig\Http\Message\StatusCodeInterface; use PhpMyAdmin\Config; use PhpMyAdmin\Core; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Exceptions\AuthenticationFailure; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Message; diff --git a/src/Plugins/AuthenticationPlugin.php b/src/Plugins/AuthenticationPlugin.php index ceeccbdcdf..112362f25e 100644 --- a/src/Plugins/AuthenticationPlugin.php +++ b/src/Plugins/AuthenticationPlugin.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Plugins; use Exception; use PhpMyAdmin\Config; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Exceptions\AuthenticationFailure; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; diff --git a/src/Plugins/Export/ExportCodegen.php b/src/Plugins/Export/ExportCodegen.php index 25495bc590..506c69e48d 100644 --- a/src/Plugins/Export/ExportCodegen.php +++ b/src/Plugins/Export/ExportCodegen.php @@ -7,7 +7,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Export; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Export\StructureOrData; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Plugins\Export\Helpers\TableProperty; diff --git a/src/Plugins/Export/ExportCsv.php b/src/Plugins/Export/ExportCsv.php index b394d3fd02..6a042b2f17 100644 --- a/src/Plugins/Export/ExportCsv.php +++ b/src/Plugins/Export/ExportCsv.php @@ -7,8 +7,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Export; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Export\StructureOrData; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Plugins\ExportPlugin; diff --git a/src/Plugins/Export/ExportHtmlword.php b/src/Plugins/Export/ExportHtmlword.php index 4f0a57c0c6..308048a533 100644 --- a/src/Plugins/Export/ExportHtmlword.php +++ b/src/Plugins/Export/ExportHtmlword.php @@ -8,8 +8,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\Column; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Export\StructureOrData; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Plugins\ExportPlugin; diff --git a/src/Plugins/Export/ExportJson.php b/src/Plugins/Export/ExportJson.php index a9748f3958..3d8d582cc4 100644 --- a/src/Plugins/Export/ExportJson.php +++ b/src/Plugins/Export/ExportJson.php @@ -7,8 +7,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Export; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Export\StructureOrData; use PhpMyAdmin\FieldMetadata; use PhpMyAdmin\Http\ServerRequest; diff --git a/src/Plugins/Export/ExportLatex.php b/src/Plugins/Export/ExportLatex.php index 4062b42222..03dac63a16 100644 --- a/src/Plugins/Export/ExportLatex.php +++ b/src/Plugins/Export/ExportLatex.php @@ -9,8 +9,8 @@ namespace PhpMyAdmin\Plugins\Export; use DateTimeImmutable; use PhpMyAdmin\Config; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Export\StructureOrData; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Plugins\ExportPlugin; diff --git a/src/Plugins/Export/ExportMediawiki.php b/src/Plugins/Export/ExportMediawiki.php index 1661e2b31a..e318b056d1 100644 --- a/src/Plugins/Export/ExportMediawiki.php +++ b/src/Plugins/Export/ExportMediawiki.php @@ -7,8 +7,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Export; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Export\StructureOrData; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Plugins\ExportPlugin; diff --git a/src/Plugins/Export/ExportOds.php b/src/Plugins/Export/ExportOds.php index 4ad00fa7d4..3b9e0d77ab 100644 --- a/src/Plugins/Export/ExportOds.php +++ b/src/Plugins/Export/ExportOds.php @@ -7,8 +7,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Export; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Export\StructureOrData; use PhpMyAdmin\FieldMetadata; use PhpMyAdmin\Http\ServerRequest; diff --git a/src/Plugins/Export/ExportOdt.php b/src/Plugins/Export/ExportOdt.php index 1e667cc918..5a9d15e9d4 100644 --- a/src/Plugins/Export/ExportOdt.php +++ b/src/Plugins/Export/ExportOdt.php @@ -8,8 +8,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\Column; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Export\StructureOrData; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\OpenDocument; diff --git a/src/Plugins/Export/ExportPdf.php b/src/Plugins/Export/ExportPdf.php index bf7e2fc5d0..d2515c59b6 100644 --- a/src/Plugins/Export/ExportPdf.php +++ b/src/Plugins/Export/ExportPdf.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Export; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Export\StructureOrData; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Plugins\Export\Helpers\Pdf; diff --git a/src/Plugins/Export/ExportPhparray.php b/src/Plugins/Export/ExportPhparray.php index f106134215..9e7a80a378 100644 --- a/src/Plugins/Export/ExportPhparray.php +++ b/src/Plugins/Export/ExportPhparray.php @@ -7,8 +7,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Export; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Export\StructureOrData; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Plugins\ExportPlugin; diff --git a/src/Plugins/Export/ExportSql.php b/src/Plugins/Export/ExportSql.php index 1e6e5f6dd0..6ab710aafa 100644 --- a/src/Plugins/Export/ExportSql.php +++ b/src/Plugins/Export/ExportSql.php @@ -13,8 +13,8 @@ use PhpMyAdmin\Config; use PhpMyAdmin\Current; use PhpMyAdmin\Database\Events; use PhpMyAdmin\Database\Routines; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Export\StructureOrData; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Plugins\ExportPlugin; diff --git a/src/Plugins/Export/ExportTexytext.php b/src/Plugins/Export/ExportTexytext.php index 040c0b9676..f1512f07a9 100644 --- a/src/Plugins/Export/ExportTexytext.php +++ b/src/Plugins/Export/ExportTexytext.php @@ -8,8 +8,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\Column; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Export\StructureOrData; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Plugins\ExportPlugin; diff --git a/src/Plugins/Export/ExportXml.php b/src/Plugins/Export/ExportXml.php index b401613eb8..a78ba19212 100644 --- a/src/Plugins/Export/ExportXml.php +++ b/src/Plugins/Export/ExportXml.php @@ -9,8 +9,8 @@ use PhpMyAdmin\Config; use PhpMyAdmin\Current; use PhpMyAdmin\Database\Events; use PhpMyAdmin\Database\Routines; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Export\StructureOrData; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Plugins\ExportPlugin; diff --git a/src/Plugins/Export/ExportYaml.php b/src/Plugins/Export/ExportYaml.php index edee4faa22..c330eceb65 100644 --- a/src/Plugins/Export/ExportYaml.php +++ b/src/Plugins/Export/ExportYaml.php @@ -7,8 +7,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Export; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Export\StructureOrData; use PhpMyAdmin\FieldMetadata; use PhpMyAdmin\Http\ServerRequest; diff --git a/src/Plugins/Export/Helpers/Pdf.php b/src/Plugins/Export/Helpers/Pdf.php index c05582f4d4..75a95795f5 100644 --- a/src/Plugins/Export/Helpers/Pdf.php +++ b/src/Plugins/Export/Helpers/Pdf.php @@ -8,8 +8,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Export\Helpers; use PhpMyAdmin\ConfigStorage\Relation; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Dbal\ResultInterface; use PhpMyAdmin\FieldMetadata; use PhpMyAdmin\Pdf as PdfLib; diff --git a/src/Plugins/Import/ImportCsv.php b/src/Plugins/Import/ImportCsv.php index 11f9792118..fbe04dba81 100644 --- a/src/Plugins/Import/ImportCsv.php +++ b/src/Plugins/Import/ImportCsv.php @@ -10,7 +10,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Import; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\File; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\ServerRequest; diff --git a/src/Plugins/Import/ImportLdi.php b/src/Plugins/Import/ImportLdi.php index 22a0fb4bf0..146a4bc484 100644 --- a/src/Plugins/Import/ImportLdi.php +++ b/src/Plugins/Import/ImportLdi.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Plugins\Import; use PhpMyAdmin\Config; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\File; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Import\ImportSettings; diff --git a/src/Plugins/Import/ImportSql.php b/src/Plugins/Import/ImportSql.php index 557486e3b6..2d82622483 100644 --- a/src/Plugins/Import/ImportSql.php +++ b/src/Plugins/Import/ImportSql.php @@ -7,7 +7,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Import; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\File; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Import\ImportSettings; diff --git a/src/Plugins/Schema/ExportRelationSchema.php b/src/Plugins/Schema/ExportRelationSchema.php index 2de3704d6e..ac385868e9 100644 --- a/src/Plugins/Schema/ExportRelationSchema.php +++ b/src/Plugins/Schema/ExportRelationSchema.php @@ -10,7 +10,7 @@ namespace PhpMyAdmin\Plugins\Schema; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Url; diff --git a/src/Plugins/Schema/Pdf/Pdf.php b/src/Plugins/Schema/Pdf/Pdf.php index fc0647bdc9..f3df242b26 100644 --- a/src/Plugins/Schema/Pdf/Pdf.php +++ b/src/Plugins/Schema/Pdf/Pdf.php @@ -8,8 +8,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema\Pdf; use PhpMyAdmin\ConfigStorage\Relation; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Pdf as PdfLib; use PhpMyAdmin\Util; diff --git a/src/Plugins/Schema/Pdf/PdfRelationSchema.php b/src/Plugins/Schema/Pdf/PdfRelationSchema.php index 5b705c760c..835c926935 100644 --- a/src/Plugins/Schema/Pdf/PdfRelationSchema.php +++ b/src/Plugins/Schema/Pdf/PdfRelationSchema.php @@ -9,7 +9,7 @@ namespace PhpMyAdmin\Plugins\Schema\Pdf; use DateTimeImmutable; use PhpMyAdmin\ConfigStorage\Relation; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Pdf as PdfLib; use PhpMyAdmin\Plugins\Schema\ExportRelationSchema; diff --git a/src/Plugins/Schema/SchemaDia.php b/src/Plugins/Schema/SchemaDia.php index 40a95abc51..033732c45c 100644 --- a/src/Plugins/Schema/SchemaDia.php +++ b/src/Plugins/Schema/SchemaDia.php @@ -8,7 +8,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema; use PhpMyAdmin\ConfigStorage\Relation; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Plugins\Schema\Dia\DiaRelationSchema; use PhpMyAdmin\Plugins\SchemaPlugin; diff --git a/src/Plugins/Schema/SchemaEps.php b/src/Plugins/Schema/SchemaEps.php index 9fafd3ab77..121b0bb211 100644 --- a/src/Plugins/Schema/SchemaEps.php +++ b/src/Plugins/Schema/SchemaEps.php @@ -8,7 +8,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema; use PhpMyAdmin\ConfigStorage\Relation; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Plugins\Schema\Eps\EpsRelationSchema; use PhpMyAdmin\Plugins\SchemaPlugin; diff --git a/src/Plugins/Schema/SchemaPdf.php b/src/Plugins/Schema/SchemaPdf.php index ef59cf905d..d9fc0023b8 100644 --- a/src/Plugins/Schema/SchemaPdf.php +++ b/src/Plugins/Schema/SchemaPdf.php @@ -8,7 +8,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema; use PhpMyAdmin\ConfigStorage\Relation; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Plugins\Schema\Pdf\PdfRelationSchema; use PhpMyAdmin\Plugins\SchemaPlugin; diff --git a/src/Plugins/Schema/SchemaSvg.php b/src/Plugins/Schema/SchemaSvg.php index 9cc95f39f3..b748f2ac09 100644 --- a/src/Plugins/Schema/SchemaSvg.php +++ b/src/Plugins/Schema/SchemaSvg.php @@ -8,7 +8,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema; use PhpMyAdmin\ConfigStorage\Relation; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Plugins\Schema\Svg\SvgRelationSchema; use PhpMyAdmin\Plugins\SchemaPlugin; diff --git a/src/Plugins/Schema/TableStats.php b/src/Plugins/Schema/TableStats.php index 0d200098fc..e0cb4bf87d 100644 --- a/src/Plugins/Schema/TableStats.php +++ b/src/Plugins/Schema/TableStats.php @@ -8,7 +8,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema; use PhpMyAdmin\ConfigStorage\Relation; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Font; use PhpMyAdmin\Index; use PhpMyAdmin\ResponseRenderer; diff --git a/src/Profiling.php b/src/Profiling.php index 83a7ad86cc..4005096e9b 100644 --- a/src/Profiling.php +++ b/src/Profiling.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Utils\SessionCache; /** diff --git a/src/Query/Compatibility.php b/src/Query/Compatibility.php index fd8d714ee2..b0c170f057 100644 --- a/src/Query/Compatibility.php +++ b/src/Query/Compatibility.php @@ -4,8 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Query; -use PhpMyAdmin\DatabaseInterface; -use PhpMyAdmin\Dbal\DbalInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Util; use function array_keys; @@ -263,7 +262,7 @@ class Compatibility } /** @return non-empty-string */ - public static function getShowBinLogStatusStmt(DbalInterface $dbal): string + public static function getShowBinLogStatusStmt(DatabaseInterface $dbal): string { if ($dbal->isMySql() && $dbal->getVersion() >= 80200) { return 'SHOW BINARY LOG STATUS'; diff --git a/src/Replication/Replication.php b/src/Replication/Replication.php index 007383e3f8..49975a0bd6 100644 --- a/src/Replication/Replication.php +++ b/src/Replication/Replication.php @@ -6,9 +6,9 @@ namespace PhpMyAdmin\Replication; use PhpMyAdmin\Config\Settings\Server; use PhpMyAdmin\Core; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\Connection; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Dbal\ResultInterface; use PhpMyAdmin\Query\Compatibility; diff --git a/src/Replication/ReplicationGui.php b/src/Replication/ReplicationGui.php index e9de9a52ab..6683ee94c7 100644 --- a/src/Replication/ReplicationGui.php +++ b/src/Replication/ReplicationGui.php @@ -8,8 +8,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Replication; use PhpMyAdmin\Config; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Message; use PhpMyAdmin\Query\Utilities; use PhpMyAdmin\ResponseRenderer; diff --git a/src/Replication/ReplicationInfo.php b/src/Replication/ReplicationInfo.php index 7122aad4c6..0a2b433009 100644 --- a/src/Replication/ReplicationInfo.php +++ b/src/Replication/ReplicationInfo.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Replication; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Query\Compatibility; use PhpMyAdmin\UrlParams; diff --git a/src/ResponseRenderer.php b/src/ResponseRenderer.php index a190c60708..fae9101c2c 100644 --- a/src/ResponseRenderer.php +++ b/src/ResponseRenderer.php @@ -7,6 +7,7 @@ namespace PhpMyAdmin; use Fig\Http\Message\StatusCodeInterface; use PhpMyAdmin\Bookmarks\BookmarkRepository; use PhpMyAdmin\ConfigStorage\Relation; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Error\ErrorHandler; use PhpMyAdmin\Exceptions\ExitException; use PhpMyAdmin\Html\MySQLDocumentation; diff --git a/src/Server/Plugins.php b/src/Server/Plugins.php index 685d786bd6..aa249e454e 100644 --- a/src/Server/Plugins.php +++ b/src/Server/Plugins.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Server; use PhpMyAdmin\Config; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use function __; use function array_map; diff --git a/src/Server/Privileges.php b/src/Server/Privileges.php index 39eb647f0d..1f47977a25 100644 --- a/src/Server/Privileges.php +++ b/src/Server/Privileges.php @@ -13,9 +13,8 @@ use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationCleanup; use PhpMyAdmin\Current; use PhpMyAdmin\Database\Routines; -use PhpMyAdmin\DatabaseInterface; -use PhpMyAdmin\Dbal\Connection; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Dbal\ResultInterface; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Html\MySQLDocumentation; diff --git a/src/Server/Privileges/AccountLocking.php b/src/Server/Privileges/AccountLocking.php index 7d37eb0fc7..c3273d945e 100644 --- a/src/Server/Privileges/AccountLocking.php +++ b/src/Server/Privileges/AccountLocking.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Server\Privileges; use Exception; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Query\Compatibility; use function __; diff --git a/src/Server/Status/Data.php b/src/Server/Status/Data.php index 0ce8757e7c..6ea6edfd3b 100644 --- a/src/Server/Status/Data.php +++ b/src/Server/Status/Data.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Server\Status; use PhpMyAdmin\Config; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Replication\ReplicationInfo; use PhpMyAdmin\Url; diff --git a/src/Server/Status/Monitor.php b/src/Server/Status/Monitor.php index 7f7fe62055..62e0c7f053 100644 --- a/src/Server/Status/Monitor.php +++ b/src/Server/Status/Monitor.php @@ -7,7 +7,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Server\Status; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Profiling; use PhpMyAdmin\Server\SysInfo\SysInfo; use PhpMyAdmin\Util; diff --git a/src/Server/Status/Processes.php b/src/Server/Status/Processes.php index 88ad300ba1..33914c2eb4 100644 --- a/src/Server/Status/Processes.php +++ b/src/Server/Status/Processes.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Server\Status; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Util; diff --git a/src/Sql.php b/src/Sql.php index da19e8c81f..c8f2ef5f1a 100644 --- a/src/Sql.php +++ b/src/Sql.php @@ -8,6 +8,7 @@ use PhpMyAdmin\Bookmarks\BookmarkRepository; use PhpMyAdmin\ConfigStorage\Features\BookmarkFeature; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationCleanup; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Dbal\ResultInterface; use PhpMyAdmin\Display\DeleteLinkEnum; use PhpMyAdmin\Display\DisplayParts; diff --git a/src/SqlQueryForm.php b/src/SqlQueryForm.php index ad80a0124d..a030856339 100644 --- a/src/SqlQueryForm.php +++ b/src/SqlQueryForm.php @@ -15,6 +15,7 @@ namespace PhpMyAdmin; use PhpMyAdmin\Bookmarks\BookmarkRepository; use PhpMyAdmin\ConfigStorage\Relation; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Html\MySQLDocumentation; use PhpMyAdmin\Utils\ForeignKey; diff --git a/src/StorageEngine.php b/src/StorageEngine.php index 9d05717901..de3a08e128 100644 --- a/src/StorageEngine.php +++ b/src/StorageEngine.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Engines\Bdb; use PhpMyAdmin\Engines\Berkeleydb; use PhpMyAdmin\Engines\Binlog; diff --git a/src/SystemDatabase.php b/src/SystemDatabase.php index 908d2042ed..d4d876367f 100644 --- a/src/SystemDatabase.php +++ b/src/SystemDatabase.php @@ -5,6 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin; use PhpMyAdmin\ConfigStorage\Relation; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Dbal\ResultInterface; use function count; diff --git a/src/Table/ColumnsDefinition.php b/src/Table/ColumnsDefinition.php index 8300f851df..2630ff7183 100644 --- a/src/Table/ColumnsDefinition.php +++ b/src/Table/ColumnsDefinition.php @@ -8,7 +8,7 @@ use PhpMyAdmin\Charsets; use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Partitioning\Partition; use PhpMyAdmin\Partitioning\TablePartitionDefinition; use PhpMyAdmin\Query\Compatibility; diff --git a/src/Table/Indexes.php b/src/Table/Indexes.php index 577fa63726..71b23dfa62 100644 --- a/src/Table/Indexes.php +++ b/src/Table/Indexes.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Table; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Index; diff --git a/src/Table/Maintenance.php b/src/Table/Maintenance.php index 69859239af..08028401c4 100644 --- a/src/Table/Maintenance.php +++ b/src/Table/Maintenance.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Table; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Dbal\Warning; use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Identifiers\TableName; diff --git a/src/Table/Search.php b/src/Table/Search.php index 17e226e2fd..a966d72b16 100644 --- a/src/Table/Search.php +++ b/src/Table/Search.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Table; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Util; use PhpMyAdmin\Utils\Gis; diff --git a/src/Table/Table.php b/src/Table/Table.php index 5939f2a924..44aba2263a 100644 --- a/src/Table/Table.php +++ b/src/Table/Table.php @@ -10,8 +10,8 @@ use PhpMyAdmin\ConfigStorage\Features\RelationFeature; use PhpMyAdmin\ConfigStorage\Features\UiPreferencesFeature; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\FieldMetadata; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Html\MySQLDocumentation; diff --git a/src/Table/TableMover.php b/src/Table/TableMover.php index 7f7148231f..15ba6cdf83 100644 --- a/src/Table/TableMover.php +++ b/src/Table/TableMover.php @@ -6,8 +6,8 @@ namespace PhpMyAdmin\Table; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Message; use PhpMyAdmin\Plugins; use PhpMyAdmin\Plugins\Export\ExportSql; diff --git a/src/Tracking/Tracker.php b/src/Tracking/Tracker.php index 8483d99c0d..a60a2b6a00 100644 --- a/src/Tracking/Tracker.php +++ b/src/Tracking/Tracker.php @@ -11,8 +11,8 @@ use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Features\TrackingFeature; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Plugins; use PhpMyAdmin\Plugins\Export\ExportSql; use PhpMyAdmin\SqlParser\Parser; diff --git a/src/Tracking/Tracking.php b/src/Tracking/Tracking.php index d09ee50924..8250df94af 100644 --- a/src/Tracking/Tracking.php +++ b/src/Tracking/Tracking.php @@ -11,8 +11,8 @@ use DateTimeImmutable; use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Core; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Dbal\ResultInterface; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Message; diff --git a/src/Tracking/TrackingChecker.php b/src/Tracking/TrackingChecker.php index 9c1939950e..66448ec215 100644 --- a/src/Tracking/TrackingChecker.php +++ b/src/Tracking/TrackingChecker.php @@ -6,8 +6,8 @@ namespace PhpMyAdmin\Tracking; use PhpMyAdmin\ConfigStorage\Features\TrackingFeature; use PhpMyAdmin\ConfigStorage\Relation; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Util; diff --git a/src/Transformations.php b/src/Transformations.php index 93ceed68e9..f5c050c522 100644 --- a/src/Transformations.php +++ b/src/Transformations.php @@ -19,6 +19,7 @@ namespace PhpMyAdmin; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Plugins\TransformationsInterface; use function array_shift; diff --git a/src/Triggers/Triggers.php b/src/Triggers/Triggers.php index 94882dd204..2f73fd1aa5 100644 --- a/src/Triggers/Triggers.php +++ b/src/Triggers/Triggers.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Triggers; use PhpMyAdmin\Config; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Message; use PhpMyAdmin\Query\Generator as QueryGenerator; diff --git a/src/TwoFactor.php b/src/TwoFactor.php index 03912b2a5d..d7b16e317c 100644 --- a/src/TwoFactor.php +++ b/src/TwoFactor.php @@ -10,6 +10,7 @@ namespace PhpMyAdmin; use BaconQrCode\Renderer\ImageRenderer; use CodeLts\U2F\U2FServer\U2FServer; use PhpMyAdmin\ConfigStorage\Relation; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Plugins\TwoFactor\Application; use PhpMyAdmin\Plugins\TwoFactor\Invalid; diff --git a/src/Types.php b/src/Types.php index 333ade11eb..8cfe68847e 100644 --- a/src/Types.php +++ b/src/Types.php @@ -7,6 +7,7 @@ declare(strict_types=1); namespace PhpMyAdmin; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Query\Compatibility; use function __; diff --git a/src/UniqueCondition.php b/src/UniqueCondition.php index b1810e1141..b288fbbb54 100644 --- a/src/UniqueCondition.php +++ b/src/UniqueCondition.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\SqlParser\Components\CaseExpression; use PhpMyAdmin\SqlParser\Components\Expression; diff --git a/src/UserPassword.php b/src/UserPassword.php index 7bc4dac8ec..8a3fb8cde3 100644 --- a/src/UserPassword.php +++ b/src/UserPassword.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Plugins\AuthenticationPluginFactory; use PhpMyAdmin\Query\Compatibility; diff --git a/src/UserPreferences.php b/src/UserPreferences.php index 64c03046a6..1fe533f73b 100644 --- a/src/UserPreferences.php +++ b/src/UserPreferences.php @@ -8,6 +8,7 @@ use PhpMyAdmin\Config\ConfigFile; use PhpMyAdmin\Config\Forms\User\UserFormList; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Identifiers\DatabaseName; use function __; diff --git a/src/UserPrivilegesFactory.php b/src/UserPrivilegesFactory.php index 69562298bb..b55c2d53a7 100644 --- a/src/UserPrivilegesFactory.php +++ b/src/UserPrivilegesFactory.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Query\Utilities; use PhpMyAdmin\Utils\SessionCache; diff --git a/src/Util.php b/src/Util.php index b466cce677..571e3a7035 100644 --- a/src/Util.php +++ b/src/Util.php @@ -6,6 +6,7 @@ namespace PhpMyAdmin; use DateTimeImmutable; use PhpMyAdmin\ConfigStorage\UserGroupLevel; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Query\Compatibility; diff --git a/src/Utils/ForeignKey.php b/src/Utils/ForeignKey.php index 1e269974fc..359299d559 100644 --- a/src/Utils/ForeignKey.php +++ b/src/Utils/ForeignKey.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Utils; use PhpMyAdmin\Config; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use function str_starts_with; use function strtolower; diff --git a/src/Utils/Gis.php b/src/Utils/Gis.php index d02321d62c..ff6b450489 100644 --- a/src/Utils/Gis.php +++ b/src/Utils/Gis.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Utils; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use function array_map; use function bin2hex; diff --git a/src/VersionInformation.php b/src/VersionInformation.php index 586746eae0..8adaad72c5 100644 --- a/src/VersionInformation.php +++ b/src/VersionInformation.php @@ -7,6 +7,7 @@ declare(strict_types=1); namespace PhpMyAdmin; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\RequestMethod; use PhpMyAdmin\Utils\HttpRequest; diff --git a/tests/unit/AbstractTestCase.php b/tests/unit/AbstractTestCase.php index 7185864b29..fdfd180f87 100644 --- a/tests/unit/AbstractTestCase.php +++ b/tests/unit/AbstractTestCase.php @@ -9,7 +9,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Container\ContainerBuilder; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Dbal\DbiExtension; use PhpMyAdmin\I18n\LanguageManager; use PhpMyAdmin\SqlParser\Translator; diff --git a/tests/unit/Advisory/AdvisorTest.php b/tests/unit/Advisory/AdvisorTest.php index 077050a68f..5c93067477 100644 --- a/tests/unit/Advisory/AdvisorTest.php +++ b/tests/unit/Advisory/AdvisorTest.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Tests\Advisory; use PhpMyAdmin\Advisory\Advisor; use PhpMyAdmin\Advisory\Rules; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Tests\AbstractTestCase; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\DataProvider; diff --git a/tests/unit/BookmarkTest.php b/tests/unit/BookmarkTest.php index 4301246ee0..f9b6c28ead 100644 --- a/tests/unit/BookmarkTest.php +++ b/tests/unit/BookmarkTest.php @@ -9,7 +9,7 @@ use PhpMyAdmin\Bookmarks\BookmarkRepository; use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationParameters; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Tests\Stubs\DbiDummy; use PHPUnit\Framework\Attributes\CoversClass; use ReflectionProperty; diff --git a/tests/unit/Config/PageSettingsTest.php b/tests/unit/Config/PageSettingsTest.php index a9538ef35b..a6ca22712b 100644 --- a/tests/unit/Config/PageSettingsTest.php +++ b/tests/unit/Config/PageSettingsTest.php @@ -8,7 +8,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\Config\PageSettings; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; diff --git a/tests/unit/ConfigStorage/RelationCleanupTest.php b/tests/unit/ConfigStorage/RelationCleanupTest.php index ab5e005f1e..afe638f846 100644 --- a/tests/unit/ConfigStorage/RelationCleanupTest.php +++ b/tests/unit/ConfigStorage/RelationCleanupTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\ConfigStorage; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationCleanup; use PhpMyAdmin\ConfigStorage\RelationParameters; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Dbal\ResultInterface; use PhpMyAdmin\Tests\AbstractTestCase; use PHPUnit\Framework\Attributes\CoversClass; diff --git a/tests/unit/ConfigStorage/RelationTest.php b/tests/unit/ConfigStorage/RelationTest.php index 39ffb186ca..253b53814e 100644 --- a/tests/unit/ConfigStorage/RelationTest.php +++ b/tests/unit/ConfigStorage/RelationTest.php @@ -9,7 +9,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationParameters; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Favorites\RecentFavoriteTables; use PhpMyAdmin\SqlParser\Utils\ForeignKey; use PhpMyAdmin\Tests\AbstractTestCase; diff --git a/tests/unit/ConfigStorage/UserGroupsTest.php b/tests/unit/ConfigStorage/UserGroupsTest.php index d833cb77aa..75e456100e 100644 --- a/tests/unit/ConfigStorage/UserGroupsTest.php +++ b/tests/unit/ConfigStorage/UserGroupsTest.php @@ -8,7 +8,7 @@ use Generator; use PhpMyAdmin\ConfigStorage\Features\ConfigurableMenusFeature; use PhpMyAdmin\ConfigStorage\UserGroups; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Dbal\ResultInterface; use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Identifiers\TableName; diff --git a/tests/unit/ConfigTest.php b/tests/unit/ConfigTest.php index 0bc6ce83ec..a2159d87b5 100644 --- a/tests/unit/ConfigTest.php +++ b/tests/unit/ConfigTest.php @@ -7,8 +7,8 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\Config; use PhpMyAdmin\Config\Settings; use PhpMyAdmin\Config\Settings\Server; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\Attributes\Depends; diff --git a/tests/unit/ConsoleTest.php b/tests/unit/ConsoleTest.php index f870228550..1743786fa2 100644 --- a/tests/unit/ConsoleTest.php +++ b/tests/unit/ConsoleTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\Bookmarks\BookmarkRepository; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Console; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Template; use PHPUnit\Framework\Attributes\CoversClass; diff --git a/tests/unit/Container/ContainerBuilderTest.php b/tests/unit/Container/ContainerBuilderTest.php index 54f2ad73bc..0de73c74d2 100644 --- a/tests/unit/Container/ContainerBuilderTest.php +++ b/tests/unit/Container/ContainerBuilderTest.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Container; use PhpMyAdmin\Container\ContainerBuilder; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Tests\AbstractTestCase; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\DataProvider; diff --git a/tests/unit/Controllers/BrowseForeignersControllerTest.php b/tests/unit/Controllers/BrowseForeignersControllerTest.php index 7608719d51..b4e5bd27da 100644 --- a/tests/unit/Controllers/BrowseForeignersControllerTest.php +++ b/tests/unit/Controllers/BrowseForeignersControllerTest.php @@ -9,7 +9,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\BrowseForeignersController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; diff --git a/tests/unit/Controllers/CheckRelationsControllerTest.php b/tests/unit/Controllers/CheckRelationsControllerTest.php index 68af761366..4396a238b8 100644 --- a/tests/unit/Controllers/CheckRelationsControllerTest.php +++ b/tests/unit/Controllers/CheckRelationsControllerTest.php @@ -9,7 +9,7 @@ use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationParameters; use PhpMyAdmin\Controllers\CheckRelationsController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Tests\AbstractTestCase; diff --git a/tests/unit/Controllers/Console/Bookmark/AddControllerTest.php b/tests/unit/Controllers/Console/Bookmark/AddControllerTest.php index 7620f8bbd9..d3f6075fd6 100644 --- a/tests/unit/Controllers/Console/Bookmark/AddControllerTest.php +++ b/tests/unit/Controllers/Console/Bookmark/AddControllerTest.php @@ -10,7 +10,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationParameters; use PhpMyAdmin\Controllers\Console\Bookmark\AddController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Tests\AbstractTestCase; diff --git a/tests/unit/Controllers/Console/Bookmark/RefreshControllerTest.php b/tests/unit/Controllers/Console/Bookmark/RefreshControllerTest.php index 6ed1d234e0..893135384f 100644 --- a/tests/unit/Controllers/Console/Bookmark/RefreshControllerTest.php +++ b/tests/unit/Controllers/Console/Bookmark/RefreshControllerTest.php @@ -8,7 +8,7 @@ use PhpMyAdmin\Bookmarks\BookmarkRepository; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Console; use PhpMyAdmin\Controllers\Console\Bookmark\RefreshController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; diff --git a/tests/unit/Controllers/Console/UpdateConfigControllerTest.php b/tests/unit/Controllers/Console/UpdateConfigControllerTest.php index dcbdb1fb92..aad94f71f9 100644 --- a/tests/unit/Controllers/Console/UpdateConfigControllerTest.php +++ b/tests/unit/Controllers/Console/UpdateConfigControllerTest.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Tests\Controllers\Console; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\Console\UpdateConfigController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Message; use PhpMyAdmin\Tests\AbstractTestCase; diff --git a/tests/unit/Controllers/Database/EventsControllerTest.php b/tests/unit/Controllers/Database/EventsControllerTest.php index 47e7540c00..56d883bfd2 100644 --- a/tests/unit/Controllers/Database/EventsControllerTest.php +++ b/tests/unit/Controllers/Database/EventsControllerTest.php @@ -8,7 +8,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\Database\EventsController; use PhpMyAdmin\Current; use PhpMyAdmin\Database\Events; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Template; diff --git a/tests/unit/Controllers/Database/MultiTableQuery/TablesControllerTest.php b/tests/unit/Controllers/Database/MultiTableQuery/TablesControllerTest.php index 0a274f6beb..2415b07c8a 100644 --- a/tests/unit/Controllers/Database/MultiTableQuery/TablesControllerTest.php +++ b/tests/unit/Controllers/Database/MultiTableQuery/TablesControllerTest.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers\Database\MultiTableQuery; use PhpMyAdmin\Controllers\Database\MultiTableQuery\TablesController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\DbiDummy; diff --git a/tests/unit/Controllers/Database/PrivilegesControllerTest.php b/tests/unit/Controllers/Database/PrivilegesControllerTest.php index 282fa6814f..6c1d747a0d 100644 --- a/tests/unit/Controllers/Database/PrivilegesControllerTest.php +++ b/tests/unit/Controllers/Database/PrivilegesControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Database; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\Database\PrivilegesController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Server\Privileges; use PhpMyAdmin\Tests\AbstractTestCase; diff --git a/tests/unit/Controllers/Database/RoutinesControllerTest.php b/tests/unit/Controllers/Database/RoutinesControllerTest.php index cef9506f5b..5552ce2c1c 100644 --- a/tests/unit/Controllers/Database/RoutinesControllerTest.php +++ b/tests/unit/Controllers/Database/RoutinesControllerTest.php @@ -8,7 +8,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\Database\RoutinesController; use PhpMyAdmin\Current; use PhpMyAdmin\Database\Routines; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Template; diff --git a/tests/unit/Controllers/Database/Structure/CopyFormControllerTest.php b/tests/unit/Controllers/Database/Structure/CopyFormControllerTest.php index 708ba62ec5..f419be52ad 100644 --- a/tests/unit/Controllers/Database/Structure/CopyFormControllerTest.php +++ b/tests/unit/Controllers/Database/Structure/CopyFormControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Database\Structure; use Fig\Http\Message\StatusCodeInterface; use PhpMyAdmin\Controllers\Database\Structure\CopyFormController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Factory\ResponseFactory; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Template; diff --git a/tests/unit/Controllers/Database/Structure/FavoriteTableControllerTest.php b/tests/unit/Controllers/Database/Structure/FavoriteTableControllerTest.php index e05004c6eb..7513ff8b4b 100644 --- a/tests/unit/Controllers/Database/Structure/FavoriteTableControllerTest.php +++ b/tests/unit/Controllers/Database/Structure/FavoriteTableControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Database\Structure; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Database\Structure\FavoriteTableController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Favorites\RecentFavoriteTables; use PhpMyAdmin\Favorites\TableType; diff --git a/tests/unit/Controllers/Database/Structure/RealRowCountControllerTest.php b/tests/unit/Controllers/Database/Structure/RealRowCountControllerTest.php index fcce542d64..b1bf7b962a 100644 --- a/tests/unit/Controllers/Database/Structure/RealRowCountControllerTest.php +++ b/tests/unit/Controllers/Database/Structure/RealRowCountControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Database\Structure; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\Database\Structure\RealRowCountController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Tests\AbstractTestCase; diff --git a/tests/unit/Controllers/Database/StructureControllerTest.php b/tests/unit/Controllers/Database/StructureControllerTest.php index ea9093b18f..de934ecaeb 100644 --- a/tests/unit/Controllers/Database/StructureControllerTest.php +++ b/tests/unit/Controllers/Database/StructureControllerTest.php @@ -9,7 +9,7 @@ use PhpMyAdmin\Config\PageSettings; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Database\StructureController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Replication\Replication; diff --git a/tests/unit/Controllers/DatabaseControllerTest.php b/tests/unit/Controllers/DatabaseControllerTest.php index 5fa16d1879..686f0cd079 100644 --- a/tests/unit/Controllers/DatabaseControllerTest.php +++ b/tests/unit/Controllers/DatabaseControllerTest.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers; use PhpMyAdmin\Controllers\DatabaseController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\ListDatabase; use PhpMyAdmin\Tests\AbstractTestCase; diff --git a/tests/unit/Controllers/Export/ExportControllerTest.php b/tests/unit/Controllers/Export/ExportControllerTest.php index 929c44c006..495c12d26e 100644 --- a/tests/unit/Controllers/Export/ExportControllerTest.php +++ b/tests/unit/Controllers/Export/ExportControllerTest.php @@ -9,7 +9,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\Container\ContainerBuilder; use PhpMyAdmin\Controllers\Export\ExportController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Export\Export; use PhpMyAdmin\Http\Factory\ResponseFactory; use PhpMyAdmin\Http\Factory\ServerRequestFactory; diff --git a/tests/unit/Controllers/Export/Template/CreateControllerTest.php b/tests/unit/Controllers/Export/Template/CreateControllerTest.php index 5c9f087cc8..4df0f5b579 100644 --- a/tests/unit/Controllers/Export/Template/CreateControllerTest.php +++ b/tests/unit/Controllers/Export/Template/CreateControllerTest.php @@ -8,7 +8,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationParameters; use PhpMyAdmin\Controllers\Export\Template\CreateController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Export\Template as ExportTemplate; use PhpMyAdmin\Export\TemplateModel; use PhpMyAdmin\Http\Factory\ServerRequestFactory; diff --git a/tests/unit/Controllers/Export/Template/DeleteControllerTest.php b/tests/unit/Controllers/Export/Template/DeleteControllerTest.php index 195259958e..4bd0f79620 100644 --- a/tests/unit/Controllers/Export/Template/DeleteControllerTest.php +++ b/tests/unit/Controllers/Export/Template/DeleteControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Export\Template; use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Export\Template\DeleteController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Export\TemplateModel; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Tests\AbstractTestCase; diff --git a/tests/unit/Controllers/Export/Template/LoadControllerTest.php b/tests/unit/Controllers/Export/Template/LoadControllerTest.php index 7db4d7b813..9bb99e7ea7 100644 --- a/tests/unit/Controllers/Export/Template/LoadControllerTest.php +++ b/tests/unit/Controllers/Export/Template/LoadControllerTest.php @@ -8,7 +8,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationParameters; use PhpMyAdmin\Controllers\Export\Template\LoadController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Export\TemplateModel; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Tests\AbstractTestCase; diff --git a/tests/unit/Controllers/Export/Template/UpdateControllerTest.php b/tests/unit/Controllers/Export/Template/UpdateControllerTest.php index d69fa883fe..63ce72ee21 100644 --- a/tests/unit/Controllers/Export/Template/UpdateControllerTest.php +++ b/tests/unit/Controllers/Export/Template/UpdateControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Export\Template; use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Export\Template\UpdateController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Export\TemplateModel; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Tests\AbstractTestCase; diff --git a/tests/unit/Controllers/GisDataEditorControllerTest.php b/tests/unit/Controllers/GisDataEditorControllerTest.php index 2d644a3301..50d0ad3573 100644 --- a/tests/unit/Controllers/GisDataEditorControllerTest.php +++ b/tests/unit/Controllers/GisDataEditorControllerTest.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Tests\Controllers; use PhpMyAdmin\Controllers\GisDataEditorController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; diff --git a/tests/unit/Controllers/HomeControllerTest.php b/tests/unit/Controllers/HomeControllerTest.php index 5bb41d26be..95b9bb504a 100644 --- a/tests/unit/Controllers/HomeControllerTest.php +++ b/tests/unit/Controllers/HomeControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers; use Fig\Http\Message\StatusCodeInterface; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\HomeController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Factory\ResponseFactory; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\ResponseRenderer; diff --git a/tests/unit/Controllers/Import/ImportControllerTest.php b/tests/unit/Controllers/Import/ImportControllerTest.php index c2d1945680..1f11cd5b45 100644 --- a/tests/unit/Controllers/Import/ImportControllerTest.php +++ b/tests/unit/Controllers/Import/ImportControllerTest.php @@ -10,7 +10,7 @@ use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationCleanup; use PhpMyAdmin\Controllers\Import\ImportController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Import\Import; use PhpMyAdmin\Sql; diff --git a/tests/unit/Controllers/LintControllerTest.php b/tests/unit/Controllers/LintControllerTest.php index 8e3244aa23..755b9891e3 100644 --- a/tests/unit/Controllers/LintControllerTest.php +++ b/tests/unit/Controllers/LintControllerTest.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Tests\Controllers; use Fig\Http\Message\StatusCodeInterface; use PhpMyAdmin\Controllers\LintController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Factory\ResponseFactory; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Http\ServerRequest; diff --git a/tests/unit/Controllers/NavigationControllerTest.php b/tests/unit/Controllers/NavigationControllerTest.php index e3df2d7e78..e3d84a00cc 100644 --- a/tests/unit/Controllers/NavigationControllerTest.php +++ b/tests/unit/Controllers/NavigationControllerTest.php @@ -9,7 +9,7 @@ use PhpMyAdmin\Config\PageSettings; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\NavigationController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Navigation\Navigation; use PhpMyAdmin\Template; diff --git a/tests/unit/Controllers/Normalization/AddNewPrimaryControllerTest.php b/tests/unit/Controllers/Normalization/AddNewPrimaryControllerTest.php index f13eaaa9dc..35790e8f0d 100644 --- a/tests/unit/Controllers/Normalization/AddNewPrimaryControllerTest.php +++ b/tests/unit/Controllers/Normalization/AddNewPrimaryControllerTest.php @@ -8,7 +8,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Normalization\AddNewPrimaryController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Normalization; use PhpMyAdmin\Template; diff --git a/tests/unit/Controllers/Normalization/CreateNewColumnControllerTest.php b/tests/unit/Controllers/Normalization/CreateNewColumnControllerTest.php index bf60f77934..aed5d712b7 100644 --- a/tests/unit/Controllers/Normalization/CreateNewColumnControllerTest.php +++ b/tests/unit/Controllers/Normalization/CreateNewColumnControllerTest.php @@ -8,7 +8,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Normalization\CreateNewColumnController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Normalization; use PhpMyAdmin\Template; diff --git a/tests/unit/Controllers/Normalization/FirstNormalForm/FirstStepControllerTest.php b/tests/unit/Controllers/Normalization/FirstNormalForm/FirstStepControllerTest.php index 2adb0f166f..59ea5b5dcf 100644 --- a/tests/unit/Controllers/Normalization/FirstNormalForm/FirstStepControllerTest.php +++ b/tests/unit/Controllers/Normalization/FirstNormalForm/FirstStepControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Normalization\FirstNormalForm; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Normalization\FirstNormalForm\FirstStepController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Normalization; use PhpMyAdmin\Template; diff --git a/tests/unit/Controllers/Normalization/FirstNormalForm/FourthStepControllerTest.php b/tests/unit/Controllers/Normalization/FirstNormalForm/FourthStepControllerTest.php index 72a2e23975..4ec275b392 100644 --- a/tests/unit/Controllers/Normalization/FirstNormalForm/FourthStepControllerTest.php +++ b/tests/unit/Controllers/Normalization/FirstNormalForm/FourthStepControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Normalization\FirstNormalForm; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Normalization\FirstNormalForm\FourthStepController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Normalization; use PhpMyAdmin\Template; diff --git a/tests/unit/Controllers/Normalization/FirstNormalForm/SecondStepControllerTest.php b/tests/unit/Controllers/Normalization/FirstNormalForm/SecondStepControllerTest.php index e4d029aece..56d2e75eda 100644 --- a/tests/unit/Controllers/Normalization/FirstNormalForm/SecondStepControllerTest.php +++ b/tests/unit/Controllers/Normalization/FirstNormalForm/SecondStepControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Normalization\FirstNormalForm; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Normalization\FirstNormalForm\SecondStepController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Normalization; use PhpMyAdmin\Template; diff --git a/tests/unit/Controllers/Normalization/FirstNormalForm/ThirdStepControllerTest.php b/tests/unit/Controllers/Normalization/FirstNormalForm/ThirdStepControllerTest.php index 60a0a13244..a8aab85099 100644 --- a/tests/unit/Controllers/Normalization/FirstNormalForm/ThirdStepControllerTest.php +++ b/tests/unit/Controllers/Normalization/FirstNormalForm/ThirdStepControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Normalization\FirstNormalForm; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Normalization\FirstNormalForm\ThirdStepController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Normalization; use PhpMyAdmin\Template; diff --git a/tests/unit/Controllers/Normalization/GetColumnsControllerTest.php b/tests/unit/Controllers/Normalization/GetColumnsControllerTest.php index 6604ca9cd8..cac04bec5a 100644 --- a/tests/unit/Controllers/Normalization/GetColumnsControllerTest.php +++ b/tests/unit/Controllers/Normalization/GetColumnsControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Normalization; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Normalization\GetColumnsController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Normalization; use PhpMyAdmin\Template; diff --git a/tests/unit/Controllers/Normalization/MainControllerTest.php b/tests/unit/Controllers/Normalization/MainControllerTest.php index a0136efe15..71f390c17f 100644 --- a/tests/unit/Controllers/Normalization/MainControllerTest.php +++ b/tests/unit/Controllers/Normalization/MainControllerTest.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Tests\Controllers\Normalization; use PhpMyAdmin\Controllers\Normalization\MainController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\DbiDummy; diff --git a/tests/unit/Controllers/Normalization/MoveRepeatingGroupTest.php b/tests/unit/Controllers/Normalization/MoveRepeatingGroupTest.php index 093e90ac05..80f30aae74 100644 --- a/tests/unit/Controllers/Normalization/MoveRepeatingGroupTest.php +++ b/tests/unit/Controllers/Normalization/MoveRepeatingGroupTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Normalization; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Normalization\MoveRepeatingGroup; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Message; use PhpMyAdmin\Normalization; diff --git a/tests/unit/Controllers/Normalization/PartialDependenciesControllerTest.php b/tests/unit/Controllers/Normalization/PartialDependenciesControllerTest.php index 2197dfc3e6..2c390f6466 100644 --- a/tests/unit/Controllers/Normalization/PartialDependenciesControllerTest.php +++ b/tests/unit/Controllers/Normalization/PartialDependenciesControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Normalization; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Normalization\PartialDependenciesController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Normalization; use PhpMyAdmin\Template; diff --git a/tests/unit/Controllers/Normalization/SecondNormalForm/CreateNewTablesControllerTest.php b/tests/unit/Controllers/Normalization/SecondNormalForm/CreateNewTablesControllerTest.php index c8bd630957..8d2ddbc8a7 100644 --- a/tests/unit/Controllers/Normalization/SecondNormalForm/CreateNewTablesControllerTest.php +++ b/tests/unit/Controllers/Normalization/SecondNormalForm/CreateNewTablesControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Normalization\SecondNormalForm; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Normalization\SecondNormalForm\CreateNewTablesController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Normalization; use PhpMyAdmin\Template; diff --git a/tests/unit/Controllers/Normalization/SecondNormalForm/FirstStepControllerTest.php b/tests/unit/Controllers/Normalization/SecondNormalForm/FirstStepControllerTest.php index 10be82ceec..c4389c5a6d 100644 --- a/tests/unit/Controllers/Normalization/SecondNormalForm/FirstStepControllerTest.php +++ b/tests/unit/Controllers/Normalization/SecondNormalForm/FirstStepControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Normalization\SecondNormalForm; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Normalization\SecondNormalForm\FirstStepController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Normalization; use PhpMyAdmin\Template; diff --git a/tests/unit/Controllers/Normalization/SecondNormalForm/NewTablesControllerTest.php b/tests/unit/Controllers/Normalization/SecondNormalForm/NewTablesControllerTest.php index c70783ff03..d2f138f9ab 100644 --- a/tests/unit/Controllers/Normalization/SecondNormalForm/NewTablesControllerTest.php +++ b/tests/unit/Controllers/Normalization/SecondNormalForm/NewTablesControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Normalization\SecondNormalForm; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Normalization\SecondNormalForm\NewTablesController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Normalization; use PhpMyAdmin\Template; diff --git a/tests/unit/Controllers/Normalization/ThirdNormalForm/CreateNewTablesControllerTest.php b/tests/unit/Controllers/Normalization/ThirdNormalForm/CreateNewTablesControllerTest.php index 4c9dbc9747..0d39b0acc2 100644 --- a/tests/unit/Controllers/Normalization/ThirdNormalForm/CreateNewTablesControllerTest.php +++ b/tests/unit/Controllers/Normalization/ThirdNormalForm/CreateNewTablesControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Normalization\ThirdNormalForm; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Normalization\ThirdNormalForm\CreateNewTablesController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Normalization; use PhpMyAdmin\Template; diff --git a/tests/unit/Controllers/Normalization/ThirdNormalForm/FirstStepControllerTest.php b/tests/unit/Controllers/Normalization/ThirdNormalForm/FirstStepControllerTest.php index f6ffa0b3d9..682f39419c 100644 --- a/tests/unit/Controllers/Normalization/ThirdNormalForm/FirstStepControllerTest.php +++ b/tests/unit/Controllers/Normalization/ThirdNormalForm/FirstStepControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Normalization\ThirdNormalForm; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Normalization\ThirdNormalForm\FirstStepController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Normalization; use PhpMyAdmin\Template; diff --git a/tests/unit/Controllers/Normalization/ThirdNormalForm/NewTablesControllerTest.php b/tests/unit/Controllers/Normalization/ThirdNormalForm/NewTablesControllerTest.php index 6188e71ecb..3c755993aa 100644 --- a/tests/unit/Controllers/Normalization/ThirdNormalForm/NewTablesControllerTest.php +++ b/tests/unit/Controllers/Normalization/ThirdNormalForm/NewTablesControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Normalization\ThirdNormalForm; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Normalization\ThirdNormalForm\NewTablesController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Normalization; use PhpMyAdmin\Template; diff --git a/tests/unit/Controllers/Operations/TableControllerTest.php b/tests/unit/Controllers/Operations/TableControllerTest.php index 6145191f0d..55e2b378a2 100644 --- a/tests/unit/Controllers/Operations/TableControllerTest.php +++ b/tests/unit/Controllers/Operations/TableControllerTest.php @@ -9,7 +9,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Operations\TableController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Operations; diff --git a/tests/unit/Controllers/SchemaExportControllerTest.php b/tests/unit/Controllers/SchemaExportControllerTest.php index 42354267f5..20f267a8ce 100644 --- a/tests/unit/Controllers/SchemaExportControllerTest.php +++ b/tests/unit/Controllers/SchemaExportControllerTest.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Tests\Controllers; use Fig\Http\Message\StatusCodeInterface; use PhpMyAdmin\Controllers\SchemaExportController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Export\Export; use PhpMyAdmin\Http\Factory\ResponseFactory; use PhpMyAdmin\Http\Factory\ServerRequestFactory; diff --git a/tests/unit/Controllers/Server/BinlogControllerTest.php b/tests/unit/Controllers/Server/BinlogControllerTest.php index 7b50fd1ef9..c9baf7151c 100644 --- a/tests/unit/Controllers/Server/BinlogControllerTest.php +++ b/tests/unit/Controllers/Server/BinlogControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Server; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\Server\BinlogController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\DbiDummy; diff --git a/tests/unit/Controllers/Server/CollationsControllerTest.php b/tests/unit/Controllers/Server/CollationsControllerTest.php index c84c423fec..702ea277d6 100644 --- a/tests/unit/Controllers/Server/CollationsControllerTest.php +++ b/tests/unit/Controllers/Server/CollationsControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Server; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\Server\CollationsController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\DbiDummy; diff --git a/tests/unit/Controllers/Server/Databases/CreateControllerTest.php b/tests/unit/Controllers/Server/Databases/CreateControllerTest.php index e5e06659af..99d961be65 100644 --- a/tests/unit/Controllers/Server/Databases/CreateControllerTest.php +++ b/tests/unit/Controllers/Server/Databases/CreateControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Server\Databases; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\Server\Databases\CreateController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\DbiDummy; diff --git a/tests/unit/Controllers/Server/Databases/DestroyControllerTest.php b/tests/unit/Controllers/Server/Databases/DestroyControllerTest.php index cce3c61bc8..4b63de030a 100644 --- a/tests/unit/Controllers/Server/Databases/DestroyControllerTest.php +++ b/tests/unit/Controllers/Server/Databases/DestroyControllerTest.php @@ -8,7 +8,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationCleanup; use PhpMyAdmin\Controllers\Server\Databases\DestroyController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; diff --git a/tests/unit/Controllers/Server/DatabasesControllerTest.php b/tests/unit/Controllers/Server/DatabasesControllerTest.php index 235d5ec2c1..aa8ec97af8 100644 --- a/tests/unit/Controllers/Server/DatabasesControllerTest.php +++ b/tests/unit/Controllers/Server/DatabasesControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Server; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\Server\DatabasesController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\DbiDummy; diff --git a/tests/unit/Controllers/Server/EnginesControllerTest.php b/tests/unit/Controllers/Server/EnginesControllerTest.php index 4fca232e42..4e578727cf 100644 --- a/tests/unit/Controllers/Server/EnginesControllerTest.php +++ b/tests/unit/Controllers/Server/EnginesControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Server; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\Server\EnginesController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\DbiDummy; diff --git a/tests/unit/Controllers/Server/PluginsControllerTest.php b/tests/unit/Controllers/Server/PluginsControllerTest.php index 51930c58d2..1fa2a9d69a 100644 --- a/tests/unit/Controllers/Server/PluginsControllerTest.php +++ b/tests/unit/Controllers/Server/PluginsControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Server; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\Server\PluginsController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Server\Plugins; use PhpMyAdmin\Tests\AbstractTestCase; diff --git a/tests/unit/Controllers/Server/Privileges/AccountLockControllerTest.php b/tests/unit/Controllers/Server/Privileges/AccountLockControllerTest.php index 63d8b0ad50..efd94953e9 100644 --- a/tests/unit/Controllers/Server/Privileges/AccountLockControllerTest.php +++ b/tests/unit/Controllers/Server/Privileges/AccountLockControllerTest.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers\Server\Privileges; use PhpMyAdmin\Controllers\Server\Privileges\AccountLockController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; diff --git a/tests/unit/Controllers/Server/Privileges/AccountUnlockControllerTest.php b/tests/unit/Controllers/Server/Privileges/AccountUnlockControllerTest.php index c721d1c70a..6e1edf9a05 100644 --- a/tests/unit/Controllers/Server/Privileges/AccountUnlockControllerTest.php +++ b/tests/unit/Controllers/Server/Privileges/AccountUnlockControllerTest.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers\Server\Privileges; use PhpMyAdmin\Controllers\Server\Privileges\AccountUnlockController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; diff --git a/tests/unit/Controllers/Server/PrivilegesControllerTest.php b/tests/unit/Controllers/Server/PrivilegesControllerTest.php index 4c8b4bb397..787dfdad77 100644 --- a/tests/unit/Controllers/Server/PrivilegesControllerTest.php +++ b/tests/unit/Controllers/Server/PrivilegesControllerTest.php @@ -8,7 +8,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Server\PrivilegesController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Template; diff --git a/tests/unit/Controllers/Server/ShowEngineControllerTest.php b/tests/unit/Controllers/Server/ShowEngineControllerTest.php index 9711413a18..d136e9d2a7 100644 --- a/tests/unit/Controllers/Server/ShowEngineControllerTest.php +++ b/tests/unit/Controllers/Server/ShowEngineControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Server; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\Server\ShowEngineController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Html\MySQLDocumentation; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\StorageEngine; diff --git a/tests/unit/Controllers/Server/Status/AdvisorControllerTest.php b/tests/unit/Controllers/Server/Status/AdvisorControllerTest.php index d56bcb6c01..959e2cbd9a 100644 --- a/tests/unit/Controllers/Server/Status/AdvisorControllerTest.php +++ b/tests/unit/Controllers/Server/Status/AdvisorControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Server\Status; use PhpMyAdmin\Advisory\Advisor; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\Server\Status\AdvisorController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Server\Status\Data; use PhpMyAdmin\Template; diff --git a/tests/unit/Controllers/Server/Status/Monitor/GeneralLogControllerTest.php b/tests/unit/Controllers/Server/Status/Monitor/GeneralLogControllerTest.php index 7bdd70dad9..a9b80adae0 100644 --- a/tests/unit/Controllers/Server/Status/Monitor/GeneralLogControllerTest.php +++ b/tests/unit/Controllers/Server/Status/Monitor/GeneralLogControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Server\Status\Monitor; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\Server\Status\Monitor\GeneralLogController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Server\Status\Data; use PhpMyAdmin\Server\Status\Monitor; diff --git a/tests/unit/Controllers/Server/Status/Monitor/LogVarsControllerTest.php b/tests/unit/Controllers/Server/Status/Monitor/LogVarsControllerTest.php index 3d0a72231a..13e0b5cc06 100644 --- a/tests/unit/Controllers/Server/Status/Monitor/LogVarsControllerTest.php +++ b/tests/unit/Controllers/Server/Status/Monitor/LogVarsControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Server\Status\Monitor; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\Server\Status\Monitor\LogVarsController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Server\Status\Data; use PhpMyAdmin\Server\Status\Monitor; diff --git a/tests/unit/Controllers/Server/Status/Monitor/QueryAnalyzerControllerTest.php b/tests/unit/Controllers/Server/Status/Monitor/QueryAnalyzerControllerTest.php index e74fc3762b..d5ecf23595 100644 --- a/tests/unit/Controllers/Server/Status/Monitor/QueryAnalyzerControllerTest.php +++ b/tests/unit/Controllers/Server/Status/Monitor/QueryAnalyzerControllerTest.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Tests\Controllers\Server\Status\Monitor; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\Server\Status\Monitor\QueryAnalyzerController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Server\Status\Data; use PhpMyAdmin\Server\Status\Monitor; diff --git a/tests/unit/Controllers/Server/Status/Monitor/SlowLogControllerTest.php b/tests/unit/Controllers/Server/Status/Monitor/SlowLogControllerTest.php index 93033fd6f5..2ed1bde1e2 100644 --- a/tests/unit/Controllers/Server/Status/Monitor/SlowLogControllerTest.php +++ b/tests/unit/Controllers/Server/Status/Monitor/SlowLogControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Server\Status\Monitor; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\Server\Status\Monitor\SlowLogController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Server\Status\Data; use PhpMyAdmin\Server\Status\Monitor; diff --git a/tests/unit/Controllers/Server/Status/MonitorControllerTest.php b/tests/unit/Controllers/Server/Status/MonitorControllerTest.php index 4b94229a3a..be59f4560b 100644 --- a/tests/unit/Controllers/Server/Status/MonitorControllerTest.php +++ b/tests/unit/Controllers/Server/Status/MonitorControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Server\Status; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\Server\Status\MonitorController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Server\Status\Data; use PhpMyAdmin\Template; diff --git a/tests/unit/Controllers/Server/Status/Processes/RefreshControllerTest.php b/tests/unit/Controllers/Server/Status/Processes/RefreshControllerTest.php index 0b3373fd58..74ede6e831 100644 --- a/tests/unit/Controllers/Server/Status/Processes/RefreshControllerTest.php +++ b/tests/unit/Controllers/Server/Status/Processes/RefreshControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Server\Status\Processes; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\Server\Status\Processes\RefreshController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Server\Status\Data; use PhpMyAdmin\Server\Status\Processes; diff --git a/tests/unit/Controllers/Server/Status/ProcessesControllerTest.php b/tests/unit/Controllers/Server/Status/ProcessesControllerTest.php index 4df0bdd98f..26ca5ebfa1 100644 --- a/tests/unit/Controllers/Server/Status/ProcessesControllerTest.php +++ b/tests/unit/Controllers/Server/Status/ProcessesControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Server\Status; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\Server\Status\ProcessesController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Server\Status\Data; diff --git a/tests/unit/Controllers/Server/Status/QueriesControllerTest.php b/tests/unit/Controllers/Server/Status/QueriesControllerTest.php index 1aceeb2375..3814a998a1 100644 --- a/tests/unit/Controllers/Server/Status/QueriesControllerTest.php +++ b/tests/unit/Controllers/Server/Status/QueriesControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Server\Status; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\Server\Status\QueriesController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Server\Status\Data; use PhpMyAdmin\Template; diff --git a/tests/unit/Controllers/Server/Status/StatusControllerTest.php b/tests/unit/Controllers/Server/Status/StatusControllerTest.php index 79ba64ce54..d0762c9ec5 100644 --- a/tests/unit/Controllers/Server/Status/StatusControllerTest.php +++ b/tests/unit/Controllers/Server/Status/StatusControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Server\Status; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\Server\Status\StatusController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Replication\Replication; use PhpMyAdmin\Replication\ReplicationGui; diff --git a/tests/unit/Controllers/Server/Status/VariablesControllerTest.php b/tests/unit/Controllers/Server/Status/VariablesControllerTest.php index 43ebea66b3..9d62da0cda 100644 --- a/tests/unit/Controllers/Server/Status/VariablesControllerTest.php +++ b/tests/unit/Controllers/Server/Status/VariablesControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Server\Status; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\Server\Status\VariablesController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Server\Status\Data; use PhpMyAdmin\Template; diff --git a/tests/unit/Controllers/Server/VariablesControllerTest.php b/tests/unit/Controllers/Server/VariablesControllerTest.php index abe9c9f1fc..083c6cc779 100644 --- a/tests/unit/Controllers/Server/VariablesControllerTest.php +++ b/tests/unit/Controllers/Server/VariablesControllerTest.php @@ -7,8 +7,8 @@ namespace PhpMyAdmin\Tests\Controllers\Server; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\Server\VariablesController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Providers\ServerVariables\ServerVariablesProvider; diff --git a/tests/unit/Controllers/Sql/EnumValuesControllerTest.php b/tests/unit/Controllers/Sql/EnumValuesControllerTest.php index 3e5661179f..f72410dd1c 100644 --- a/tests/unit/Controllers/Sql/EnumValuesControllerTest.php +++ b/tests/unit/Controllers/Sql/EnumValuesControllerTest.php @@ -10,7 +10,7 @@ use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationCleanup; use PhpMyAdmin\Controllers\Sql\EnumValuesController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Sql; use PhpMyAdmin\Template; diff --git a/tests/unit/Controllers/Sql/SetValuesControllerTest.php b/tests/unit/Controllers/Sql/SetValuesControllerTest.php index 1229270f6d..235026f87c 100644 --- a/tests/unit/Controllers/Sql/SetValuesControllerTest.php +++ b/tests/unit/Controllers/Sql/SetValuesControllerTest.php @@ -10,7 +10,7 @@ use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationCleanup; use PhpMyAdmin\Controllers\Sql\SetValuesController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Sql; use PhpMyAdmin\Template; diff --git a/tests/unit/Controllers/Table/AddFieldControllerTest.php b/tests/unit/Controllers/Table/AddFieldControllerTest.php index fcc0a00977..9028b59731 100644 --- a/tests/unit/Controllers/Table/AddFieldControllerTest.php +++ b/tests/unit/Controllers/Table/AddFieldControllerTest.php @@ -8,7 +8,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Table\AddFieldController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Table\ColumnsDefinition; diff --git a/tests/unit/Controllers/Table/ChangeControllerTest.php b/tests/unit/Controllers/Table/ChangeControllerTest.php index 164d88ffa5..d15e1d4b5d 100644 --- a/tests/unit/Controllers/Table/ChangeControllerTest.php +++ b/tests/unit/Controllers/Table/ChangeControllerTest.php @@ -9,7 +9,7 @@ use PhpMyAdmin\Config\PageSettings; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Table\ChangeController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\FileListing; use PhpMyAdmin\Http\Factory\ServerRequestFactory; diff --git a/tests/unit/Controllers/Table/ChangeRowsControllerTest.php b/tests/unit/Controllers/Table/ChangeRowsControllerTest.php index 2f6155017f..8c1538513b 100644 --- a/tests/unit/Controllers/Table/ChangeRowsControllerTest.php +++ b/tests/unit/Controllers/Table/ChangeRowsControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Table; use PhpMyAdmin\Controllers\Table\ChangeController; use PhpMyAdmin\Controllers\Table\ChangeRowsController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Factory\ResponseFactory; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Tests\AbstractTestCase; diff --git a/tests/unit/Controllers/Table/ChartControllerTest.php b/tests/unit/Controllers/Table/ChartControllerTest.php index a3bad4fb27..3f9d1f31ee 100644 --- a/tests/unit/Controllers/Table/ChartControllerTest.php +++ b/tests/unit/Controllers/Table/ChartControllerTest.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Tests\Controllers\Table; use PhpMyAdmin\Controllers\Table\ChartController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Template; diff --git a/tests/unit/Controllers/Table/CreateControllerTest.php b/tests/unit/Controllers/Table/CreateControllerTest.php index 5af85b99e7..58ae55afef 100644 --- a/tests/unit/Controllers/Table/CreateControllerTest.php +++ b/tests/unit/Controllers/Table/CreateControllerTest.php @@ -8,7 +8,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Table\CreateController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Table\ColumnsDefinition; use PhpMyAdmin\Template; diff --git a/tests/unit/Controllers/Table/DeleteConfirmControllerTest.php b/tests/unit/Controllers/Table/DeleteConfirmControllerTest.php index be2d53c3a2..c748edfe7a 100644 --- a/tests/unit/Controllers/Table/DeleteConfirmControllerTest.php +++ b/tests/unit/Controllers/Table/DeleteConfirmControllerTest.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Tests\Controllers\Table; use PhpMyAdmin\Controllers\Table\DeleteConfirmController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Template; diff --git a/tests/unit/Controllers/Table/DeleteRowsControllerTest.php b/tests/unit/Controllers/Table/DeleteRowsControllerTest.php index a9142fb70d..3805c36226 100644 --- a/tests/unit/Controllers/Table/DeleteRowsControllerTest.php +++ b/tests/unit/Controllers/Table/DeleteRowsControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Table; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\Table\DeleteRowsController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; diff --git a/tests/unit/Controllers/Table/DropColumnConfirmationControllerTest.php b/tests/unit/Controllers/Table/DropColumnConfirmationControllerTest.php index 6873a7eff3..3f8c52fa14 100644 --- a/tests/unit/Controllers/Table/DropColumnConfirmationControllerTest.php +++ b/tests/unit/Controllers/Table/DropColumnConfirmationControllerTest.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers\Table; use PhpMyAdmin\Controllers\Table\DropColumnConfirmationController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Template; diff --git a/tests/unit/Controllers/Table/DropColumnControllerTest.php b/tests/unit/Controllers/Table/DropColumnControllerTest.php index c5ccd14d8f..24f8f6e4bd 100644 --- a/tests/unit/Controllers/Table/DropColumnControllerTest.php +++ b/tests/unit/Controllers/Table/DropColumnControllerTest.php @@ -8,7 +8,7 @@ use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationCleanup; use PhpMyAdmin\Controllers\Table\DropColumnController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\FlashMessenger; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Tests\AbstractTestCase; diff --git a/tests/unit/Controllers/Table/ExportControllerTest.php b/tests/unit/Controllers/Table/ExportControllerTest.php index 68e8ee4509..4e7d86b0bc 100644 --- a/tests/unit/Controllers/Table/ExportControllerTest.php +++ b/tests/unit/Controllers/Table/ExportControllerTest.php @@ -9,7 +9,7 @@ use PhpMyAdmin\Config\PageSettings; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Table\ExportController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Encoding; use PhpMyAdmin\Export\Options; use PhpMyAdmin\Export\TemplateModel; diff --git a/tests/unit/Controllers/Table/ExportRowsControllerTest.php b/tests/unit/Controllers/Table/ExportRowsControllerTest.php index 3198d94c1f..248ca1a607 100644 --- a/tests/unit/Controllers/Table/ExportRowsControllerTest.php +++ b/tests/unit/Controllers/Table/ExportRowsControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Table; use PhpMyAdmin\Controllers\Table\ExportController; use PhpMyAdmin\Controllers\Table\ExportRowsController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Factory\ResponseFactory; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Tests\AbstractTestCase; diff --git a/tests/unit/Controllers/Table/GetFieldControllerTest.php b/tests/unit/Controllers/Table/GetFieldControllerTest.php index cdac604968..6462fa9106 100644 --- a/tests/unit/Controllers/Table/GetFieldControllerTest.php +++ b/tests/unit/Controllers/Table/GetFieldControllerTest.php @@ -8,7 +8,7 @@ use Fig\Http\Message\StatusCodeInterface; use PhpMyAdmin\Controllers\Table\GetFieldController; use PhpMyAdmin\Core; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Factory\ResponseFactory; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Tests\AbstractTestCase; diff --git a/tests/unit/Controllers/Table/GisVisualizationControllerTest.php b/tests/unit/Controllers/Table/GisVisualizationControllerTest.php index 72af092978..bbc2841acf 100644 --- a/tests/unit/Controllers/Table/GisVisualizationControllerTest.php +++ b/tests/unit/Controllers/Table/GisVisualizationControllerTest.php @@ -8,7 +8,7 @@ use Fig\Http\Message\StatusCodeInterface; use PhpMyAdmin\Controllers\Table\GisVisualizationController; use PhpMyAdmin\Core; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Http\Factory\ResponseFactory; use PhpMyAdmin\Http\Factory\ServerRequestFactory; diff --git a/tests/unit/Controllers/Table/ImportControllerTest.php b/tests/unit/Controllers/Table/ImportControllerTest.php index 9e94800df9..d972aa0aaa 100644 --- a/tests/unit/Controllers/Table/ImportControllerTest.php +++ b/tests/unit/Controllers/Table/ImportControllerTest.php @@ -10,7 +10,7 @@ use PhpMyAdmin\Config\PageSettings; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Table\ImportController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Encoding; use PhpMyAdmin\Http\Factory\ServerRequestFactory; diff --git a/tests/unit/Controllers/Table/IndexRenameControllerTest.php b/tests/unit/Controllers/Table/IndexRenameControllerTest.php index bb8f5fdd67..e62a18cd66 100644 --- a/tests/unit/Controllers/Table/IndexRenameControllerTest.php +++ b/tests/unit/Controllers/Table/IndexRenameControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Table; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\Table\IndexRenameController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Index; diff --git a/tests/unit/Controllers/Table/IndexesControllerTest.php b/tests/unit/Controllers/Table/IndexesControllerTest.php index 754118efe5..17e3ba32cd 100644 --- a/tests/unit/Controllers/Table/IndexesControllerTest.php +++ b/tests/unit/Controllers/Table/IndexesControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Table; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\Table\IndexesController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Html\MySQLDocumentation; diff --git a/tests/unit/Controllers/Table/Maintenance/AnalyzeControllerTest.php b/tests/unit/Controllers/Table/Maintenance/AnalyzeControllerTest.php index fd5d17ab32..8b110ce156 100644 --- a/tests/unit/Controllers/Table/Maintenance/AnalyzeControllerTest.php +++ b/tests/unit/Controllers/Table/Maintenance/AnalyzeControllerTest.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers\Table\Maintenance; use PhpMyAdmin\Controllers\Table\Maintenance\AnalyzeController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Table\Maintenance; use PhpMyAdmin\Tests\AbstractTestCase; diff --git a/tests/unit/Controllers/Table/Maintenance/CheckControllerTest.php b/tests/unit/Controllers/Table/Maintenance/CheckControllerTest.php index 5a311619b0..72ade86626 100644 --- a/tests/unit/Controllers/Table/Maintenance/CheckControllerTest.php +++ b/tests/unit/Controllers/Table/Maintenance/CheckControllerTest.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers\Table\Maintenance; use PhpMyAdmin\Controllers\Table\Maintenance\CheckController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Table\Maintenance; use PhpMyAdmin\Tests\AbstractTestCase; diff --git a/tests/unit/Controllers/Table/Maintenance/ChecksumControllerTest.php b/tests/unit/Controllers/Table/Maintenance/ChecksumControllerTest.php index 04ffa99b15..85a83aab1f 100644 --- a/tests/unit/Controllers/Table/Maintenance/ChecksumControllerTest.php +++ b/tests/unit/Controllers/Table/Maintenance/ChecksumControllerTest.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers\Table\Maintenance; use PhpMyAdmin\Controllers\Table\Maintenance\ChecksumController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Table\Maintenance; use PhpMyAdmin\Tests\AbstractTestCase; diff --git a/tests/unit/Controllers/Table/Maintenance/OptimizeControllerTest.php b/tests/unit/Controllers/Table/Maintenance/OptimizeControllerTest.php index f4144e4146..99ab3a58d9 100644 --- a/tests/unit/Controllers/Table/Maintenance/OptimizeControllerTest.php +++ b/tests/unit/Controllers/Table/Maintenance/OptimizeControllerTest.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers\Table\Maintenance; use PhpMyAdmin\Controllers\Table\Maintenance\OptimizeController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Table\Maintenance; use PhpMyAdmin\Tests\AbstractTestCase; diff --git a/tests/unit/Controllers/Table/Maintenance/RepairControllerTest.php b/tests/unit/Controllers/Table/Maintenance/RepairControllerTest.php index 0faff935eb..1ac5af54a1 100644 --- a/tests/unit/Controllers/Table/Maintenance/RepairControllerTest.php +++ b/tests/unit/Controllers/Table/Maintenance/RepairControllerTest.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers\Table\Maintenance; use PhpMyAdmin\Controllers\Table\Maintenance\RepairController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Table\Maintenance; use PhpMyAdmin\Tests\AbstractTestCase; diff --git a/tests/unit/Controllers/Table/Partition/AnalyzeControllerTest.php b/tests/unit/Controllers/Table/Partition/AnalyzeControllerTest.php index c948724edd..47f6528470 100644 --- a/tests/unit/Controllers/Table/Partition/AnalyzeControllerTest.php +++ b/tests/unit/Controllers/Table/Partition/AnalyzeControllerTest.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers\Table\Partition; use PhpMyAdmin\Controllers\Table\Partition\AnalyzeController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\Partitioning\Maintenance; diff --git a/tests/unit/Controllers/Table/Partition/CheckControllerTest.php b/tests/unit/Controllers/Table/Partition/CheckControllerTest.php index a8ae7544a4..1c193a4d62 100644 --- a/tests/unit/Controllers/Table/Partition/CheckControllerTest.php +++ b/tests/unit/Controllers/Table/Partition/CheckControllerTest.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers\Table\Partition; use PhpMyAdmin\Controllers\Table\Partition\CheckController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\Partitioning\Maintenance; diff --git a/tests/unit/Controllers/Table/Partition/DropControllerTest.php b/tests/unit/Controllers/Table/Partition/DropControllerTest.php index 4661ed568f..027b7276ce 100644 --- a/tests/unit/Controllers/Table/Partition/DropControllerTest.php +++ b/tests/unit/Controllers/Table/Partition/DropControllerTest.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers\Table\Partition; use PhpMyAdmin\Controllers\Table\Partition\DropController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\Partitioning\Maintenance; diff --git a/tests/unit/Controllers/Table/Partition/OptimizeControllerTest.php b/tests/unit/Controllers/Table/Partition/OptimizeControllerTest.php index b0ae29efd4..2d03434af7 100644 --- a/tests/unit/Controllers/Table/Partition/OptimizeControllerTest.php +++ b/tests/unit/Controllers/Table/Partition/OptimizeControllerTest.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers\Table\Partition; use PhpMyAdmin\Controllers\Table\Partition\OptimizeController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\Partitioning\Maintenance; diff --git a/tests/unit/Controllers/Table/Partition/RebuildControllerTest.php b/tests/unit/Controllers/Table/Partition/RebuildControllerTest.php index 3f7ee38b76..24c310adeb 100644 --- a/tests/unit/Controllers/Table/Partition/RebuildControllerTest.php +++ b/tests/unit/Controllers/Table/Partition/RebuildControllerTest.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers\Table\Partition; use PhpMyAdmin\Controllers\Table\Partition\RebuildController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\Partitioning\Maintenance; diff --git a/tests/unit/Controllers/Table/Partition/RepairControllerTest.php b/tests/unit/Controllers/Table/Partition/RepairControllerTest.php index 74257a7af8..b754492b4e 100644 --- a/tests/unit/Controllers/Table/Partition/RepairControllerTest.php +++ b/tests/unit/Controllers/Table/Partition/RepairControllerTest.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers\Table\Partition; use PhpMyAdmin\Controllers\Table\Partition\RepairController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\Partitioning\Maintenance; diff --git a/tests/unit/Controllers/Table/Partition/TruncateControllerTest.php b/tests/unit/Controllers/Table/Partition/TruncateControllerTest.php index 445fb2c5a8..f73162157d 100644 --- a/tests/unit/Controllers/Table/Partition/TruncateControllerTest.php +++ b/tests/unit/Controllers/Table/Partition/TruncateControllerTest.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers\Table\Partition; use PhpMyAdmin\Controllers\Table\Partition\TruncateController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\Partitioning\Maintenance; diff --git a/tests/unit/Controllers/Table/PrivilegesControllerTest.php b/tests/unit/Controllers/Table/PrivilegesControllerTest.php index a7a3d1a983..aaab464146 100644 --- a/tests/unit/Controllers/Table/PrivilegesControllerTest.php +++ b/tests/unit/Controllers/Table/PrivilegesControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Table; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\Table\PrivilegesController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Server\Privileges; use PhpMyAdmin\Tests\AbstractTestCase; diff --git a/tests/unit/Controllers/Table/RecentFavoriteControllerTest.php b/tests/unit/Controllers/Table/RecentFavoriteControllerTest.php index 2b07b087d8..9cdaefffd4 100644 --- a/tests/unit/Controllers/Table/RecentFavoriteControllerTest.php +++ b/tests/unit/Controllers/Table/RecentFavoriteControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Table; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Table\RecentFavoriteController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Favorites\RecentFavoriteTable; use PhpMyAdmin\Favorites\RecentFavoriteTables; use PhpMyAdmin\Favorites\TableType; diff --git a/tests/unit/Controllers/Table/RelationControllerTest.php b/tests/unit/Controllers/Table/RelationControllerTest.php index 4a3debe1c3..28766276c6 100644 --- a/tests/unit/Controllers/Table/RelationControllerTest.php +++ b/tests/unit/Controllers/Table/RelationControllerTest.php @@ -9,7 +9,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Table\RelationController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Table\Table; use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; diff --git a/tests/unit/Controllers/Table/ReplaceControllerTest.php b/tests/unit/Controllers/Table/ReplaceControllerTest.php index 2b763ca637..496bbf46b5 100644 --- a/tests/unit/Controllers/Table/ReplaceControllerTest.php +++ b/tests/unit/Controllers/Table/ReplaceControllerTest.php @@ -16,7 +16,7 @@ use PhpMyAdmin\Controllers\Table\ChangeController; use PhpMyAdmin\Controllers\Table\ReplaceController; use PhpMyAdmin\Controllers\Table\SqlController as TableSqlController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\FileListing; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\InsertEdit; diff --git a/tests/unit/Controllers/Table/SqlControllerTest.php b/tests/unit/Controllers/Table/SqlControllerTest.php index d0fdc6bbd8..d430adcbee 100644 --- a/tests/unit/Controllers/Table/SqlControllerTest.php +++ b/tests/unit/Controllers/Table/SqlControllerTest.php @@ -10,7 +10,7 @@ use PhpMyAdmin\Config\PageSettings; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Table\SqlController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Html\MySQLDocumentation; use PhpMyAdmin\Http\Factory\ServerRequestFactory; diff --git a/tests/unit/Controllers/Table/Structure/ChangeControllerTest.php b/tests/unit/Controllers/Table/Structure/ChangeControllerTest.php index 7ab0475455..81536a27bf 100644 --- a/tests/unit/Controllers/Table/Structure/ChangeControllerTest.php +++ b/tests/unit/Controllers/Table/Structure/ChangeControllerTest.php @@ -8,7 +8,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Table\Structure\ChangeController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Table\ColumnsDefinition; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\DbiDummy; diff --git a/tests/unit/Controllers/Table/Structure/SaveControllerTest.php b/tests/unit/Controllers/Table/Structure/SaveControllerTest.php index 94c711c3f6..a0d57f9d47 100644 --- a/tests/unit/Controllers/Table/Structure/SaveControllerTest.php +++ b/tests/unit/Controllers/Table/Structure/SaveControllerTest.php @@ -8,7 +8,7 @@ use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Table\Structure\SaveController; use PhpMyAdmin\Controllers\Table\StructureController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Factory\ResponseFactory; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Tests\AbstractTestCase; diff --git a/tests/unit/Controllers/Table/Structure/SpatialControllerTest.php b/tests/unit/Controllers/Table/Structure/SpatialControllerTest.php index 7c40a698a2..fdef5e7c3f 100644 --- a/tests/unit/Controllers/Table/Structure/SpatialControllerTest.php +++ b/tests/unit/Controllers/Table/Structure/SpatialControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Table\Structure; use PhpMyAdmin\Controllers\Table\Structure\SpatialController; use PhpMyAdmin\Controllers\Table\StructureController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Factory\ResponseFactory; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; diff --git a/tests/unit/Controllers/Table/Structure/UniqueControllerTest.php b/tests/unit/Controllers/Table/Structure/UniqueControllerTest.php index e3d2c5ccb3..687ccec7a5 100644 --- a/tests/unit/Controllers/Table/Structure/UniqueControllerTest.php +++ b/tests/unit/Controllers/Table/Structure/UniqueControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Table\Structure; use PhpMyAdmin\Controllers\Table\Structure\UniqueController; use PhpMyAdmin\Controllers\Table\StructureController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Factory\ResponseFactory; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; diff --git a/tests/unit/Controllers/Table/StructureControllerTest.php b/tests/unit/Controllers/Table/StructureControllerTest.php index 2f5512bc5c..f506ca2f19 100644 --- a/tests/unit/Controllers/Table/StructureControllerTest.php +++ b/tests/unit/Controllers/Table/StructureControllerTest.php @@ -10,7 +10,7 @@ use PhpMyAdmin\Config\PageSettings; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Table\StructureController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Index; diff --git a/tests/unit/Controllers/Table/TrackingControllerTest.php b/tests/unit/Controllers/Table/TrackingControllerTest.php index a3c894e309..76490009a6 100644 --- a/tests/unit/Controllers/Table/TrackingControllerTest.php +++ b/tests/unit/Controllers/Table/TrackingControllerTest.php @@ -10,7 +10,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Table\TrackingController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Http\Factory\ResponseFactory; use PhpMyAdmin\Http\Factory\ServerRequestFactory; diff --git a/tests/unit/Controllers/ThemeSetControllerTest.php b/tests/unit/Controllers/ThemeSetControllerTest.php index be80955d29..bc0a920b3e 100644 --- a/tests/unit/Controllers/ThemeSetControllerTest.php +++ b/tests/unit/Controllers/ThemeSetControllerTest.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Tests\Controllers; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\ThemeSetController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; diff --git a/tests/unit/Controllers/Transformation/OverviewControllerTest.php b/tests/unit/Controllers/Transformation/OverviewControllerTest.php index e9bf00b1c9..a4035224b6 100644 --- a/tests/unit/Controllers/Transformation/OverviewControllerTest.php +++ b/tests/unit/Controllers/Transformation/OverviewControllerTest.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Tests\Controllers\Transformation; use PhpMyAdmin\Controllers\Transformation\OverviewController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; diff --git a/tests/unit/Controllers/Triggers/IndexControllerTest.php b/tests/unit/Controllers/Triggers/IndexControllerTest.php index 8b398041b3..c56a29ae72 100644 --- a/tests/unit/Controllers/Triggers/IndexControllerTest.php +++ b/tests/unit/Controllers/Triggers/IndexControllerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Triggers; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\Triggers\IndexController; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Http\ServerRequest; diff --git a/tests/unit/Controllers/VersionCheckControllerTest.php b/tests/unit/Controllers/VersionCheckControllerTest.php index f0ea438c92..7c2de3c93c 100644 --- a/tests/unit/Controllers/VersionCheckControllerTest.php +++ b/tests/unit/Controllers/VersionCheckControllerTest.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Tests\Controllers; use Fig\Http\Message\StatusCodeInterface; use PhpMyAdmin\Controllers\VersionCheckController; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Factory\ResponseFactory; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Release; diff --git a/tests/unit/CoreTest.php b/tests/unit/CoreTest.php index 85ff21de6f..fcec7975ab 100644 --- a/tests/unit/CoreTest.php +++ b/tests/unit/CoreTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\Config; use PhpMyAdmin\Core; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Url; diff --git a/tests/unit/CreateAddFieldTest.php b/tests/unit/CreateAddFieldTest.php index 168d8b9072..11834c38bb 100644 --- a/tests/unit/CreateAddFieldTest.php +++ b/tests/unit/CreateAddFieldTest.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests; use PhpMyAdmin\CreateAddField; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\DataProvider; diff --git a/tests/unit/Database/CentralColumnsTest.php b/tests/unit/Database/CentralColumnsTest.php index 47c191bda5..f6f84e3ed4 100644 --- a/tests/unit/Database/CentralColumnsTest.php +++ b/tests/unit/Database/CentralColumnsTest.php @@ -10,8 +10,8 @@ use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationParameters; use PhpMyAdmin\Current; use PhpMyAdmin\Database\CentralColumns; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\DummyResult; diff --git a/tests/unit/Database/Designer/CommonTest.php b/tests/unit/Database/Designer/CommonTest.php index 3e07bbcda5..001dfbd3a4 100644 --- a/tests/unit/Database/Designer/CommonTest.php +++ b/tests/unit/Database/Designer/CommonTest.php @@ -9,8 +9,8 @@ use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationParameters; use PhpMyAdmin\Current; use PhpMyAdmin\Database\Designer\Common; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\DbiDummy; use PhpMyAdmin\Tests\Stubs\DummyResult; diff --git a/tests/unit/Database/DesignerTest.php b/tests/unit/Database/DesignerTest.php index 9508b1608d..98849b7751 100644 --- a/tests/unit/Database/DesignerTest.php +++ b/tests/unit/Database/DesignerTest.php @@ -8,7 +8,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationParameters; use PhpMyAdmin\Database\Designer; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\DummyResult; diff --git a/tests/unit/Database/EventsTest.php b/tests/unit/Database/EventsTest.php index d5d245b064..b6adc8a1ae 100644 --- a/tests/unit/Database/EventsTest.php +++ b/tests/unit/Database/EventsTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Database; use PhpMyAdmin\Config; use PhpMyAdmin\Current; use PhpMyAdmin\Database\Events; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Tests\AbstractTestCase; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\DataProvider; diff --git a/tests/unit/Database/RoutinesTest.php b/tests/unit/Database/RoutinesTest.php index 2e1b37c5ec..10094f666f 100644 --- a/tests/unit/Database/RoutinesTest.php +++ b/tests/unit/Database/RoutinesTest.php @@ -7,8 +7,8 @@ namespace PhpMyAdmin\Tests\Database; use PhpMyAdmin\Config; use PhpMyAdmin\Current; use PhpMyAdmin\Database\Routines; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Types; use PHPUnit\Framework\Attributes\CoversClass; diff --git a/tests/unit/Database/SearchTest.php b/tests/unit/Database/SearchTest.php index 6b7c8839fa..27a841fd35 100644 --- a/tests/unit/Database/SearchTest.php +++ b/tests/unit/Database/SearchTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Database; use PhpMyAdmin\Column; use PhpMyAdmin\Current; use PhpMyAdmin\Database\Search; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PHPUnit\Framework\Attributes\CoversClass; diff --git a/tests/unit/DatabaseInterfaceTest.php b/tests/unit/DatabaseInterfaceTest.php index 540fa09367..0e0e066bd8 100644 --- a/tests/unit/DatabaseInterfaceTest.php +++ b/tests/unit/DatabaseInterfaceTest.php @@ -9,8 +9,8 @@ use PhpMyAdmin\ColumnFull; use PhpMyAdmin\Config; use PhpMyAdmin\Config\Settings\Server; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Dbal\DbiExtension; use PhpMyAdmin\Dbal\ResultInterface; use PhpMyAdmin\Dbal\Statement; diff --git a/tests/unit/DbTableExistsTest.php b/tests/unit/DbTableExistsTest.php index c30a1b8235..863ef093bf 100644 --- a/tests/unit/DbTableExistsTest.php +++ b/tests/unit/DbTableExistsTest.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Identifiers\TableName; diff --git a/tests/unit/Dbal/DbiDummyTest.php b/tests/unit/Dbal/DbiDummyTest.php index ad0fcca7e2..d019ca94dd 100644 --- a/tests/unit/Dbal/DbiDummyTest.php +++ b/tests/unit/Dbal/DbiDummyTest.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Dbal; use PhpMyAdmin\Config; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Query\Utilities; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\DbiDummy; diff --git a/tests/unit/Display/ResultsTest.php b/tests/unit/Display/ResultsTest.php index 3aebdfc3cc..4cf8fffec1 100644 --- a/tests/unit/Display/ResultsTest.php +++ b/tests/unit/Display/ResultsTest.php @@ -8,7 +8,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationParameters; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Display\DeleteLinkEnum; use PhpMyAdmin\Display\DisplayParts; use PhpMyAdmin\Display\Results as DisplayResults; diff --git a/tests/unit/Engines/BdbTest.php b/tests/unit/Engines/BdbTest.php index 7536fd98e9..d20c497282 100644 --- a/tests/unit/Engines/BdbTest.php +++ b/tests/unit/Engines/BdbTest.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Engines; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Engines\Bdb; use PhpMyAdmin\Tests\AbstractTestCase; use PHPUnit\Framework\Attributes\CoversClass; diff --git a/tests/unit/Engines/BinlogTest.php b/tests/unit/Engines/BinlogTest.php index b6dca2179c..77771b1174 100644 --- a/tests/unit/Engines/BinlogTest.php +++ b/tests/unit/Engines/BinlogTest.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Engines; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Engines\Binlog; use PhpMyAdmin\Tests\AbstractTestCase; use PHPUnit\Framework\Attributes\CoversClass; diff --git a/tests/unit/Engines/InnodbTest.php b/tests/unit/Engines/InnodbTest.php index fff1160a2b..b1a66c4bdd 100644 --- a/tests/unit/Engines/InnodbTest.php +++ b/tests/unit/Engines/InnodbTest.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Engines; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Engines\Innodb; use PhpMyAdmin\Tests\AbstractTestCase; use PHPUnit\Framework\Attributes\CoversClass; diff --git a/tests/unit/Engines/MemoryTest.php b/tests/unit/Engines/MemoryTest.php index 2d15fcd47e..ad7e37c17a 100644 --- a/tests/unit/Engines/MemoryTest.php +++ b/tests/unit/Engines/MemoryTest.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Engines; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Engines\Memory; use PhpMyAdmin\Tests\AbstractTestCase; use PHPUnit\Framework\Attributes\CoversClass; diff --git a/tests/unit/Engines/MrgMyisamTest.php b/tests/unit/Engines/MrgMyisamTest.php index 889e3e6d92..91b36d31a5 100644 --- a/tests/unit/Engines/MrgMyisamTest.php +++ b/tests/unit/Engines/MrgMyisamTest.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Engines; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Engines\MrgMyisam; use PhpMyAdmin\Tests\AbstractTestCase; use PHPUnit\Framework\Attributes\CoversClass; diff --git a/tests/unit/Engines/MyisamTest.php b/tests/unit/Engines/MyisamTest.php index 553d2481c1..3b96cbd640 100644 --- a/tests/unit/Engines/MyisamTest.php +++ b/tests/unit/Engines/MyisamTest.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Engines; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Engines\Myisam; use PhpMyAdmin\Tests\AbstractTestCase; use PHPUnit\Framework\Attributes\CoversClass; diff --git a/tests/unit/Engines/NdbclusterTest.php b/tests/unit/Engines/NdbclusterTest.php index e9d39fcfac..327a46f4fd 100644 --- a/tests/unit/Engines/NdbclusterTest.php +++ b/tests/unit/Engines/NdbclusterTest.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Engines; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Engines\Ndbcluster; use PhpMyAdmin\Tests\AbstractTestCase; use PHPUnit\Framework\Attributes\CoversClass; diff --git a/tests/unit/Engines/PbxtTest.php b/tests/unit/Engines/PbxtTest.php index 2e06b53c3e..71025bbb1c 100644 --- a/tests/unit/Engines/PbxtTest.php +++ b/tests/unit/Engines/PbxtTest.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Engines; use PhpMyAdmin\Core; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Engines\Pbxt; use PhpMyAdmin\Tests\AbstractTestCase; use PHPUnit\Framework\Attributes\CoversClass; diff --git a/tests/unit/Engines/PerformanceSchemaTest.php b/tests/unit/Engines/PerformanceSchemaTest.php index 77d188e4a1..14515563d3 100644 --- a/tests/unit/Engines/PerformanceSchemaTest.php +++ b/tests/unit/Engines/PerformanceSchemaTest.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Engines; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Engines\PerformanceSchema; use PhpMyAdmin\Tests\AbstractTestCase; use PHPUnit\Framework\Attributes\CoversClass; diff --git a/tests/unit/Error/ErrorHandlerTest.php b/tests/unit/Error/ErrorHandlerTest.php index a8d971f438..d54a0d9f52 100644 --- a/tests/unit/Error/ErrorHandlerTest.php +++ b/tests/unit/Error/ErrorHandlerTest.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Tests\Error; use Exception; use PhpMyAdmin\Config; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Error\Error; use PhpMyAdmin\Error\ErrorHandler; use PhpMyAdmin\Exceptions\ExitException; diff --git a/tests/unit/Error/ErrorReportTest.php b/tests/unit/Error/ErrorReportTest.php index 91b31d01b4..8b88928d3e 100644 --- a/tests/unit/Error/ErrorReportTest.php +++ b/tests/unit/Error/ErrorReportTest.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Tests\Error; use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Error\Error; use PhpMyAdmin\Error\ErrorReport; use PhpMyAdmin\Http\RequestMethod; diff --git a/tests/unit/Export/ExportTest.php b/tests/unit/Export/ExportTest.php index 0205225baf..cc3e706080 100644 --- a/tests/unit/Export/ExportTest.php +++ b/tests/unit/Export/ExportTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Export; use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Export\Export; use PhpMyAdmin\FlashMessenger; use PhpMyAdmin\Identifiers\DatabaseName; diff --git a/tests/unit/Export/OptionsTest.php b/tests/unit/Export/OptionsTest.php index de2ed27dc7..afead0f6d5 100644 --- a/tests/unit/Export/OptionsTest.php +++ b/tests/unit/Export/OptionsTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Export; use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Encoding; use PhpMyAdmin\Export\Options; use PhpMyAdmin\Export\TemplateModel; diff --git a/tests/unit/FooterTest.php b/tests/unit/FooterTest.php index 26bc694bc5..d0a354cec5 100644 --- a/tests/unit/FooterTest.php +++ b/tests/unit/FooterTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests; use ArrayIterator; use PhpMyAdmin\Config; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Footer; use PhpMyAdmin\Template; use PHPUnit\Framework\Attributes\CoversClass; diff --git a/tests/unit/Gis/GisVisualizationTest.php b/tests/unit/Gis/GisVisualizationTest.php index b51fecd3ad..ad0316c45c 100644 --- a/tests/unit/Gis/GisVisualizationTest.php +++ b/tests/unit/Gis/GisVisualizationTest.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Gis; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Gis\Ds\ScaleData; use PhpMyAdmin\Gis\GisVisualization; use PhpMyAdmin\Gis\GisVisualizationSettings; diff --git a/tests/unit/HeaderTest.php b/tests/unit/HeaderTest.php index 4d851ae53d..19510e2782 100644 --- a/tests/unit/HeaderTest.php +++ b/tests/unit/HeaderTest.php @@ -9,7 +9,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Console; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Header; use PhpMyAdmin\Template; use PHPUnit\Framework\Attributes\CoversClass; diff --git a/tests/unit/Html/GeneratorTest.php b/tests/unit/Html/GeneratorTest.php index a82deae74d..80ea8c6913 100644 --- a/tests/unit/Html/GeneratorTest.php +++ b/tests/unit/Html/GeneratorTest.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Tests\Html; use PhpMyAdmin\Config; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Message; use PhpMyAdmin\Tests\AbstractTestCase; diff --git a/tests/unit/Http/Middleware/RecentTableHandlingTest.php b/tests/unit/Http/Middleware/RecentTableHandlingTest.php index c7a2d49aad..f89fe79e77 100644 --- a/tests/unit/Http/Middleware/RecentTableHandlingTest.php +++ b/tests/unit/Http/Middleware/RecentTableHandlingTest.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Http\Middleware; use PhpMyAdmin\Config; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Favorites\RecentFavoriteTable; use PhpMyAdmin\Favorites\RecentFavoriteTables; use PhpMyAdmin\Favorites\TableType; diff --git a/tests/unit/Http/Middleware/StatementHistoryTest.php b/tests/unit/Http/Middleware/StatementHistoryTest.php index d0603c7e66..46888259ba 100644 --- a/tests/unit/Http/Middleware/StatementHistoryTest.php +++ b/tests/unit/Http/Middleware/StatementHistoryTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Http\Middleware; use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Http\Middleware\StatementHistory; use PhpMyAdmin\Tests\AbstractTestCase; diff --git a/tests/unit/Import/ImportTest.php b/tests/unit/Import/ImportTest.php index 586c828f84..1fc5df4428 100644 --- a/tests/unit/Import/ImportTest.php +++ b/tests/unit/Import/ImportTest.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Tests\Import; use PhpMyAdmin\Config; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Import\ColumnType; use PhpMyAdmin\Import\DecimalSize; use PhpMyAdmin\Import\Import; diff --git a/tests/unit/InsertEditTest.php b/tests/unit/InsertEditTest.php index 3839764548..a0e202239a 100644 --- a/tests/unit/InsertEditTest.php +++ b/tests/unit/InsertEditTest.php @@ -9,7 +9,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Core; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Dbal\Warning; use PhpMyAdmin\EditField; use PhpMyAdmin\FileListing; diff --git a/tests/unit/MenuTest.php b/tests/unit/MenuTest.php index e24ad6ba5a..a41e9602b3 100644 --- a/tests/unit/MenuTest.php +++ b/tests/unit/MenuTest.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Menu; use PhpMyAdmin\Template; use PHPUnit\Framework\Attributes\CoversClass; diff --git a/tests/unit/Navigation/NavigationTest.php b/tests/unit/Navigation/NavigationTest.php index 1def9ee306..41f751a87c 100644 --- a/tests/unit/Navigation/NavigationTest.php +++ b/tests/unit/Navigation/NavigationTest.php @@ -8,7 +8,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationParameters; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Navigation\Navigation; use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; diff --git a/tests/unit/Navigation/NavigationTreeTest.php b/tests/unit/Navigation/NavigationTreeTest.php index bf854e134f..baa4424a3b 100644 --- a/tests/unit/Navigation/NavigationTreeTest.php +++ b/tests/unit/Navigation/NavigationTreeTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Navigation; use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Navigation\NavigationTree; use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; diff --git a/tests/unit/Navigation/Nodes/NodeDatabaseTest.php b/tests/unit/Navigation/Nodes/NodeDatabaseTest.php index c5f8228d28..34fb59bee2 100644 --- a/tests/unit/Navigation/Nodes/NodeDatabaseTest.php +++ b/tests/unit/Navigation/Nodes/NodeDatabaseTest.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Tests\Navigation\Nodes; use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\RelationParameters; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Navigation\Nodes\NodeDatabase; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\UserPrivileges; diff --git a/tests/unit/Navigation/Nodes/NodeTest.php b/tests/unit/Navigation/Nodes/NodeTest.php index f2b9b4386a..0fbddcff0c 100644 --- a/tests/unit/Navigation/Nodes/NodeTest.php +++ b/tests/unit/Navigation/Nodes/NodeTest.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Tests\Navigation\Nodes; use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\RelationParameters; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Navigation\Nodes\Node; use PhpMyAdmin\Navigation\NodeType; use PhpMyAdmin\Tests\AbstractTestCase; diff --git a/tests/unit/Navigation/Nodes/ObjectFetcherTest.php b/tests/unit/Navigation/Nodes/ObjectFetcherTest.php index e4410e8b62..f520533365 100644 --- a/tests/unit/Navigation/Nodes/ObjectFetcherTest.php +++ b/tests/unit/Navigation/Nodes/ObjectFetcherTest.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Navigation\Nodes; use PhpMyAdmin\Config; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Navigation\Nodes\ObjectFetcher; use PhpMyAdmin\Tests\AbstractTestCase; use PHPUnit\Framework\Attributes\CoversClass; diff --git a/tests/unit/NormalizationTest.php b/tests/unit/NormalizationTest.php index e1af278153..6706d4e3ec 100644 --- a/tests/unit/NormalizationTest.php +++ b/tests/unit/NormalizationTest.php @@ -8,8 +8,8 @@ use PhpMyAdmin\ColumnFull; use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Message; use PhpMyAdmin\Normalization; use PhpMyAdmin\Template; diff --git a/tests/unit/OperationsTest.php b/tests/unit/OperationsTest.php index f8a6c1b611..f8ca3b145b 100644 --- a/tests/unit/OperationsTest.php +++ b/tests/unit/OperationsTest.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Operations; use PhpMyAdmin\Table\TableMover; use PhpMyAdmin\Tests\Stubs\DbiDummy; diff --git a/tests/unit/ParseAnalyzeTest.php b/tests/unit/ParseAnalyzeTest.php index 8019facfdb..3c931d2c8b 100644 --- a/tests/unit/ParseAnalyzeTest.php +++ b/tests/unit/ParseAnalyzeTest.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\ParseAnalyze; use PhpMyAdmin\ResponseRenderer; use PHPUnit\Framework\Attributes\CoversClass; diff --git a/tests/unit/Partitioning/PartitionTest.php b/tests/unit/Partitioning/PartitionTest.php index 10e33d7ac1..e7178fde30 100644 --- a/tests/unit/Partitioning/PartitionTest.php +++ b/tests/unit/Partitioning/PartitionTest.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Partitioning; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Partitioning\Partition; use PhpMyAdmin\Tests\AbstractTestCase; use PHPUnit\Framework\Attributes\CoversClass; diff --git a/tests/unit/Plugins/Auth/AuthenticationConfigTest.php b/tests/unit/Plugins/Auth/AuthenticationConfigTest.php index 0c04236868..14be23378a 100644 --- a/tests/unit/Plugins/Auth/AuthenticationConfigTest.php +++ b/tests/unit/Plugins/Auth/AuthenticationConfigTest.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Tests\Plugins\Auth; use PhpMyAdmin\Config; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Exceptions\AuthenticationFailure; use PhpMyAdmin\Plugins\Auth\AuthenticationConfig; use PhpMyAdmin\ResponseRenderer; diff --git a/tests/unit/Plugins/Auth/AuthenticationCookieTest.php b/tests/unit/Plugins/Auth/AuthenticationCookieTest.php index 593c5a32e7..acdfc227c8 100644 --- a/tests/unit/Plugins/Auth/AuthenticationCookieTest.php +++ b/tests/unit/Plugins/Auth/AuthenticationCookieTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Plugins\Auth; use Fig\Http\Message\StatusCodeInterface; use PhpMyAdmin\Config; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Exceptions\AuthenticationFailure; use PhpMyAdmin\Exceptions\ExitException; use PhpMyAdmin\Plugins\Auth\AuthenticationCookie; diff --git a/tests/unit/Plugins/Auth/AuthenticationHttpTest.php b/tests/unit/Plugins/Auth/AuthenticationHttpTest.php index 5044ceda3e..868d7698b8 100644 --- a/tests/unit/Plugins/Auth/AuthenticationHttpTest.php +++ b/tests/unit/Plugins/Auth/AuthenticationHttpTest.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Tests\Plugins\Auth; use PhpMyAdmin\Config; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Exceptions\AuthenticationFailure; use PhpMyAdmin\Plugins\Auth\AuthenticationHttp; use PhpMyAdmin\ResponseRenderer; diff --git a/tests/unit/Plugins/Auth/AuthenticationSignonTest.php b/tests/unit/Plugins/Auth/AuthenticationSignonTest.php index 8ce5fb1e29..2d49da7c87 100644 --- a/tests/unit/Plugins/Auth/AuthenticationSignonTest.php +++ b/tests/unit/Plugins/Auth/AuthenticationSignonTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Plugins\Auth; use PhpMyAdmin\Config; use PhpMyAdmin\Config\Settings\Server; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Exceptions\AuthenticationFailure; use PhpMyAdmin\Exceptions\ExitException; use PhpMyAdmin\Plugins\Auth\AuthenticationSignon; diff --git a/tests/unit/Plugins/AuthenticationPluginTest.php b/tests/unit/Plugins/AuthenticationPluginTest.php index a76b5f2bd0..e9a92fe7d2 100644 --- a/tests/unit/Plugins/AuthenticationPluginTest.php +++ b/tests/unit/Plugins/AuthenticationPluginTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Plugins; use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationParameters; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Exceptions\AuthenticationFailure; use PhpMyAdmin\Exceptions\ExitException; use PhpMyAdmin\Http\Factory\ServerRequestFactory; diff --git a/tests/unit/Plugins/Export/ExportCodegenTest.php b/tests/unit/Plugins/Export/ExportCodegenTest.php index 0dc1de3150..7a68c2a317 100644 --- a/tests/unit/Plugins/Export/ExportCodegenTest.php +++ b/tests/unit/Plugins/Export/ExportCodegenTest.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Plugins\Export; use PhpMyAdmin\ConfigStorage\Relation; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Export\Export; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Plugins\Export\ExportCodegen; diff --git a/tests/unit/Plugins/Export/ExportCsvTest.php b/tests/unit/Plugins/Export/ExportCsvTest.php index 05bfe466fd..1b400b86fd 100644 --- a/tests/unit/Plugins/Export/ExportCsvTest.php +++ b/tests/unit/Plugins/Export/ExportCsvTest.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Tests\Plugins\Export; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Export\Export; use PhpMyAdmin\Plugins\Export\ExportCsv; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; diff --git a/tests/unit/Plugins/Export/ExportExcelTest.php b/tests/unit/Plugins/Export/ExportExcelTest.php index c388b9ac7b..8a1b3734c8 100644 --- a/tests/unit/Plugins/Export/ExportExcelTest.php +++ b/tests/unit/Plugins/Export/ExportExcelTest.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Plugins\Export; use PhpMyAdmin\ConfigStorage\Relation; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Export\Export; use PhpMyAdmin\Plugins\Export\ExportCsv; use PhpMyAdmin\Plugins\Export\ExportExcel; diff --git a/tests/unit/Plugins/Export/ExportHtmlwordTest.php b/tests/unit/Plugins/Export/ExportHtmlwordTest.php index aa0c54d0f1..aa809d58cb 100644 --- a/tests/unit/Plugins/Export/ExportHtmlwordTest.php +++ b/tests/unit/Plugins/Export/ExportHtmlwordTest.php @@ -9,7 +9,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationParameters; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Export\Export; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Identifiers\TableName; diff --git a/tests/unit/Plugins/Export/ExportJsonTest.php b/tests/unit/Plugins/Export/ExportJsonTest.php index 10658278a5..853be4f444 100644 --- a/tests/unit/Plugins/Export/ExportJsonTest.php +++ b/tests/unit/Plugins/Export/ExportJsonTest.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Plugins\Export; use PhpMyAdmin\ConfigStorage\Relation; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Export\Export; use PhpMyAdmin\Plugins\Export\ExportJson; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; diff --git a/tests/unit/Plugins/Export/ExportLatexTest.php b/tests/unit/Plugins/Export/ExportLatexTest.php index 011b4352c1..e7e4a509b8 100644 --- a/tests/unit/Plugins/Export/ExportLatexTest.php +++ b/tests/unit/Plugins/Export/ExportLatexTest.php @@ -9,7 +9,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationParameters; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Export\Export; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Plugins\Export\ExportLatex; diff --git a/tests/unit/Plugins/Export/ExportMediawikiTest.php b/tests/unit/Plugins/Export/ExportMediawikiTest.php index 1a74eee5eb..b75f6d0e5b 100644 --- a/tests/unit/Plugins/Export/ExportMediawikiTest.php +++ b/tests/unit/Plugins/Export/ExportMediawikiTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Plugins\Export; use PhpMyAdmin\Column; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Export\Export; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Plugins\Export\ExportMediawiki; diff --git a/tests/unit/Plugins/Export/ExportOdsTest.php b/tests/unit/Plugins/Export/ExportOdsTest.php index 86bd60a776..31baed9b30 100644 --- a/tests/unit/Plugins/Export/ExportOdsTest.php +++ b/tests/unit/Plugins/Export/ExportOdsTest.php @@ -5,8 +5,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Plugins\Export; use PhpMyAdmin\ConfigStorage\Relation; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Export\Export; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Plugins\Export\ExportOds; diff --git a/tests/unit/Plugins/Export/ExportOdtTest.php b/tests/unit/Plugins/Export/ExportOdtTest.php index f698594bc4..3f3dd39c44 100644 --- a/tests/unit/Plugins/Export/ExportOdtTest.php +++ b/tests/unit/Plugins/Export/ExportOdtTest.php @@ -8,8 +8,8 @@ use PhpMyAdmin\Column; use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationParameters; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Export\Export; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Identifiers\TableName; diff --git a/tests/unit/Plugins/Export/ExportPdfTest.php b/tests/unit/Plugins/Export/ExportPdfTest.php index b4e202b78d..d8413e875d 100644 --- a/tests/unit/Plugins/Export/ExportPdfTest.php +++ b/tests/unit/Plugins/Export/ExportPdfTest.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Plugins\Export; use PhpMyAdmin\ConfigStorage\Relation; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Export\Export; use PhpMyAdmin\Plugins\Export\ExportPdf; use PhpMyAdmin\Plugins\Export\Helpers\Pdf; diff --git a/tests/unit/Plugins/Export/ExportPhparrayTest.php b/tests/unit/Plugins/Export/ExportPhparrayTest.php index 8a417df434..2b4c63344c 100644 --- a/tests/unit/Plugins/Export/ExportPhparrayTest.php +++ b/tests/unit/Plugins/Export/ExportPhparrayTest.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Tests\Plugins\Export; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Export\Export; use PhpMyAdmin\Plugins\Export\ExportPhparray; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; diff --git a/tests/unit/Plugins/Export/ExportSqlTest.php b/tests/unit/Plugins/Export/ExportSqlTest.php index d570e85757..96c45c4fd1 100644 --- a/tests/unit/Plugins/Export/ExportSqlTest.php +++ b/tests/unit/Plugins/Export/ExportSqlTest.php @@ -9,8 +9,8 @@ use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationParameters; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Export\Export; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Plugins\Export\ExportSql; diff --git a/tests/unit/Plugins/Export/ExportTexytextTest.php b/tests/unit/Plugins/Export/ExportTexytextTest.php index ca095f730e..375236f003 100644 --- a/tests/unit/Plugins/Export/ExportTexytextTest.php +++ b/tests/unit/Plugins/Export/ExportTexytextTest.php @@ -10,8 +10,8 @@ use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationParameters; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Export\Export; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Identifiers\TableName; diff --git a/tests/unit/Plugins/Export/ExportXmlTest.php b/tests/unit/Plugins/Export/ExportXmlTest.php index 135fa48ea6..e663074b17 100644 --- a/tests/unit/Plugins/Export/ExportXmlTest.php +++ b/tests/unit/Plugins/Export/ExportXmlTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Plugins\Export; use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Export\Export; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Plugins\Export\ExportXml; diff --git a/tests/unit/Plugins/Export/ExportYamlTest.php b/tests/unit/Plugins/Export/ExportYamlTest.php index 753adfc84d..b1e98c5722 100644 --- a/tests/unit/Plugins/Export/ExportYamlTest.php +++ b/tests/unit/Plugins/Export/ExportYamlTest.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Tests\Plugins\Export; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Export\Export; use PhpMyAdmin\Plugins\Export\ExportYaml; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; diff --git a/tests/unit/Plugins/Import/ImportCsvTest.php b/tests/unit/Plugins/Import/ImportCsvTest.php index d6bd72db4f..356741044e 100644 --- a/tests/unit/Plugins/Import/ImportCsvTest.php +++ b/tests/unit/Plugins/Import/ImportCsvTest.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Plugins\Import; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\File; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Import\ImportSettings; diff --git a/tests/unit/Plugins/Import/ImportLdiTest.php b/tests/unit/Plugins/Import/ImportLdiTest.php index a8b0b6c134..4ad53495db 100644 --- a/tests/unit/Plugins/Import/ImportLdiTest.php +++ b/tests/unit/Plugins/Import/ImportLdiTest.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Tests\Plugins\Import; use PhpMyAdmin\Config; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\File; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Import\ImportSettings; diff --git a/tests/unit/Plugins/Import/ImportMediawikiTest.php b/tests/unit/Plugins/Import/ImportMediawikiTest.php index e6016ba44d..51cfcff10f 100644 --- a/tests/unit/Plugins/Import/ImportMediawikiTest.php +++ b/tests/unit/Plugins/Import/ImportMediawikiTest.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Plugins\Import; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\File; use PhpMyAdmin\Import\ImportSettings; use PhpMyAdmin\Plugins\Import\ImportMediawiki; diff --git a/tests/unit/Plugins/Import/ImportOdsTest.php b/tests/unit/Plugins/Import/ImportOdsTest.php index 3393b381ad..4e4a0c4ec8 100644 --- a/tests/unit/Plugins/Import/ImportOdsTest.php +++ b/tests/unit/Plugins/Import/ImportOdsTest.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Tests\Plugins\Import; use PhpMyAdmin\Config; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\File; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Import\ImportSettings; diff --git a/tests/unit/Plugins/Import/ImportShpTest.php b/tests/unit/Plugins/Import/ImportShpTest.php index b055f888c4..a96db5df6d 100644 --- a/tests/unit/Plugins/Import/ImportShpTest.php +++ b/tests/unit/Plugins/Import/ImportShpTest.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Plugins\Import; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\File; use PhpMyAdmin\Import\ImportSettings; use PhpMyAdmin\Plugins\Import\ImportShp; diff --git a/tests/unit/Plugins/Import/ImportSqlTest.php b/tests/unit/Plugins/Import/ImportSqlTest.php index 44eb9995b5..98c83e769e 100644 --- a/tests/unit/Plugins/Import/ImportSqlTest.php +++ b/tests/unit/Plugins/Import/ImportSqlTest.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Plugins\Import; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\File; use PhpMyAdmin\Import\ImportSettings; use PhpMyAdmin\Plugins\Import\ImportSql; diff --git a/tests/unit/Plugins/Import/ImportXmlTest.php b/tests/unit/Plugins/Import/ImportXmlTest.php index a19c87519c..ccc48b1d82 100644 --- a/tests/unit/Plugins/Import/ImportXmlTest.php +++ b/tests/unit/Plugins/Import/ImportXmlTest.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Plugins\Import; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\File; use PhpMyAdmin\Import\ImportSettings; use PhpMyAdmin\Plugins\Import\ImportXml; diff --git a/tests/unit/Plugins/Schema/DiaRelationSchemaTest.php b/tests/unit/Plugins/Schema/DiaRelationSchemaTest.php index ca888d1924..9e21dfcdfe 100644 --- a/tests/unit/Plugins/Schema/DiaRelationSchemaTest.php +++ b/tests/unit/Plugins/Schema/DiaRelationSchemaTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Plugins\Schema; use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Plugins\Schema\Dia\DiaRelationSchema; use PhpMyAdmin\Tests\AbstractTestCase; diff --git a/tests/unit/Plugins/Schema/EpsRelationSchemaTest.php b/tests/unit/Plugins/Schema/EpsRelationSchemaTest.php index 7502bfedc0..1e30cd2fe4 100644 --- a/tests/unit/Plugins/Schema/EpsRelationSchemaTest.php +++ b/tests/unit/Plugins/Schema/EpsRelationSchemaTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Plugins\Schema; use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Plugins\Schema\Eps\EpsRelationSchema; use PhpMyAdmin\Tests\AbstractTestCase; diff --git a/tests/unit/Plugins/Schema/PdfRelationSchemaTest.php b/tests/unit/Plugins/Schema/PdfRelationSchemaTest.php index 8bd0da991b..51f1c7a146 100644 --- a/tests/unit/Plugins/Schema/PdfRelationSchemaTest.php +++ b/tests/unit/Plugins/Schema/PdfRelationSchemaTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Plugins\Schema; use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Plugins\Schema\Pdf\PdfRelationSchema; use PhpMyAdmin\Tests\AbstractTestCase; diff --git a/tests/unit/Plugins/Schema/SvgRelationSchemaTest.php b/tests/unit/Plugins/Schema/SvgRelationSchemaTest.php index e55a6b6160..d930dfcfae 100644 --- a/tests/unit/Plugins/Schema/SvgRelationSchemaTest.php +++ b/tests/unit/Plugins/Schema/SvgRelationSchemaTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Plugins\Schema; use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Plugins\Schema\Svg\SvgRelationSchema; use PhpMyAdmin\Tests\AbstractTestCase; diff --git a/tests/unit/Plugins/TwoFactor/WebAuthnTest.php b/tests/unit/Plugins/TwoFactor/WebAuthnTest.php index 32117cf6b5..0bf612b656 100644 --- a/tests/unit/Plugins/TwoFactor/WebAuthnTest.php +++ b/tests/unit/Plugins/TwoFactor/WebAuthnTest.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Plugins\TwoFactor; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Plugins\TwoFactor\WebAuthn; use PhpMyAdmin\Plugins\TwoFactorPlugin; diff --git a/tests/unit/PluginsTest.php b/tests/unit/PluginsTest.php index 8d5a84155b..174775799f 100644 --- a/tests/unit/PluginsTest.php +++ b/tests/unit/PluginsTest.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Export\Export; use PhpMyAdmin\Import\ImportSettings; use PhpMyAdmin\Plugins; diff --git a/tests/unit/ProfilingTest.php b/tests/unit/ProfilingTest.php index 1d697aae60..2ba3eb522a 100644 --- a/tests/unit/ProfilingTest.php +++ b/tests/unit/ProfilingTest.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Profiling; use PhpMyAdmin\Utils\SessionCache; use PHPUnit\Framework\Attributes\CoversClass; diff --git a/tests/unit/Query/CompatibilityTest.php b/tests/unit/Query/CompatibilityTest.php index 976f7ad4c2..00554e3ab6 100644 --- a/tests/unit/Query/CompatibilityTest.php +++ b/tests/unit/Query/CompatibilityTest.php @@ -4,8 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Query; -use PhpMyAdmin\DatabaseInterface; -use PhpMyAdmin\Dbal\DbalInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Query\Compatibility; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\DataProvider; @@ -64,11 +63,11 @@ class CompatibilityTest extends TestCase #[DataProvider('showBinLogStatusProvider')] public function testGetShowBinLogStatusStmt(string $serverName, int $version, string $expected): void { - $dbal = self::createStub(DbalInterface::class); - $dbal->method('isMySql')->willReturn($serverName === 'MySQL'); - $dbal->method('isMariaDB')->willReturn($serverName === 'MariaDB'); - $dbal->method('getVersion')->willReturn($version); - self::assertSame($expected, Compatibility::getShowBinLogStatusStmt($dbal)); + $dbi = self::createStub(DatabaseInterface::class); + $dbi->method('isMySql')->willReturn($serverName === 'MySQL'); + $dbi->method('isMariaDB')->willReturn($serverName === 'MariaDB'); + $dbi->method('getVersion')->willReturn($version); + self::assertSame($expected, Compatibility::getShowBinLogStatusStmt($dbi)); } /** @return iterable */ diff --git a/tests/unit/Replication/ReplicationGuiTest.php b/tests/unit/Replication/ReplicationGuiTest.php index 350323dbce..f22b4c7130 100644 --- a/tests/unit/Replication/ReplicationGuiTest.php +++ b/tests/unit/Replication/ReplicationGuiTest.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Tests\Replication; use PhpMyAdmin\Config; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Replication\Replication; use PhpMyAdmin\Replication\ReplicationGui; use PhpMyAdmin\Replication\ReplicationInfo; diff --git a/tests/unit/ResponseRendererTest.php b/tests/unit/ResponseRendererTest.php index 545a9d729e..fda2faec40 100644 --- a/tests/unit/ResponseRendererTest.php +++ b/tests/unit/ResponseRendererTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests; use Fig\Http\Message\StatusCodeInterface; use PhpMyAdmin\Config; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Header; use PhpMyAdmin\Html\MySQLDocumentation; use PhpMyAdmin\Message; diff --git a/tests/unit/Server/PluginsTest.php b/tests/unit/Server/PluginsTest.php index c8441faf16..195860fddf 100644 --- a/tests/unit/Server/PluginsTest.php +++ b/tests/unit/Server/PluginsTest.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Server; use PhpMyAdmin\Config; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Server\Plugins; use PhpMyAdmin\Tests\AbstractTestCase; use PHPUnit\Framework\Attributes\CoversClass; diff --git a/tests/unit/Server/Privileges/AccountLockingTest.php b/tests/unit/Server/Privileges/AccountLockingTest.php index d784735110..181a605cfc 100644 --- a/tests/unit/Server/Privileges/AccountLockingTest.php +++ b/tests/unit/Server/Privileges/AccountLockingTest.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Server\Privileges; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Server\Privileges\AccountLocking; use PhpMyAdmin\Tests\Stubs\DummyResult; use PHPUnit\Framework\Attributes\CoversClass; diff --git a/tests/unit/Server/PrivilegesTest.php b/tests/unit/Server/PrivilegesTest.php index fbc4755ebe..dd5e73dda7 100644 --- a/tests/unit/Server/PrivilegesTest.php +++ b/tests/unit/Server/PrivilegesTest.php @@ -8,8 +8,8 @@ use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationCleanup; use PhpMyAdmin\ConfigStorage\RelationParameters; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Dbal\ResultInterface; use PhpMyAdmin\Dbal\Statement; use PhpMyAdmin\Html\Generator; diff --git a/tests/unit/SqlQueryFormTest.php b/tests/unit/SqlQueryFormTest.php index 90119c5a6e..2459399fc2 100644 --- a/tests/unit/SqlQueryFormTest.php +++ b/tests/unit/SqlQueryFormTest.php @@ -9,7 +9,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationParameters; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Encoding; use PhpMyAdmin\Html\MySQLDocumentation; use PhpMyAdmin\SqlQueryForm; diff --git a/tests/unit/SqlTest.php b/tests/unit/SqlTest.php index baa37849bc..fd61c96f7e 100644 --- a/tests/unit/SqlTest.php +++ b/tests/unit/SqlTest.php @@ -9,7 +9,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationCleanup; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\ParseAnalyze; use PhpMyAdmin\Sql; use PhpMyAdmin\Template; diff --git a/tests/unit/StorageEngineTest.php b/tests/unit/StorageEngineTest.php index 104a3e11ac..4e843eda01 100644 --- a/tests/unit/StorageEngineTest.php +++ b/tests/unit/StorageEngineTest.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests; use PhpMyAdmin\Cache; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Engines\Bdb; use PhpMyAdmin\Engines\Berkeleydb; use PhpMyAdmin\Engines\Binlog; diff --git a/tests/unit/Stubs/ResponseRenderer.php b/tests/unit/Stubs/ResponseRenderer.php index e073928eca..0588983596 100644 --- a/tests/unit/Stubs/ResponseRenderer.php +++ b/tests/unit/Stubs/ResponseRenderer.php @@ -15,7 +15,7 @@ use PhpMyAdmin\Bookmarks\BookmarkRepository; use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Console; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Error\ErrorHandler; use PhpMyAdmin\Footer; use PhpMyAdmin\Header; diff --git a/tests/unit/SystemDatabaseTest.php b/tests/unit/SystemDatabaseTest.php index e698db264c..c8a9816e68 100644 --- a/tests/unit/SystemDatabaseTest.php +++ b/tests/unit/SystemDatabaseTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationParameters; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\SystemColumn; use PhpMyAdmin\SystemDatabase; use PhpMyAdmin\Tests\Stubs\DummyResult; diff --git a/tests/unit/Table/ColumnsDefinitionTest.php b/tests/unit/Table/ColumnsDefinitionTest.php index 35deb71e75..b6c6dec9c9 100644 --- a/tests/unit/Table/ColumnsDefinitionTest.php +++ b/tests/unit/Table/ColumnsDefinitionTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Table; use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Table\ColumnsDefinition; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\FieldHelper; diff --git a/tests/unit/Table/IndexesTest.php b/tests/unit/Table/IndexesTest.php index 1908a1a8c6..35362c5f29 100644 --- a/tests/unit/Table/IndexesTest.php +++ b/tests/unit/Table/IndexesTest.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Table; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Index; use PhpMyAdmin\Message; use PhpMyAdmin\Table\Indexes; diff --git a/tests/unit/Table/SearchTest.php b/tests/unit/Table/SearchTest.php index 60ebce5598..a0b2a87416 100644 --- a/tests/unit/Table/SearchTest.php +++ b/tests/unit/Table/SearchTest.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Table; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Table\Search; use PhpMyAdmin\Tests\AbstractTestCase; use PHPUnit\Framework\Attributes\CoversClass; diff --git a/tests/unit/Table/TableTest.php b/tests/unit/Table/TableTest.php index 974a952568..fb74556341 100644 --- a/tests/unit/Table/TableTest.php +++ b/tests/unit/Table/TableTest.php @@ -8,8 +8,8 @@ use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationParameters; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\ListDatabase; use PhpMyAdmin\Query\Cache; use PhpMyAdmin\SqlParser\Context; diff --git a/tests/unit/Tracking/TrackerTest.php b/tests/unit/Tracking/TrackerTest.php index 2b83d5f1c7..62ff3225da 100644 --- a/tests/unit/Tracking/TrackerTest.php +++ b/tests/unit/Tracking/TrackerTest.php @@ -9,8 +9,8 @@ use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationParameters; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\DummyResult; use PhpMyAdmin\Tracking\Tracker; diff --git a/tests/unit/Tracking/TrackingCheckerTest.php b/tests/unit/Tracking/TrackingCheckerTest.php index a8e74e7f31..f3731514c7 100644 --- a/tests/unit/Tracking/TrackingCheckerTest.php +++ b/tests/unit/Tracking/TrackingCheckerTest.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Tests\Tracking; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationParameters; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tracking\TrackedTable; diff --git a/tests/unit/Tracking/TrackingTest.php b/tests/unit/Tracking/TrackingTest.php index c8dc77ade1..e7272527d9 100644 --- a/tests/unit/Tracking/TrackingTest.php +++ b/tests/unit/Tracking/TrackingTest.php @@ -10,7 +10,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationParameters; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\SqlQueryForm; use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; diff --git a/tests/unit/TransformationsTest.php b/tests/unit/TransformationsTest.php index 65bf7501a4..669cabc3ff 100644 --- a/tests/unit/TransformationsTest.php +++ b/tests/unit/TransformationsTest.php @@ -8,7 +8,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationParameters; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Tests\Stubs\DummyResult; use PhpMyAdmin\Transformations; use PHPUnit\Framework\Attributes\CoversClass; diff --git a/tests/unit/Triggers/TriggersTest.php b/tests/unit/Triggers/TriggersTest.php index 2c3ac4bd75..77ab0b3023 100644 --- a/tests/unit/Triggers/TriggersTest.php +++ b/tests/unit/Triggers/TriggersTest.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Tests\Triggers; use PhpMyAdmin\Config; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Triggers\Trigger; use PhpMyAdmin\Triggers\Triggers; diff --git a/tests/unit/TwoFactorTest.php b/tests/unit/TwoFactorTest.php index 3ccaddedeb..72e5a51135 100644 --- a/tests/unit/TwoFactorTest.php +++ b/tests/unit/TwoFactorTest.php @@ -10,7 +10,7 @@ use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationParameters; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Plugins\TwoFactor\Application; diff --git a/tests/unit/TypesByDatabaseVersionTest.php b/tests/unit/TypesByDatabaseVersionTest.php index c6af75be42..b20c4be4d9 100644 --- a/tests/unit/TypesByDatabaseVersionTest.php +++ b/tests/unit/TypesByDatabaseVersionTest.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\TypeClass; use PhpMyAdmin\Types; use PHPUnit\Framework\Attributes\CoversClass; diff --git a/tests/unit/TypesTest.php b/tests/unit/TypesTest.php index bc39dfab96..999c75e38d 100644 --- a/tests/unit/TypesTest.php +++ b/tests/unit/TypesTest.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\TypeClass; use PhpMyAdmin\Types; use PHPUnit\Framework\Attributes\CoversClass; diff --git a/tests/unit/UniqueConditionTest.php b/tests/unit/UniqueConditionTest.php index e890b1347d..3b1e0dc044 100644 --- a/tests/unit/UniqueConditionTest.php +++ b/tests/unit/UniqueConditionTest.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\Config; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\FieldMetadata; use PhpMyAdmin\UniqueCondition; use PHPUnit\Framework\Attributes\CoversClass; diff --git a/tests/unit/UserPreferencesTest.php b/tests/unit/UserPreferencesTest.php index 6fbb5d25c2..1cfe597622 100644 --- a/tests/unit/UserPreferencesTest.php +++ b/tests/unit/UserPreferencesTest.php @@ -9,8 +9,8 @@ use PhpMyAdmin\Config\ConfigFile; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationParameters; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\ConnectionType; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; diff --git a/tests/unit/UtilTest.php b/tests/unit/UtilTest.php index 2ec0902f8a..bb1e069eaa 100644 --- a/tests/unit/UtilTest.php +++ b/tests/unit/UtilTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests; use DateTimeImmutable; use PhpMyAdmin\Config; use PhpMyAdmin\Current; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\MoTranslator\Loader; use PhpMyAdmin\SqlParser\Context; diff --git a/tests/unit/Utils/ForeignKeyTest.php b/tests/unit/Utils/ForeignKeyTest.php index 9490ee991a..395426324c 100644 --- a/tests/unit/Utils/ForeignKeyTest.php +++ b/tests/unit/Utils/ForeignKeyTest.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Utils; use PhpMyAdmin\Config; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Utils\ForeignKey; use PHPUnit\Framework\Attributes\CoversClass; @@ -87,8 +87,7 @@ class ForeignKeyTest extends AbstractTestCase $dbi->expects(self::once()) ->method('setVariable') - ->with('FOREIGN_KEY_CHECKS', $setVariableParam) - ->willReturn(true); + ->with('FOREIGN_KEY_CHECKS', $setVariableParam); self::assertTrue(ForeignKey::handleDisableCheckInit()); } @@ -109,8 +108,7 @@ class ForeignKeyTest extends AbstractTestCase $dbi->expects(self::once()) ->method('setVariable') - ->with('FOREIGN_KEY_CHECKS', $setVariableParam) - ->willReturn(true); + ->with('FOREIGN_KEY_CHECKS', $setVariableParam); self::assertFalse(ForeignKey::handleDisableCheckInit()); } @@ -131,8 +129,7 @@ class ForeignKeyTest extends AbstractTestCase $dbi->expects(self::once()) ->method('setVariable') - ->with('FOREIGN_KEY_CHECKS', $setVariableParam) - ->willReturn(true); + ->with('FOREIGN_KEY_CHECKS', $setVariableParam); ForeignKey::handleDisableCheckCleanup($checkValue); } diff --git a/tests/unit/Utils/GisTest.php b/tests/unit/Utils/GisTest.php index 6b27bdfa11..90ef1b35ba 100644 --- a/tests/unit/Utils/GisTest.php +++ b/tests/unit/Utils/GisTest.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Utils; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\DummyResult; use PhpMyAdmin\Utils\Gis; diff --git a/tests/unit/Utils/HttpRequestTest.php b/tests/unit/Utils/HttpRequestTest.php index e997cba62f..7eafbd8e14 100644 --- a/tests/unit/Utils/HttpRequestTest.php +++ b/tests/unit/Utils/HttpRequestTest.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Utils; -use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\RequestMethod; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Utils\HttpRequest;