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

Merge pull request #15279 from Tithugues/feature/get_rid_of_old_container

Browse Source 
Remove old DI container from various files
This commit is contained in:
Maurício Meneghini Fauth 2019-06-15 19:58:11 -03:00 committed by GitHub
commit a922b1114f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
62 changed files with 351 additions and 540 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ajax.php
View File

@ -10,7 +10,6 @@ declare(strict_types=1);
use PhpMyAdmin\Controllers\AjaxController;
use PhpMyAdmin\Core;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Response;
use PhpMyAdmin\Util;
@ -22,16 +21,12 @@ $_GET['ajax_request'] = 'true';
require_once ROOT_PATH . 'libraries/common.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
/** @var Response $response */
$response = $container->get(Response::class);
$response = $containerBuilder->get(Response::class);
$response->setAjax(true);
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
$response->setAjax(true);
$dbi = $containerBuilder->get(DatabaseInterface::class);
/** @var AjaxController $controller */
$controller = $containerBuilder->get(AjaxController::class);

8
browse_foreigners.php
View File

@ -10,7 +10,6 @@ declare(strict_types=1);
use PhpMyAdmin\BrowseForeigners;
use PhpMyAdmin\Controllers\BrowseForeignersController;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Response;
use PhpMyAdmin\Template;
use PhpMyAdmin\Util;
@ -23,14 +22,11 @@ require_once ROOT_PATH . 'libraries/common.inc.php';
Util::checkParameters(['db', 'table', 'field'], true);
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
/** @var Response $response */
$response = $container->get(Response::class);
$response = $containerBuilder->get(Response::class);
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
$dbi = $containerBuilder->get(DatabaseInterface::class);
/** @var Template $template */
$template = $containerBuilder->get('template');

8
chk_rel.php
View File

