Get $dbi from DIC instead of global in entry points

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
phpmyadmin · Apr 18, 2019 · 17195fb · 17195fb
1 parent 7f793cd
commit 17195fb
Show file tree

Hide file tree

Showing 53 changed files with 682 additions and 300 deletions.
diff --git a/ajax.php b/ajax.php
@@ -9,6 +9,8 @@
 
 use PhpMyAdmin\Controllers\AjaxController;
 use PhpMyAdmin\Core;
+use PhpMyAdmin\DatabaseInterface;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Util;
 
@@ -20,12 +22,20 @@
 
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
-$response = Response::getInstance();
+$container = Container::getDefaultContainer();
+$container->set(Response::class, Response::getInstance());
+
+/** @var Response $response */
+$response = $container->get(Response::class);
+
+/** @var DatabaseInterface $dbi */
+$dbi = $container->get(DatabaseInterface::class);
+
 $response->setAjax(true);
 
 $controller = new AjaxController(
     $response,
-    $GLOBALS['dbi'],
+    $dbi,
     $GLOBALS['PMA_Config']
 );
 

diff --git a/browse_foreigners.php b/browse_foreigners.php
@@ -9,6 +9,8 @@
 
 use PhpMyAdmin\BrowseForeigners;
 use PhpMyAdmin\Controllers\BrowseForeignersController;
+use PhpMyAdmin\DatabaseInterface;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Relation;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Util;
@@ -21,19 +23,26 @@
 
 Util::checkParameters(['db', 'table', 'field'], true);
 
-$response = Response::getInstance();
+$container = Container::getDefaultContainer();
+$container->set(Response::class, Response::getInstance());
+
+/** @var Response $response */
+$response = $container->get(Response::class);
+
+/** @var DatabaseInterface $dbi */
+$dbi = $container->get(DatabaseInterface::class);
 
 $controller = new BrowseForeignersController(
     $response,
-    $GLOBALS['dbi'],
+    $dbi,
     new BrowseForeigners(
         $GLOBALS['cfg']['LimitChars'],
         $GLOBALS['cfg']['MaxRows'],
         $GLOBALS['cfg']['RepeatCells'],
         $GLOBALS['cfg']['ShowAll'],
         $GLOBALS['pmaThemeImage']
     ),
-    new Relation($GLOBALS['dbi'])
+    new Relation($dbi)
 );
 
 $response->getFooter()->setMinimal();

diff --git a/chk_rel.php b/chk_rel.php
@@ -7,6 +7,8 @@
  */
 declare(strict_types=1);
 
+use PhpMyAdmin\DatabaseInterface;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Relation;
 use PhpMyAdmin\Response;
 
@@ -16,7 +18,16 @@
 
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
-$relation = new Relation($GLOBALS['dbi']);
+$container = Container::getDefaultContainer();
+$container->set(Response::class, Response::getInstance());
+
+/** @var Response $response */
+$response = $container->get(Response::class);
+
+/** @var DatabaseInterface $dbi */
+$dbi = $container->get(DatabaseInterface::class);
+
+$relation = new Relation($dbi);
 
 // If request for creating the pmadb
 if (isset($_POST['create_pmadb']) && $relation->createPmaDatabase()) {
@@ -34,7 +45,6 @@
     $relation->fixPmaTables($cfgRelation['db']);
 }
 
-$response = Response::getInstance();
 $response->addHTML(
     $relation->getRelationsParamDiagnostic($cfgRelation)
 );
diff --git a/db_central_columns.php b/db_central_columns.php
@@ -14,17 +14,27 @@
 use PhpMyAdmin\CentralColumns;
 use PhpMyAdmin\Controllers\Database\CentralColumnsController;
 use PhpMyAdmin\Core;
+use PhpMyAdmin\DatabaseInterface;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Response;
 
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
-$response = Response::getInstance();
-$centralColumns = new CentralColumns($GLOBALS['dbi']);
+$container = Container::getDefaultContainer();
+$container->set(Response::class, Response::getInstance());
+
+/** @var Response $response */
+$response = $container->get(Response::class);
+
+/** @var DatabaseInterface $dbi */
+$dbi = $container->get(DatabaseInterface::class);
+
+$centralColumns = new CentralColumns($dbi);
 
 $controller = new CentralColumnsController(
     $response,
-    $GLOBALS['dbi'],
+    $dbi,
     $db,
     $centralColumns
 );

diff --git a/db_datadict.php b/db_datadict.php
@@ -8,6 +8,8 @@
 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;
@@ -21,13 +23,20 @@
 
 Util::checkParameters(['db']);
 
