Use DI for $dbi global in Export class

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

Hide file tree

Showing 6 changed files with 27 additions and 13 deletions.
diff --git a/db_export.php b/db_export.php
@@ -30,7 +30,7 @@
 $scripts  = $header->getScripts();
 $scripts->addFile('export.js');
 
-$export = new Export();
+$export = new Export($GLOBALS['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/export.php b/export.php
@@ -32,7 +32,7 @@
 $scripts  = $header->getScripts();
 $scripts->addFile('export_output.js');
 
-$export = new Export();
+$export = new Export($GLOBALS['dbi']);
 
 //check if it's the GET request to check export time out
 if (isset($_GET['check_time_out'])) {

diff --git a/libraries/classes/Export.php b/libraries/classes/Export.php
@@ -18,6 +18,20 @@
  */
 class Export
 {
+    /**
+     * @var DatabaseInterface
+     */
+    private $dbi;
+
+    /**
+     * Export constructor.
+     * @param DatabaseInterface $dbi DatabaseInterface instance
+     */
+    public function __construct($dbi)
+    {
+        $this->dbi = $dbi;
+    }
+
     /**
      * Sets a session variable upon a possible fatal error during export
      *
@@ -582,7 +596,7 @@ public function exportServer(
             if (isset($tmp_select)
                 && mb_strpos(' ' . $tmp_select, '|' . $current_db . '|')
             ) {
-                $tables = $GLOBALS['dbi']->getTables($current_db);
+                $tables = $this->dbi->getTables($current_db);
                 $this->exportDatabase(
                     $current_db,
                     $tables,
@@ -712,10 +726,10 @@ public function exportDatabase(
                         // This obtains the current table's size
                         $query = 'SELECT data_length + index_length
                               from information_schema.TABLES
-                              WHERE table_schema = "' . $GLOBALS['dbi']->escapeString($db) . '"
-                              AND table_name = "' . $GLOBALS['dbi']->escapeString($table) . '"';
+                              WHERE table_schema = "' . $this->dbi->escapeString($db) . '"
+                              AND table_name = "' . $this->dbi->escapeString($table) . '"';
 
-                        $size = $GLOBALS['dbi']->fetchValue($query);
+                        $size = $this->dbi->fetchValue($query);
                         //Converting the size to MB
                         $size = ($size / 1024) / 1024;
                         if ($size > $table_size) {
@@ -969,7 +983,7 @@ public function exportTable(
                     $sql_query = preg_replace('%;\s*$%', '', $sql_query);
                 }
                 $local_query = $sql_query . $add_query;
-                $GLOBALS['dbi']->selectDb($db);
+                $this->dbi->selectDb($db);
             } else {
                 // Data is exported only for Non-generated columns
                 $tableObj = new Table($table, $db);
@@ -1120,7 +1134,7 @@ public function lockTables(string $db, array $tables, string $lockType = "WRITE"
         }
 
         $sql = "LOCK TABLES " . implode(", ", $locks);
-        return $GLOBALS['dbi']->tryQuery($sql);
+        return $this->dbi->tryQuery($sql);
     }
 
     /**
@@ -1130,7 +1144,7 @@ public function lockTables(string $db, array $tables, string $lockType = "WRITE"
      */
     public function unlockTables()
     {
-        return $GLOBALS['dbi']->tryQuery("UNLOCK TABLES");
+        return $this->dbi->tryQuery("UNLOCK TABLES");
     }
 
     /**
@@ -1204,7 +1218,7 @@ public function processExportSchema(?string $export_type): void
             Core::fatalError(__('Bad type!'));
         }
 
-        $GLOBALS['dbi']->selectDb($GLOBALS['db']);
+        $this->dbi->selectDb($GLOBALS['db']);
         $export_plugin->exportSchema($GLOBALS['db']);
     }
 }
diff --git a/libraries/classes/Plugins/ExportPlugin.php b/libraries/classes/Plugins/ExportPlugin.php
@@ -53,7 +53,7 @@ abstract class ExportPlugin
     public function __construct()
     {
         $this->relation = new Relation($GLOBALS['dbi']);
-        $this->export = new Export();
+        $this->export = new Export($GLOBALS['dbi']);
         $this->transformations = new Transformations();
     }
 

diff --git a/schema_export.php b/schema_export.php
@@ -35,5 +35,5 @@
  * Include the appropriate Schema Class depending on $export_type
  * default is PDF
  */
-$export = new Export();
+$export = new Export($GLOBALS['dbi']);
 $export->processExportSchema($_REQUEST['export_type']);
diff --git a/test/classes/ExportTest.php b/test/classes/ExportTest.php
@@ -34,7 +34,7 @@ class ExportTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->export = new Export();
+        $this->export = new Export($GLOBALS['dbi']);
     }
 
     /**