@ -8,7 +8,6 @@
declare(strict_types=1);
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Relation;
use PhpMyAdmin\Response;
@ -18,14 +17,11 @@ if (! defined('ROOT_PATH')) {
require_once ROOT_PATH . 'libraries/common.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
/** @var Response $response */
$response = $container->get(Response::class);
$response = $containerBuilder->get(Response::class);
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
$dbi = $containerBuilder->get(DatabaseInterface::class);
/** @var Relation $relation */
$relation = $containerBuilder->get('relation');

34
db_central_columns.php
View File

@ -14,45 +14,23 @@ if (! defined('ROOT_PATH')) {
use PhpMyAdmin\CentralColumns;
use PhpMyAdmin\Controllers\Database\CentralColumnsController;
use PhpMyAdmin\Core;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Message;
use PhpMyAdmin\Response;
use Symfony\Component\DependencyInjection\Definition;
global $db;
require_once ROOT_PATH . 'libraries/common.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
/** @var Response $response */
$response = $container->get(Response::class);
$response = $containerBuilder->get(Response::class);
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
$centralColumns = new CentralColumns($dbi);
/* Define dependencies for the concerned controller */
$dependency_definitions = [
'db' => $container->get('db'),
'centralColumns' => $centralColumns,
];
/** @var Definition $definition */
$definition = $containerBuilder->getDefinition(CentralColumnsController::class);
array_map(
static function (string $parameterName, $value) use ($definition) {
$definition->replaceArgument($parameterName, $value);
},
array_keys($dependency_definitions),
$dependency_definitions
);
/** @var CentralColumns $centralColumns */
$centralColumns = $containerBuilder->get('central_columns');
/** @var CentralColumnsController $controller */
$controller = $containerBuilder->get(CentralColumnsController::class);
/** @var string $db */
$db = $containerBuilder->getParameter('db');
if (isset($_POST['edit_save'])) {
echo $controller->editSave([
'col_name' => $_POST['col_name'] ?? null,

27
db_datadict.php
View File

@ -8,44 +8,19 @@
declare(strict_types=1);
use PhpMyAdmin\Controllers\Database\DataDictionaryController;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Relation;
use PhpMyAdmin\Response;
use PhpMyAdmin\Transformations;
use PhpMyAdmin\Util;
use Symfony\Component\DependencyInjection\Definition;
if (! defined('ROOT_PATH')) {
define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
}
global $db;
require_once ROOT_PATH . 'libraries/common.inc.php';
Util::checkParameters(['db']);
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
/** @var Response $response */
$response = $container->get(Response::class);
/* Define dependencies for the concerned controller */
$dependency_definitions = [
'db' => $container->get('db'),
];
/** @var Definition $definition */
$definition = $containerBuilder->getDefinition(DataDictionaryController::class);
array_map(
static function (string $parameterName, $value) use ($definition) {
$definition->replaceArgument($parameterName, $value);
},
array_keys($dependency_definitions),
$dependency_definitions
);
$response = $containerBuilder->get(Response::class);
/** @var DataDictionaryController $controller */
$controller = $containerBuilder->get(DataDictionaryController::class);

8
db_designer.php
View File

@ -10,7 +10,6 @@ declare(strict_types=1);
use PhpMyAdmin\Database\Designer;
use PhpMyAdmin\Database\Designer\Common;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Response;
if (! defined('ROOT_PATH')) {
@ -21,14 +20,11 @@ global $db;
require_once ROOT_PATH . 'libraries/common.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
/** @var Response $response */
$response = $container->get(Response::class);
$response = $containerBuilder->get(Response::class);
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
$dbi = $containerBuilder->get(DatabaseInterface::class);
/** @var Designer $databaseDesigner */
$databaseDesigner = $containerBuilder->get('designer');

21
db_events.php
View File

@ -9,38 +9,33 @@ declare(strict_types=1);
use PhpMyAdmin\Controllers\Database\EventsController;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Response;
use PhpMyAdmin\Url;
use PhpMyAdmin\Util;
use Symfony\Component\DependencyInjection\Definition;
if (! defined('ROOT_PATH')) {
define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
}
global $db, $table;
require_once ROOT_PATH . 'libraries/common.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
/** @var Response $response */
$response = $container->get(Response::class);
$response = $containerBuilder->get(Response::class);
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
$dbi = $containerBuilder->get(DatabaseInterface::class);
$_PMA_RTE = 'EVN';
/** @var Definition $definition */
$definition = $containerBuilder->getDefinition(EventsController::class);
$definition->replaceArgument('db', $container->get('db'));
/** @var EventsController $controller */
$controller = $containerBuilder->get(EventsController::class);
/** @var string $db */
$db = $containerBuilder->getParameter('db');
/** @var string $table */
$table = $containerBuilder->getParameter('table');
if (! $response->isAjax()) {
/**
* Displays the header and tabs

8
db_export.php
View File

@ -9,7 +9,6 @@ declare(strict_types=1);
use PhpMyAdmin\Config\PageSettings;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Display\Export as DisplayExport;
use PhpMyAdmin\Export;
use PhpMyAdmin\Message;
@ -24,14 +23,11 @@ global $db, $table, $url_query;
require_once ROOT_PATH . 'libraries/common.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
/** @var Response $response */
$response = $container->get(Response::class);
$response = $containerBuilder->get(Response::class);
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
$dbi = $containerBuilder->get(DatabaseInterface::class);
PageSettings::showGroup('Export');

15
db_multi_table_query.php
View File

@ -9,31 +9,20 @@ declare(strict_types=1);
use PhpMyAdmin\Controllers\Database\MultiTableQueryController;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Response;
use PhpMyAdmin\Template;
use Symfony\Component\DependencyInjection\Definition;
if (! defined('ROOT_PATH')) {
define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
}
global $db;
require_once ROOT_PATH . 'libraries/common.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
/** @var Response $response */
$response = $container->get(Response::class);
$response = $containerBuilder->get(Response::class);
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
/** @var Definition $definition */
$definition = $containerBuilder->getDefinition(MultiTableQueryController::class);
$definition->replaceArgument('db', $container->get('db'));
$dbi = $containerBuilder->get(DatabaseInterface::class);
/** @var MultiTableQueryController $controller */
$controller = $containerBuilder->get(MultiTableQueryController::class);

8
db_operations.php
View File

@ -15,7 +15,6 @@ declare(strict_types=1);
use PhpMyAdmin\CheckUserPrivileges;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Display\CreateTable;
use PhpMyAdmin\Message;
use PhpMyAdmin\Operations;
@ -34,14 +33,11 @@ global $cfg, $db, $server, $url_query;
require_once ROOT_PATH . 'libraries/common.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
/** @var Response $response */
$response = $container->get(Response::class);
$response = $containerBuilder->get(Response::class);
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
$dbi = $containerBuilder->get(DatabaseInterface::class);
$checkUserPrivileges = new CheckUserPrivileges($dbi);
$checkUserPrivileges->getPrivileges();

8
db_qbe.php
View File

@ -9,7 +9,6 @@ declare(strict_types=1);
use PhpMyAdmin\Database\Qbe;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Message;
use PhpMyAdmin\Relation;
use PhpMyAdmin\Response;
@ -27,14 +26,11 @@ global $db, $pmaThemeImage, $url_query;
require_once ROOT_PATH . 'libraries/common.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
/** @var Response $response */
$response = $container->get(Response::class);
$response = $containerBuilder->get(Response::class);
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
$dbi = $containerBuilder->get(DatabaseInterface::class);
/** @var Relation $relation */
$relation = $containerBuilder->get('relation');

24
db_routines.php
View File

@ -10,38 +10,34 @@ declare(strict_types=1);
use PhpMyAdmin\CheckUserPrivileges;
use PhpMyAdmin\Controllers\Database\RoutinesController;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Response;
use PhpMyAdmin\Url;
use PhpMyAdmin\Util;
use Symfony\Component\DependencyInjection\Definition;
if (! defined('ROOT_PATH')) {
define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
}
global $db, $table;
require_once ROOT_PATH . 'libraries/common.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
/** @var Response $response */
$response = $container->get(Response::class);
$response = $containerBuilder->get(Response::class);
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
$dbi = $containerBuilder->get(DatabaseInterface::class);
$checkUserPrivileges = new CheckUserPrivileges($dbi);
/** @var string $db */
$db = $containerBuilder->getParameter('db');
/** @var string $table */
$table = $containerBuilder->getParameter('table');
/** @var CheckUserPrivileges $checkUserPrivileges */
$checkUserPrivileges = $containerBuilder->get('check_user_privileges');
$checkUserPrivileges->getPrivileges();
$_PMA_RTE = 'RTN';
/** @var Definition $definition */
$definition = $containerBuilder->getDefinition(RoutinesController::class);
$definition->replaceArgument('db', $container->get('db'));
/** @var RoutinesController $controller */
$controller = $containerBuilder->get(RoutinesController::class);

8
db_search.php
View File

@ -11,7 +11,6 @@ declare(strict_types=1);
use PhpMyAdmin\Database\Search;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Response;
use PhpMyAdmin\Template;
use PhpMyAdmin\Util;
@ -24,14 +23,11 @@ global $db, $url_query;
require_once ROOT_PATH . 'libraries/common.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
/** @var Response $response */
$response = $container->get(Response::class);
$response = $containerBuilder->get(Response::class);
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
$dbi = $containerBuilder->get(DatabaseInterface::class);
/** @var Template $template */
$template = $containerBuilder->get('template');

11
db_sql.php
View File

@ -12,28 +12,21 @@ use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Response;
use PhpMyAdmin\SqlQueryForm;
use Symfony\Component\DependencyInjection\Definition;
if (! defined('ROOT_PATH')) {
define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
}
global $db;
require_once ROOT_PATH . 'libraries/common.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
/** @var Response $response */
$response = $container->get(Response::class);
$response = $containerBuilder->get(Response::class);
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
/** @var Definition $definition */
$definition = $containerBuilder->getDefinition(SqlController::class);
$definition->replaceArgument('db', $container->get('db'));
$dbi = $containerBuilder->get(DatabaseInterface::class);
/** @var SqlController $controller */
$controller = $containerBuilder->get(SqlController::class);

8
db_sql_autocomplete.php
View File

@ -8,7 +8,6 @@
declare(strict_types=1);
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Response;
if (! defined('ROOT_PATH')) {
@ -17,14 +16,11 @@ if (! defined('ROOT_PATH')) {
require_once ROOT_PATH . 'libraries/common.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
/** @var Response $response */
$response = $container->get(Response::class);
$response = $containerBuilder->get(Response::class);
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
$dbi = $containerBuilder->get(DatabaseInterface::class);
if ($GLOBALS['cfg']['EnableAutocompleteForTablesAndColumns']) {
$db = isset($_POST['db']) ? $_POST['db'] : $GLOBALS['db'];

31
db_structure.php
View File

@ -9,49 +9,24 @@ declare(strict_types=1);
use PhpMyAdmin\Controllers\Database\StructureController;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Relation;
use PhpMyAdmin\Replication;
use PhpMyAdmin\Response;
use Symfony\Component\DependencyInjection\Definition;
if (! defined('ROOT_PATH')) {
define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
}
global $db;
require_once ROOT_PATH . 'libraries/common.inc.php';
require_once ROOT_PATH . 'libraries/db_common.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
$container->alias('response', Response::class);
/** @var Response $response */
$response = $containerBuilder->get(Response::class);
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
/* Define dependencies for the concerned controller */
$dependency_definitions = [
'db' => $db,
];
/** @var Definition $definition */
$definition = $containerBuilder->getDefinition(StructureController::class);
array_map(
static function (string $parameterName, $value) use ($definition) {
$definition->replaceArgument($parameterName, $value);
},
array_keys($dependency_definitions),
$dependency_definitions
);
$dbi = $containerBuilder->get(DatabaseInterface::class);
/** @var StructureController $controller */
$controller = $containerBuilder->get(StructureController::class);
/** @var Response $response */
$response = $container->get(Response::class);
if ($response->isAjax() && ! empty($_REQUEST['favorite_table'])) {
$json = $controller->addRemoveFavoriteTablesAction([
'favorite_table' => $_REQUEST['favorite_table'],

21
db_triggers.php
View File

@ -9,38 +9,33 @@ declare(strict_types=1);
use PhpMyAdmin\Controllers\Database\TriggersController;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Response;
use PhpMyAdmin\Url;
use PhpMyAdmin\Util;
use Symfony\Component\DependencyInjection\Definition;
if (! defined('ROOT_PATH')) {
define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
}
global $db, $table;
require_once ROOT_PATH . 'libraries/common.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
/** @var Response $response */
$response = $container->get(Response::class);
$response = $containerBuilder->get(Response::class);
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
$dbi = $containerBuilder->get(DatabaseInterface::class);
$_PMA_RTE = 'TRI';
/** @var Definition $definition */
$definition = $containerBuilder->getDefinition(TriggersController::class);
$definition->replaceArgument('db', $container->get('db'));
/** @var TriggersController $controller */
$controller = $containerBuilder->get(TriggersController::class);
/** @var string $db */
$db = $containerBuilder->getParameter('db');
/** @var string $table */
$table = $containerBuilder->getParameter('table');
if (! $response->isAjax()) {
/**
* Displays the header and tabs

8
export.php
View File

@ -9,7 +9,6 @@ declare(strict_types=1);
use PhpMyAdmin\Core;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Encoding;
use PhpMyAdmin\Export;
use PhpMyAdmin\Plugins;
@ -31,14 +30,11 @@ global $db, $sql_query;
include_once ROOT_PATH . 'libraries/common.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
/** @var Response $response */
$response = $container->get(Response::class);
$response = $containerBuilder->get(Response::class);
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
$dbi = $containerBuilder->get(DatabaseInterface::class);
$header = $response->getHeader();
$scripts = $header->getScripts();

7
import.php
View File

@ -35,14 +35,11 @@ global $db, $pmaThemeImage, $table;
require_once ROOT_PATH . 'libraries/common.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
/** @var Response $response */
$response = $container->get(Response::class);
$response = $containerBuilder->get(Response::class);
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
$dbi = $containerBuilder->get(DatabaseInterface::class);
/** @var import $import */
$import = $containerBuilder->get('import');

8
index.php
View File

@ -10,7 +10,6 @@ declare(strict_types=1);
use PhpMyAdmin\Controllers\HomeController;
use PhpMyAdmin\Core;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Response;
use PhpMyAdmin\Url;
use PhpMyAdmin\Util;
@ -60,14 +59,11 @@ if (! empty($_REQUEST['target'])
exit;
}
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
/** @var Response $response */
$response = $container->get(Response::class);
$response = $containerBuilder->get(Response::class);
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
$dbi = $containerBuilder->get(DatabaseInterface::class);
/** @var HomeController $controller */
$controller = $containerBuilder->get(HomeController::class);

12
libraries/classes/Core.php
View File

@ -11,6 +11,7 @@ declare(strict_types=1);
namespace PhpMyAdmin;
use PhpMyAdmin\Di\Migration;
use PhpMyAdmin\Display\Error as DisplayError;
/**
@ -905,7 +906,7 @@ class Core
foreach (array_keys($_POST) as $post_key) {
foreach ($post_patterns as $one_post_pattern) {
if (preg_match($one_post_pattern, $post_key)) {
$GLOBALS[$post_key] = $_POST[$post_key];
Migration::getInstance()->setGlobal($post_key, $_POST[$post_key]);
}
}
}
@ -920,13 +921,12 @@ class Core
*/
public static function setGlobalDbOrTable(string $param): void
{
$GLOBALS[$param] = '';
$value = '';
if (self::isValid($_REQUEST[$param])) {
// can we strip tags from this?
// only \ and / is not allowed in db names for MySQL
$GLOBALS[$param] = $_REQUEST[$param];
$GLOBALS['url_params'][$param] = $GLOBALS[$param];
$value = $_REQUEST[$param];
}
Migration::getInstance()->setGlobal($param, $value);
Migration::getInstance()->setGlobal('url_params', [$param => $value] + $GLOBALS['url_params']);
}
/**

4
libraries/classes/DatabaseInterface.php
View File

@ -3166,10 +3166,6 @@ class DatabaseInterface
}
$dbi = new DatabaseInterface($extension);
$container = Container::getDefaultContainer();
$container->set(DatabaseInterface::class, $dbi);
$container->alias('dbi', DatabaseInterface::class);
return $dbi;
}
}

71
libraries/classes/Di/Migration.php Normal file
View File

@ -0,0 +1,71 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Migration from home-made DI to Symfony DI
*
* @package PhpMyAdmin\Di
*/
declare(strict_types=1);
namespace PhpMyAdmin\Di;
use InvalidArgumentException;
use Symfony\Component\DependencyInjection\ContainerBuilder;
/**
* Migration from home-made DI to Symfony DI
*
* @package PhpMyAdmin\Di
*/
class Migration
{
/** @var self */
protected static $instance;
/** @var ContainerBuilder */
protected $containerBuilder;
/**
* Get instance of this class
*
* @param ContainerBuilder|null $containerBuilder ContainerBuilder object that should be used to store the data
*
* @return Migration
*/
public static function getInstance(?ContainerBuilder $containerBuilder = null): self
{
if (null !== self::$instance) {
return self::$instance;
}
if (null === $containerBuilder) {
throw new InvalidArgumentException('Container builder should be sent for ' . self::class . ' creation');
}
return self::$instance = new self($containerBuilder);
}
/**
* Migration constructor.
*
* @param ContainerBuilder $containerBuilder ContainerBuilder object that should be used to store the data
*/
protected function __construct(ContainerBuilder $containerBuilder)
{
$this->containerBuilder = $containerBuilder;
}
/**
* Get the instance of the service
*
* @param string $key Key of data to store
* @param mixed $value Data to store
*
* @return void
*/
public function setGlobal(string $key, $value)
{
$GLOBALS[$key] = $value;
$this->containerBuilder->setParameter($key, $value);
}
}

51
libraries/common.inc.php
View File

@ -35,6 +35,8 @@ declare(strict_types=1);
use PhpMyAdmin\Config;
use PhpMyAdmin\Core;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Di\Migration;
use PhpMyAdmin\ErrorHandler;
use PhpMyAdmin\LanguageManager;
use PhpMyAdmin\Logging;
@ -92,6 +94,11 @@ $containerBuilder = new ContainerBuilder();
$loader = new YamlFileLoader($containerBuilder, new FileLocator(__DIR__));
$loader->load('../services.yml');
$loader->load('../services_controllers.yml');
/** @var Migration $diMigration */
$diMigration = $containerBuilder->get('di_migration');
/** @var Container $oldContainer */
$oldContainer = Container::getDefaultContainer();
/**
* Load gettext functions.
@ -142,17 +149,17 @@ if (! defined('PMA_NO_SESSION')) {
* holds parameters to be passed to next page
* @global array $GLOBALS['url_params']
*/
$GLOBALS['url_params'] = [];
$diMigration->setGlobal('url_params', []);
/**
* holds page that should be displayed
* @global string $GLOBALS['goto']
*/
$GLOBALS['goto'] = '';
$diMigration->setGlobal('goto', '');
// Security fix: disallow accessing serious server files via "?goto="
if (isset($_REQUEST['goto']) && Core::checkPageValidity($_REQUEST['goto'])) {
$GLOBALS['goto'] = $_REQUEST['goto'];
$GLOBALS['url_params']['goto'] = $_REQUEST['goto'];
$diMigration->setGlobal('goto', $_REQUEST['goto']);
$diMigration->setGlobal('url_params', ['goto' => $_REQUEST['goto']]);
} else {
unset($_REQUEST['goto'], $_GET['goto'], $_POST['goto'], $_COOKIE['goto']);
}
@ -162,7 +169,7 @@ if (isset($_REQUEST['goto']) && Core::checkPageValidity($_REQUEST['goto'])) {
* @global string $GLOBALS['back']
*/
if (isset($_REQUEST['back']) && Core::checkPageValidity($_REQUEST['back'])) {
$GLOBALS['back'] = $_REQUEST['back'];
$diMigration->setGlobal('back', $_REQUEST['back']);
} else {
unset($_REQUEST['back'], $_GET['back'], $_POST['back'], $_COOKIE['back']);
}
@ -232,24 +239,32 @@ Core::setGlobalDbOrTable('table');
if (isset($_REQUEST['selected_recent_table']) && Core::isValid($_REQUEST['selected_recent_table'])) {
$recent_table = json_decode($_REQUEST['selected_recent_table'], true);
$GLOBALS['db']
= (array_key_exists('db', $recent_table) && is_string($recent_table['db'])) ?
$recent_table['db'] : '';
$GLOBALS['url_params']['db'] = $GLOBALS['db'];
$diMigration->setGlobal(
'db',
(array_key_exists('db', $recent_table) && is_string($recent_table['db'])) ? $recent_table['db'] : ''
);
$diMigration->setGlobal(
'url_params',
['db' => $containerBuilder->getParameter('db')] + $containerBuilder->getParameter('url_params')
);
$GLOBALS['table']
= (array_key_exists('table', $recent_table) && is_string($recent_table['table'])) ?
$recent_table['table'] : '';
$GLOBALS['url_params']['table'] = $GLOBALS['table'];
$diMigration->setGlobal(
'table',
(array_key_exists('table', $recent_table) && is_string($recent_table['table'])) ? $recent_table['table'] : ''
);
$diMigration->setGlobal(
'url_params',
['table' => $containerBuilder->getParameter('table')] + $containerBuilder->getParameter('url_params')
);
}
/**
* SQL query to be executed
* @global string $GLOBALS['sql_query']
*/
$GLOBALS['sql_query'] = '';
$diMigration->setGlobal('sql_query', '');
if (Core::isValid($_POST['sql_query'])) {
$GLOBALS['sql_query'] = $_POST['sql_query'];
$diMigration->setGlobal('sql_query', $_POST['sql_query']);
}
//$_REQUEST['set_theme'] // checked later in this file LABEL_theme_setup
@ -287,8 +302,8 @@ $GLOBALS['PMA_Config']->checkServers();
* current server
* @global integer $GLOBALS['server']
*/
$GLOBALS['server'] = $GLOBALS['PMA_Config']->selectServer();
$GLOBALS['url_params']['server'] = $GLOBALS['server'];
$diMigration->setGlobal('server', $GLOBALS['PMA_Config']->selectServer());
$diMigration->setGlobal('url_params', ['server' => $containerBuilder->getParameter('server')] + $containerBuilder->getParameter('url_params'));
/**
* BC - enable backward compatibility
@ -318,6 +333,8 @@ if (! defined('PMA_MINIMUM_COMMON')) {
*/
$containerBuilder->set(DatabaseInterface::class, DatabaseInterface::load());
$containerBuilder->setAlias('dbi', DatabaseInterface::class);
$oldContainer->set(DatabaseInterface::class, $containerBuilder->get(DatabaseInterface::class));
$oldContainer->alias('dbi', DatabaseInterface::class);
// get LoginCookieValidity from preferences cache
// no generic solution for loading preferences from cache as some settings

6
libraries/tbl_columns_definition_form.inc.php
View File

@ -8,7 +8,7 @@
*/
declare(strict_types=1);
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Partition;
use PhpMyAdmin\Relation;
use PhpMyAdmin\Response;
@ -106,8 +106,8 @@ $comments_map = $relation->getComments($db, $table);
$move_columns = [];
if (isset($fields_meta)) {
/** @var PhpMyAdmin\DatabaseInterface $dbi */
$dbi = Container::getDefaultContainer()->get('dbi');
/** @var DatabaseInterface $dbi */
$dbi = $containerBuilder->get('dbi');
$move_columns = $dbi->getTable($db, $table)->getColumnsMeta();
}

9
navigation.php
View File

@ -9,12 +9,10 @@ declare(strict_types=1);
use PhpMyAdmin\Config\PageSettings;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Message;
use PhpMyAdmin\Navigation\Navigation;
use PhpMyAdmin\Relation;
use PhpMyAdmin\Response;
use PhpMyAdmin\Template;
use PhpMyAdmin\Util;
if (! defined('ROOT_PATH')) {
@ -23,14 +21,11 @@ if (! defined('ROOT_PATH')) {
require_once ROOT_PATH . 'libraries/common.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
/** @var Response $response */
$response = $container->get(Response::class);
$response = $containerBuilder->get(Response::class);
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
$dbi = $containerBuilder->get(DatabaseInterface::class);
/** @var Navigation $navigation */
$navigation = $containerBuilder->get('navigation');

8
normalization.php
View File

@ -9,7 +9,6 @@ declare(strict_types=1);
use PhpMyAdmin\Core;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Normalization;
use PhpMyAdmin\Response;
use PhpMyAdmin\Url;
@ -22,14 +21,11 @@ global $db, $table;
require_once ROOT_PATH . 'libraries/common.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
/** @var Response $response */
$response = $container->get(Response::class);
$response = $containerBuilder->get(Response::class);
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
$dbi = $containerBuilder->get(DatabaseInterface::class);
/** @var Normalization $normalization */
$normalization = $containerBuilder->get('normalization');

7
schema_export.php
View File

@ -7,8 +7,6 @@
*/
declare(strict_types=1);
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Export;
use PhpMyAdmin\Relation;
use PhpMyAdmin\Util;
@ -19,11 +17,6 @@ if (! defined('ROOT_PATH')) {
require_once ROOT_PATH . 'libraries/common.inc.php';
$container = Container::getDefaultContainer();
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
/**
* get all variables needed for exporting relational schema
* in $cfgRelation

7
server_binlog.php
View File

@ -8,7 +8,6 @@
declare(strict_types=1);
use PhpMyAdmin\Controllers\Server\BinlogController;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Response;
if (! defined('ROOT_PATH')) {
@ -17,15 +16,11 @@ if (! defined('ROOT_PATH')) {
require_once ROOT_PATH . 'libraries/common.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
$container->alias('response', Response::class);
/** @var BinlogController $controller */
$controller = $containerBuilder->get(BinlogController::class);
/** @var Response $response */
$response = $container->get('response');
$response = $containerBuilder->get(Response::class);
$response->addHTML($controller->indexAction([
'log' => $_POST['log'] ?? null,

8
server_collations.php
View File

@ -8,7 +8,6 @@
declare(strict_types=1);
use PhpMyAdmin\Controllers\Server\CollationsController;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Response;
if (! defined('ROOT_PATH')) {
@ -17,12 +16,9 @@ if (! defined('ROOT_PATH')) {
require_once ROOT_PATH . 'libraries/common.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
$container->alias('response', Response::class);
/** @var CollationsController $controller */
$controller = $containerBuilder->get(CollationsController::class);
$response = $container->get('response');
/** @var Response $response */
$response = $containerBuilder->get(Response::class);
$response->addHTML($controller->indexAction());

11
server_databases.php
View File

@ -10,9 +10,7 @@ declare(strict_types=1);
use PhpMyAdmin\CheckUserPrivileges;
use PhpMyAdmin\Controllers\Server\DatabasesController;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Response;
use Symfony\Component\DependencyInjection\ContainerInterface;
if (! defined('ROOT_PATH')) {
define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
@ -20,15 +18,12 @@ if (! defined('ROOT_PATH')) {
require_once ROOT_PATH . 'libraries/common.inc.php';
$response = $containerBuilder->get('response', ContainerInterface::NULL_ON_INVALID_REFERENCE) ?? Response::getInstance();
$container = Container::getDefaultContainer();
$container->set(Response::class, $response);
$container->alias('response', Response::class);
/** @var DatabasesController $controller */
$controller = $containerBuilder->get(DatabasesController::class);
/** @var Response $response */
$response = $containerBuilder->get(Response::class);
/** @var DatabaseInterface $dbi */
$dbi = $containerBuilder->get(DatabaseInterface::class);

7
server_engines.php
View File

@ -8,7 +8,6 @@
declare(strict_types=1);
use PhpMyAdmin\Controllers\Server\EnginesController;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Response;
if (! defined('ROOT_PATH')) {
@ -17,15 +16,11 @@ if (! defined('ROOT_PATH')) {
require_once ROOT_PATH . 'libraries/common.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
$container->alias('response', Response::class);
/** @var EnginesController $controller */
$controller = $containerBuilder->get(EnginesController::class);
/** @var Response $response */
$response = $container->get(Response::class);
$response = $containerBuilder->get(Response::class);
if (isset($_GET['engine']) && $_GET['engine'] !== '') {
$response->addHTML($controller->show([

8
server_plugins.php
View File

@ -8,7 +8,6 @@
declare(strict_types=1);
use PhpMyAdmin\Controllers\Server\PluginsController;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Response;
if (! defined('ROOT_PATH')) {
@ -17,14 +16,9 @@ if (! defined('ROOT_PATH')) {
require_once ROOT_PATH . 'libraries/common.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
$container->alias('response', Response::class);
/** @var PluginsController $controller */
$controller = $containerBuilder->get(PluginsController::class);
/** @var Response $response */
$response = $container->get(Response::class);
$response = $containerBuilder->get(Response::class);
$response->addHTML($controller->index());

7
server_privileges.php
View File

@ -10,7 +10,6 @@ declare(strict_types=1);
use PhpMyAdmin\CheckUserPrivileges;
use PhpMyAdmin\Core;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Message;
use PhpMyAdmin\Relation;
use PhpMyAdmin\RelationCleanup;
@ -27,10 +26,11 @@ global $db, $pmaThemeImage, $text_dir, $url_query;
require_once ROOT_PATH . 'libraries/common.inc.php';
$container = Container::getDefaultContainer();
/** @var Response $response */
$response = $containerBuilder->get(Response::class);
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
$dbi = $containerBuilder->get(DatabaseInterface::class);
$checkUserPrivileges = new CheckUserPrivileges($dbi);
$checkUserPrivileges->getPrivileges();
@ -42,7 +42,6 @@ $cfgRelation = $relation->getRelationsParam();
/**
* Does the common work
*/
$response = Response::getInstance();
$header = $response->getHeader();
$scripts = $header->getScripts();
$scripts->addFile('server/privileges.js');

8
server_replication.php
View File

@ -9,7 +9,6 @@ declare(strict_types=1);
use PhpMyAdmin\Controllers\Server\ReplicationController;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\ReplicationGui;
use PhpMyAdmin\Response;
@ -21,14 +20,11 @@ require_once ROOT_PATH . 'libraries/common.inc.php';
require_once ROOT_PATH . 'libraries/server_common.inc.php';
require_once ROOT_PATH . 'libraries/replication.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
/** @var Response $response */
$response = $container->get(Response::class);
$response = $containerBuilder->get(Response::class);
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
$dbi = $containerBuilder->get(DatabaseInterface::class);
/** @var ReplicationController $controller */
$controller = $containerBuilder->get(ReplicationController::class);

8
server_sql.php
View File

@ -9,7 +9,6 @@ declare(strict_types=1);
use PhpMyAdmin\Controllers\Server\SqlController;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Response;
use PhpMyAdmin\SqlQueryForm;
@ -19,14 +18,11 @@ if (! defined('ROOT_PATH')) {
require_once ROOT_PATH . 'libraries/common.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
/** @var Response $response */
$response = $container->get(Response::class);
$response = $containerBuilder->get(Response::class);
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
$dbi = $containerBuilder->get(DatabaseInterface::class);
/** @var SqlController $controller */
$controller = $containerBuilder->get(SqlController::class);

8
server_status.php
View File

@ -9,7 +9,6 @@ declare(strict_types=1);
use PhpMyAdmin\Controllers\Server\Status\StatusController;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\ReplicationGui;
use PhpMyAdmin\Response;
@ -21,14 +20,11 @@ require_once ROOT_PATH . 'libraries/common.inc.php';
require_once ROOT_PATH . 'libraries/server_common.inc.php';
require_once ROOT_PATH . 'libraries/replication.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
/** @var Response $response */
$response = $container->get(Response::class);
$response = $containerBuilder->get(Response::class);
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
$dbi = $containerBuilder->get(DatabaseInterface::class);
/** @var StatusController $controller */
$controller = $containerBuilder->get(StatusController::class);

9
server_status_advisor.php
View File

@ -9,9 +9,7 @@ declare(strict_types=1);
use PhpMyAdmin\Controllers\Server\Status\AdvisorController;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Response;
use PhpMyAdmin\Server\Status\Data;
if (! defined('ROOT_PATH')) {
define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
@ -20,14 +18,11 @@ if (! defined('ROOT_PATH')) {
require_once ROOT_PATH . 'libraries/common.inc.php';
require_once ROOT_PATH . 'libraries/replication.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
/** @var Response $response */
$response = $container->get(Response::class);
$response = $containerBuilder->get(Response::class);
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
$dbi = $containerBuilder->get(DatabaseInterface::class);
$scripts = $response->getHeader()->getScripts();
$scripts->addFile('server/status/advisor.js');

10
server_status_monitor.php
View File

@ -9,10 +9,7 @@ declare(strict_types=1);
use PhpMyAdmin\Controllers\Server\Status\MonitorController;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Response;
use PhpMyAdmin\Server\Status\Data;
use PhpMyAdmin\Server\Status\Monitor;
if (! defined('ROOT_PATH')) {
define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
@ -22,14 +19,11 @@ require_once ROOT_PATH . 'libraries/common.inc.php';
require_once ROOT_PATH . 'libraries/server_common.inc.php';
require_once ROOT_PATH . 'libraries/replication.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
/** @var Response $response */
$response = $container->get(Response::class);
$response = $containerBuilder->get(Response::class);
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
$dbi = $containerBuilder->get(DatabaseInterface::class);
/** @var MonitorController $controller */
$controller = $containerBuilder->get(MonitorController::class);

9
server_status_processes.php
View File

@ -9,9 +9,7 @@ declare(strict_types=1);
use PhpMyAdmin\Controllers\Server\Status\ProcessesController;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Response;
use PhpMyAdmin\Server\Status\Data;
if (! defined('ROOT_PATH')) {
define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
@ -21,14 +19,11 @@ require_once ROOT_PATH . 'libraries/common.inc.php';
require_once ROOT_PATH . 'libraries/server_common.inc.php';
require_once ROOT_PATH . 'libraries/replication.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
/** @var Response $response */
$response = $container->get(Response::class);
$response = $containerBuilder->get(Response::class);
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
$dbi = $containerBuilder->get(DatabaseInterface::class);
/** @var ProcessesController $controller */
$controller = $containerBuilder->get(ProcessesController::class);

9
server_status_queries.php
View File

@ -9,9 +9,7 @@ declare(strict_types=1);
use PhpMyAdmin\Controllers\Server\Status\QueriesController;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Response;
use PhpMyAdmin\Server\Status\Data;
if (! defined('ROOT_PATH')) {
define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
@ -21,14 +19,11 @@ require_once ROOT_PATH . 'libraries/common.inc.php';
require_once ROOT_PATH . 'libraries/server_common.inc.php';
require_once ROOT_PATH . 'libraries/replication.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
/** @var Response $response */
$response = $container->get(Response::class);
$response = $containerBuilder->get(Response::class);
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
$dbi = $containerBuilder->get(DatabaseInterface::class);
/** @var QueriesController $controller */
$controller = $containerBuilder->get(QueriesController::class);

9
server_status_variables.php
View File

@ -9,9 +9,7 @@ declare(strict_types=1);
use PhpMyAdmin\Controllers\Server\Status\VariablesController;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Response;
use PhpMyAdmin\Server\Status\Data;
if (! defined('ROOT_PATH')) {
define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
@ -21,14 +19,11 @@ require_once ROOT_PATH . 'libraries/common.inc.php';
require_once ROOT_PATH . 'libraries/server_common.inc.php';
require_once ROOT_PATH . 'libraries/replication.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
/** @var Response $response */
$response = $container->get(Response::class);
$response = $containerBuilder->get(Response::class);
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
$dbi = $containerBuilder->get(DatabaseInterface::class);
/** @var VariablesController $controller */
$controller = $containerBuilder->get(VariablesController::class);

8
server_user_groups.php
View File

@ -8,7 +8,6 @@
declare(strict_types=1);
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Relation;
use PhpMyAdmin\Response;
use PhpMyAdmin\Server\UserGroups;
@ -20,14 +19,11 @@ if (! defined('ROOT_PATH')) {
require_once ROOT_PATH . 'libraries/common.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
/** @var Response $response */
$response = $container->get(Response::class);
$response = $containerBuilder->get(Response::class);
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
$dbi = $containerBuilder->get(DatabaseInterface::class);
/** @var Relation $relation */
$relation = $containerBuilder->get('relation');

7
server_variables.php
View File

@ -8,7 +8,6 @@
declare(strict_types=1);
use PhpMyAdmin\Controllers\Server\VariablesController;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Response;
if (! defined('ROOT_PATH')) {
@ -17,15 +16,11 @@ if (! defined('ROOT_PATH')) {
require_once ROOT_PATH . 'libraries/common.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
$container->alias('response', Response::class);
/** @var VariablesController $controller */
$controller = $containerBuilder->get(VariablesController::class);
/** @var Response $response */
$response = $container->get(Response::class);
$response = $containerBuilder->get(Response::class);
if ($response->isAjax()
&& isset($_GET['type']) && $_GET['type'] === 'getval') {

27
services.yml
View File

@ -9,6 +9,14 @@ services:
class: 'PhpMyAdmin\Config'
arguments: [!php/const CONFIG_FILE]
central_columns:
class: '\PhpMyAdmin\CentralColumns'
arguments: ['@dbi']
check_user_privileges:
class: '\PhpMyAdmin\CheckUserPrivileges'
arguments: ['@dbi']
create_add_field:
class: 'PhpMyAdmin\CreateAddField'
arguments: ['@dbi']
@ -46,6 +54,10 @@ services:
import:
class: 'PhpMyAdmin\Import'
di_migration:
factory: 'PhpMyAdmin\Di\Migration::getInstance'
arguments: ['@service_container']
navigation:
class: 'PhpMyAdmin\Navigation\Navigation'
arguments: ['@template', '@relation', '@dbi']
@ -58,6 +70,12 @@ services:
transformations: '@transformations'
template: '@template'
operations:
class: 'PhpMyAdmin\Operations'
arguments:
dbi: '@dbi'
relation: '@relation'
relation:
class: 'PhpMyAdmin\Relation'
arguments: ['@dbi', '@template']
@ -71,6 +89,9 @@ services:
replication: '@replication'
template: '@template'
response:
factory: 'PhpMyAdmin\Response::getInstance'
sql_query_form:
class: 'PhpMyAdmin\SqlQueryForm'
@ -93,3 +114,9 @@ services:
transformations:
class: 'PhpMyAdmin\Transformations'
#Aliases
PhpMyAdmin\Response: '@response'
PhpMyAdmin\DatabaseInterface: '@dbi'

48
services_controllers.yml
View File

@ -22,8 +22,8 @@ services:
response: '@response'
dbi: '@dbi'
template: '@template'
db: null
centralColumns: null
db: '%db%'
centralColumns: '@central_columns'
PhpMyAdmin\Controllers\Database\DataDictionaryController:
class: 'PhpMyAdmin\Controllers\Database\DataDictionaryController'
@ -31,7 +31,7 @@ services:
response: '@response'
dbi: '@dbi'
template: '@template'
db: null
db: '%db%'
relation: '@relation'
transformations: '@transformations'
@ -41,7 +41,7 @@ services:
response: '@response'
dbi: '@dbi'
template: '@template'
db: null
db: '%db%'
PhpMyAdmin\Controllers\Database\MultiTableQueryController:
class: 'PhpMyAdmin\Controllers\Database\MultiTableQueryController'
@ -49,7 +49,7 @@ services:
response: '@response'
dbi: '@dbi'
template: '@template'
db: null
db: '%db%'
PhpMyAdmin\Controllers\Database\RoutinesController:
class: 'PhpMyAdmin\Controllers\Database\RoutinesController'
@ -57,7 +57,7 @@ services:
response: '@response'
dbi: '@dbi'
template: '@template'
db: null
db: '%db%'
PhpMyAdmin\Controllers\Database\SqlController:
class: 'PhpMyAdmin\Controllers\Database\SqlController'
@ -65,7 +65,7 @@ services:
response: '@response'
dbi: '@dbi'
template: '@template'
db: null
db: '%db%'
PhpMyAdmin\Controllers\Database\StructureController:
class: 'PhpMyAdmin\Controllers\Database\StructureController'
@ -73,7 +73,7 @@ services:
response: '@response'
dbi: '@dbi'
template: '@template'
db: null
db: '%db%'
relation: '@relation'
replication: '@replication'
@ -83,7 +83,7 @@ services:
response: '@response'
dbi: '@dbi'
template: '@template'
db: null
db: '%db%'
PhpMyAdmin\Controllers\HomeController:
class: 'PhpMyAdmin\Controllers\HomeController'
@ -206,8 +206,8 @@ services:
response: '@response'
dbi: '@dbi'
template: '@template'
db: null
table: null
db: '%db%'
table: '%table%'
sql_query: null
url_query: null
cfg: null
@ -218,8 +218,8 @@ services:
response: '@response'
dbi: '@dbi'
template: '@template'
db: null
table: null
db: '%db%'
table: '%table%'
sql_query: null
url_params: null
goto: null
@ -232,9 +232,9 @@ services:
response: '@response'
dbi: '@dbi'
template: '@template'
db: null
table: null
index: null
db: '%db%'
table: '%table%'
index: '%index%'
PhpMyAdmin\Controllers\Table\RelationController:
class: 'PhpMyAdmin\Controllers\Table\RelationController'
@ -242,8 +242,8 @@ services:
response: '@response'
dbi: '@dbi'
template: '@template'
db: null
table: null
db: '%db%'
table: '%table%'
options_array: null
cfgRelation: null
tbl_storage_engine: null
@ -258,8 +258,8 @@ services:
response: '@response'
dbi: '@dbi'
template: '@template'
db: null
table: null
db: '%db%'
table: '%table%'
searchType: null
url_query: null
relation: '@relation'
@ -270,8 +270,8 @@ services:
response: '@response'
dbi: '@dbi'
template: '@template'
db: null
table: null
db: '%db%'
table: '%table%'
PhpMyAdmin\Controllers\Table\StructureController:
class: 'PhpMyAdmin\Controllers\Table\StructureController'
@ -279,8 +279,8 @@ services:
response: '@response'
dbi: '@dbi'
template: '@template'
db: null
table: null
db: '%db%'
table: '%table%'
db_is_system_schema: null
tbl_is_view: null
tbl_storage_engine: null

21
tbl_addfield.php
View File

@ -7,9 +7,9 @@
*/
declare(strict_types=1);
use PhpMyAdmin\Config;
use PhpMyAdmin\CreateAddField;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Message;
use PhpMyAdmin\Response;
use PhpMyAdmin\Transformations;
@ -20,18 +20,13 @@ if (! defined('ROOT_PATH')) {
define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
}
global $cfg, $db, $table;
require_once ROOT_PATH . 'libraries/common.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
/** @var Response $response */
$response = $container->get(Response::class);
$response = $containerBuilder->get(Response::class);
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
$dbi = $containerBuilder->get(DatabaseInterface::class);
$header = $response->getHeader();
$scripts = $header->getScripts();
@ -43,6 +38,16 @@ Util::checkParameters(['db', 'table']);
/** @var Transformations $transformations */
$transformations = $containerBuilder->get('transformations');
/** @var string $db */
$db = $containerBuilder->getParameter('db');
/** @var string $table */
$table = $containerBuilder->getParameter('table');
/** @var Config $config */
$config = $containerBuilder->get('config');
$cfg = $config->settings;
/**
* Defines the url to return to in case of error in a sql statement
*/

8
tbl_chart.php
View File

@ -8,8 +8,6 @@
declare(strict_types=1);
use PhpMyAdmin\Controllers\Table\ChartController;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Response;
use Symfony\Component\DependencyInjection\Definition;
if (! defined('ROOT_PATH')) {
@ -18,14 +16,8 @@ if (! defined('ROOT_PATH')) {
require_once ROOT_PATH . 'libraries/common.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
$container->alias('response', Response::class);
/* Define dependencies for the concerned controller */
$dependency_definitions = [
'db' => $container->get('db'),
'table' => $container->get('table'),
'sql_query' => &$GLOBALS['sql_query'],
'url_query' => &$GLOBALS['url_query'],
'cfg' => &$GLOBALS['cfg'],

24
tbl_create.php
View File

@ -7,10 +7,10 @@
*/
declare(strict_types=1);
use PhpMyAdmin\Config;
use PhpMyAdmin\Core;
use PhpMyAdmin\CreateAddField;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Response;
use PhpMyAdmin\Transformations;
use PhpMyAdmin\Url;
@ -20,23 +20,29 @@ if (! defined('ROOT_PATH')) {
define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
}
global $cfg, $db, $table;
require_once ROOT_PATH . 'libraries/common.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
/** @var Response $response */
$response = $container->get(Response::class);
$response = $containerBuilder->get(Response::class);
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
$dbi = $containerBuilder->get(DatabaseInterface::class);
// Check parameters
Util::checkParameters(['db']);
$transformations = new Transformations();
/** @var Transformations $transformations */
$transformations = $containerBuilder->get('transformations');
/** @var string $db */
$db = $containerBuilder->getParameter('db');
/** @var string $table */
$table = $containerBuilder->getParameter('table');
/** @var Config $config */
$config = $containerBuilder->get('config');
$cfg = $config->settings;
/* Check if database name is empty */
if (strlen($db) === 0) {

11
tbl_find_replace.php
View File

@ -10,27 +10,20 @@
declare(strict_types=1);
use PhpMyAdmin\Controllers\Table\SearchController;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Response;
use Symfony\Component\DependencyInjection\Definition;
if (! defined('ROOT_PATH')) {
define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
}
global $url_query;
/** @var string $url_query Overwritten in tbl_common.inc.php */
$url_query = null;
require_once ROOT_PATH . 'libraries/common.inc.php';
require_once ROOT_PATH . 'libraries/tbl_common.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
$container->alias('response', Response::class);
/* Define dependencies for the concerned controller */
$dependency_definitions = [
'db' => $container->get('db'),
'table' => $container->get('table'),
'searchType' => 'replace',
'url_query' => &$url_query,
];

16
tbl_get_field.php
View File

@ -9,7 +9,6 @@ declare(strict_types=1);
use PhpMyAdmin\Core;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Mime;
use PhpMyAdmin\Response;
@ -17,18 +16,19 @@ if (! defined('ROOT_PATH')) {
define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
}
global $db, $table;
require_once ROOT_PATH . 'libraries/common.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
/** @var Response $response */
$response = $container->get(Response::class);
$response = $containerBuilder->get(Response::class);
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
$dbi = $containerBuilder->get(DatabaseInterface::class);
/** @var string $db */
$db = $containerBuilder->getParameter('db');
/** @var string $table */
$table = $containerBuilder->getParameter('table');
$response->disable();

6
tbl_gis_visualization.php
View File

@ -19,14 +19,8 @@ if (! defined('ROOT_PATH')) {
require_once ROOT_PATH . 'libraries/common.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
$container->alias('response', Response::class);
/* Define dependencies for the concerned controller */
$dependency_definitions = [
'db' => $container->get('db'),
'table' => $container->get('table'),
'sql_query' => &$GLOBALS['sql_query'],
'url_params' => &$GLOBALS['url_params'],
'goto' => Util::getScriptNameForOption(

35
tbl_indexes.php
View File

@ -9,10 +9,7 @@ declare(strict_types=1);
use PhpMyAdmin\Controllers\Table\IndexesController;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Index;
use PhpMyAdmin\Response;
use Symfony\Component\DependencyInjection\Definition;
if (! defined('ROOT_PATH')) {
define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
@ -20,16 +17,14 @@ if (! defined('ROOT_PATH')) {
require_once ROOT_PATH . 'libraries/common.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
$container->alias('response', Response::class);
/* Define dependencies for the concerned controller */
$db = $container->get('db');
$table = $container->get('table');
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
$dbi = $containerBuilder->get('dbi');
/** @var string $db */
$db = $containerBuilder->getParameter('db');
/** @var string $table */
$table = $containerBuilder->getParameter('table');
if (! isset($_POST['create_edit_table'])) {
include_once ROOT_PATH . 'libraries/tbl_common.inc.php';
@ -46,21 +41,7 @@ if (isset($_POST['index'])) {
}
/* Define dependencies for the concerned controller */
$dependency_definitions = [
'db' => $container->get('db'),
'table' => $container->get('table'),
'index' => $index,
];
/** @var Definition $definition */
$definition = $containerBuilder->getDefinition(IndexesController::class);
array_map(
static function (string $parameterName, $value) use ($definition) {
$definition->replaceArgument($parameterName, $value);
},
array_keys($dependency_definitions),
$dependency_definitions
);
$containerBuilder->setParameter('index', $index);
/** @var IndexesController $controller */
$controller = $containerBuilder->get(IndexesController::class);

24
tbl_operations.php
View File

@ -9,7 +9,6 @@ declare(strict_types=1);
use PhpMyAdmin\CheckUserPrivileges;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Index;
use PhpMyAdmin\Message;
use PhpMyAdmin\Operations;
@ -23,20 +22,24 @@ if (! defined('ROOT_PATH')) {
define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
}
global $db, $table, $url_query;
global $url_query;
require_once ROOT_PATH . 'libraries/common.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
/** @var Response $response */
$response = $container->get(Response::class);
$response = $containerBuilder->get(Response::class);
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
$dbi = $containerBuilder->get(DatabaseInterface::class);
$checkUserPrivileges = new CheckUserPrivileges($dbi);
/** @var string $db */
$db = $containerBuilder->getParameter('db');
/** @var string $table */
$table = $containerBuilder->getParameter('table');
/** @var CheckUserPrivileges $checkUserPrivileges */
$checkUserPrivileges = $containerBuilder->get('check_user_privileges');
$checkUserPrivileges->getPrivileges();
// lower_case_table_names=1 `DB` becomes `db`
@ -64,10 +67,11 @@ $url_params['goto'] = $url_params['back'] = 'tbl_operations.php';
*/
/** @var Relation $relation */
$relation = $containerBuilder->get('relation');
$operations = new Operations($dbi, $relation);
$cfgRelation = $relation->getRelationsParam();
/** @var Operations $operations */
$operations = $containerBuilder->get('operations');
// reselect current db (needed in some cases probably due to
// the calling of PhpMyAdmin\Relation)
$dbi->selectDb($db);

14
tbl_relation.php
View File

@ -17,9 +17,7 @@ declare(strict_types=1);
use PhpMyAdmin\Controllers\Table\RelationController;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Relation;
use PhpMyAdmin\Response;
use PhpMyAdmin\Table;
use PhpMyAdmin\Util;
use Symfony\Component\DependencyInjection\Definition;
@ -30,16 +28,12 @@ if (! defined('ROOT_PATH')) {
require_once ROOT_PATH . 'libraries/common.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
$container->alias('response', Response::class);
/* Define dependencies for the concerned controller */
$db = $container->get('db');
$table = $container->get('table');
$db = $containerBuilder->getParameter('db');
$table = $containerBuilder->getParameter('table');
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
$dbi = $containerBuilder->get(DatabaseInterface::class);
$options_array = [
'CASCADE' => 'CASCADE',
@ -57,8 +51,6 @@ $upd_query = new Table($table, $db, $dbi);
/* Define dependencies for the concerned controller */
$dependency_definitions = [
'db' => $container->get('db'),
'table' => $container->get('table'),
'options_array' => $options_array,
'cfgRelation' => $cfgRelation,
'tbl_storage_engine' => $tbl_storage_engine,

22
tbl_sql.php
View File

@ -18,34 +18,16 @@ if (! defined('ROOT_PATH')) {
define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
}
global $db, $table;
require_once ROOT_PATH . 'libraries/common.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
/** @var Response $response */
$response = $container->get(Response::class);
$response = $containerBuilder->get(Response::class);
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
/* Define dependencies for the concerned controller */
$dependency_definitions = [
'db' => $container->get('db'),
'table' => $container->get('table'),
];
/** @var Definition $definition */
$definition = $containerBuilder->getDefinition(SqlController::class);
array_map(
static function (string $parameterName, $value) use ($definition) {
$definition->replaceArgument($parameterName, $value);
},
array_keys($dependency_definitions),
$dependency_definitions
);
$dbi = $containerBuilder->get(DatabaseInterface::class);
/** @var SqlController $controller */
$controller = $containerBuilder->get(SqlController::class);

25
tbl_structure.php
View File

@ -10,31 +10,28 @@ declare(strict_types=1);
use PhpMyAdmin\Controllers\Table\StructureController;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Response;
use Symfony\Component\DependencyInjection\Definition;
if (! defined('ROOT_PATH')) {
define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
}
global $db, $table, $db_is_system_schema, $tbl_is_view, $tbl_storage_engine;
global $db_is_system_schema, $tbl_is_view, $tbl_storage_engine;
global $table_info_num_rows, $tbl_collation, $showtable;
require_once ROOT_PATH . 'libraries/common.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
$container->alias('response', Response::class);
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
$dbi = $containerBuilder->get('dbi');
$dbi->selectDb($GLOBALS['db']);
$table_class_object = $dbi->getTable(
$GLOBALS['db'],
$GLOBALS['table']
);
/** @var string $db */
$db = $containerBuilder->getParameter('db');
/** @var string $table */
$table = $containerBuilder->getParameter('table');
$dbi->selectDb($db);
$table_class_object = $dbi->getTable($db, $table);
$reread_info = $table_class_object->getStatusInfo(null, true);
$GLOBALS['showtable'] = $table_class_object->getStatusInfo(null, (isset($reread_info) && $reread_info ? true : false));
if ($table_class_object->isView()) {
@ -48,8 +45,6 @@ $tbl_collation = $table_class_object->getCollation();
$table_info_num_rows = $table_class_object->getNumRows();
/* Define dependencies for the concerned controller */
$dependency_definitions = [
'db' => $db,
'table' => $table,
'db_is_system_schema' => $db_is_system_schema,
'tbl_is_view' => $tbl_is_view,
'tbl_storage_engine' => $tbl_storage_engine,

5
test/bootstrap-dist.php
View File

@ -9,6 +9,7 @@ declare(strict_types=1);
use PhpMyAdmin\Config;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\LanguageManager;
use PhpMyAdmin\MoTranslator\Loader;
use PhpMyAdmin\Theme;
@ -79,7 +80,9 @@ define('PMA_MAJOR_VERSION', $GLOBALS['PMA_Config']->get('PMA_MAJOR_VERSION'));
LanguageManager::getInstance()->getLanguage('en')->activate();
/* Load Database interface */
DatabaseInterface::load();
$oldContainer = Container::getDefaultContainer();
$oldContainer->set(DatabaseInterface::class, DatabaseInterface::load());
$oldContainer->alias('dbi', DatabaseInterface::class);
// Set proxy information from env, if available
$http_proxy = getenv('http_proxy');

5
test/bootstrap-phpstan.php
View File

@ -9,6 +9,7 @@ declare(strict_types=1);
use PhpMyAdmin\Config;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\MoTranslator\Loader;
if (! defined('ROOT_PATH')) {
@ -38,4 +39,6 @@ $GLOBALS['PMA_Config']->enableBc();// Defines constants, phpstan:level=1
Loader::loadFunctions();
DatabaseInterface::load();
$oldContainer = Container::getDefaultContainer();
$oldContainer->set(DatabaseInterface::class, DatabaseInterface::load());
$oldContainer->alias('dbi', DatabaseInterface::class);

1
transformation_overview.php
View File

@ -11,7 +11,6 @@ use PhpMyAdmin\Controllers\TransformationOverviewController;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Response;
use PhpMyAdmin\Transformations;
if (! defined('ROOT_PATH')) {
define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);

8
transformation_wrapper.php
View File

@ -9,7 +9,6 @@ declare(strict_types=1);
use PhpMyAdmin\Core;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Relation;
use PhpMyAdmin\Response;
use PhpMyAdmin\Transformations;
@ -24,14 +23,11 @@ global $db, $table;
require_once ROOT_PATH . 'libraries/common.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
/** @var Response $response */
$response = $container->get(Response::class);
$response = $containerBuilder->get(Response::class);
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
$dbi = $containerBuilder->get(DatabaseInterface::class);
/** @var Transformations $transformations */
$transformations = $containerBuilder->get('transformations');

8
view_operations.php
View File

@ -8,7 +8,6 @@
declare(strict_types=1);
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Message;
use PhpMyAdmin\Operations;
use PhpMyAdmin\Relation;
@ -25,14 +24,11 @@ global $sql_query, $url_query;
require_once ROOT_PATH . 'libraries/common.inc.php';
$container = Container::getDefaultContainer();
$container->set(Response::class, Response::getInstance());
/** @var Response $response */
$response = $container->get(Response::class);
$response = $containerBuilder->get(Response::class);
/** @var DatabaseInterface $dbi */
$dbi = $container->get(DatabaseInterface::class);
$dbi = $containerBuilder->get(DatabaseInterface::class);
$pma_table = new Table($GLOBALS['table'], $GLOBALS['db']);