-$response = Response::getInstance();
+$container = Container::getDefaultContainer();
+$container->set(Response::class, Response::getInstance());
+
+/** @var Response $response */
+$response = $container->get(Response::class);
+
+/** @var DatabaseInterface $dbi */
+$dbi = $container->get(DatabaseInterface::class);
 
 $controller = new DataDictionaryController(
     $response,
-    $GLOBALS['dbi'],
+    $dbi,
     $db,
-    new Relation($GLOBALS['dbi']),
+    new Relation($dbi),
     new Transformations()
 );
 

diff --git a/db_designer.php b/db_designer.php
@@ -9,6 +9,8 @@
 
 use PhpMyAdmin\Database\Designer;
 use PhpMyAdmin\Database\Designer\Common;
+use PhpMyAdmin\DatabaseInterface;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 
 if (! defined('ROOT_PATH')) {
@@ -17,10 +19,17 @@
 
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
-$response = Response::getInstance();
+$container = Container::getDefaultContainer();
+$container->set(Response::class, Response::getInstance());
+
+/** @var Response $response */
+$response = $container->get(Response::class);
+
+/** @var DatabaseInterface $dbi */
+$dbi = $container->get(DatabaseInterface::class);
 
-$databaseDesigner = new Designer($GLOBALS['dbi']);
-$designerCommon = new Common($GLOBALS['dbi']);
+$databaseDesigner = new Designer($dbi);
+$designerCommon = new Common($dbi);
 
 if (isset($_REQUEST['dialog'])) {
     if ($_GET['dialog'] == 'edit') {

diff --git a/db_events.php b/db_events.php
@@ -8,6 +8,8 @@
 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;
@@ -18,21 +20,28 @@
 
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
-$response = Response::getInstance();
+$container = Container::getDefaultContainer();
+$container->set(Response::class, Response::getInstance());
+
+/** @var Response $response */
+$response = $container->get(Response::class);
+
+/** @var DatabaseInterface $dbi */
+$dbi = $container->get(DatabaseInterface::class);
 
 $_PMA_RTE = 'EVN';
 
 $controller = new EventsController(
     $response,
-    $GLOBALS['dbi'],
+    $dbi,
     $db
 );
 
 if (! $response->isAjax()) {
     /**
      * Displays the header and tabs
      */
-    if (! empty($table) && in_array($table, $GLOBALS['dbi']->getTables($db))) {
+    if (! empty($table) && in_array($table, $dbi->getTables($db))) {
         include_once ROOT_PATH . 'libraries/tbl_common.inc.php';
     } else {
         $table = '';
@@ -57,7 +66,7 @@
      * create the missing $url_query variable
      */
     if (strlen($db) > 0) {
-        $GLOBALS['dbi']->selectDb($db);
+        $dbi->selectDb($db);
         if (! isset($url_query)) {
             $url_query = Url::getCommon(
                 [

diff --git a/db_export.php b/db_export.php
@@ -8,6 +8,8 @@
 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;
@@ -18,19 +20,24 @@
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
-/**
- * Gets some core libraries
- */
 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);
+
+/** @var DatabaseInterface $dbi */
+$dbi = $container->get(DatabaseInterface::class);
+
 PageSettings::showGroup('Export');
 
-$response = Response::getInstance();
-$header   = $response->getHeader();
-$scripts  = $header->getScripts();
+$header = $response->getHeader();
+$scripts = $header->getScripts();
 $scripts->addFile('export.js');
 
-$export = new Export($GLOBALS['dbi']);
+$export = new Export($dbi);
 
 // $sub_part is used in Util::getDbInfo() to see if we are coming from
 // db_export.php, in which case we don't obey $cfg['MaxTableList']

diff --git a/db_multi_table_query.php b/db_multi_table_query.php
@@ -8,6 +8,8 @@
 declare(strict_types=1);
 
 use PhpMyAdmin\Controllers\Database\MultiTableQueryController;
+use PhpMyAdmin\DatabaseInterface;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 
 if (! defined('ROOT_PATH')) {
@@ -16,11 +18,18 @@
 
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
-$response = Response::getInstance();
+$container = Container::getDefaultContainer();
+$container->set(Response::class, Response::getInstance());
+
+/** @var Response $response */
+$response = $container->get(Response::class);
+
+/** @var DatabaseInterface $dbi */
+$dbi = $container->get(DatabaseInterface::class);
 
 $controller = new MultiTableQueryController(
     $response,
-    $GLOBALS['dbi'],
+    $dbi,
     $db
 );