From 911f8274c766225d65383a62791e6a845ecbc398 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Thu, 31 Dec 2015 08:09:47 -0500
Subject: [PATCH] Clarify class and variable name

Signed-off-by: Marc Delisle <marc@infomarc.info>
---
 libraries/DatabaseInterface.php                      |  6 +++---
 libraries/{PMA.php => DbList.php}                    |  6 +++---
 libraries/Table.php                                  |  8 ++++----
 libraries/common.inc.php                             | 12 ++++++------
 .../controllers/server/ServerDatabasesController.php |  2 +-
 libraries/display_export.lib.php                     |  2 +-
 libraries/export.lib.php                             |  2 +-
 libraries/mult_submits.inc.php                       |  2 +-
 libraries/mult_submits.lib.php                       |  2 +-
 libraries/operations.lib.php                         | 10 +++++-----
 libraries/replication_gui.lib.php                    |  2 +-
 libraries/server_privileges.lib.php                  |  2 +-
 templates/table/relation/foreign_key_row.phtml       |  4 ++--
 .../table/relation/internal_relational_row.phtml     |  2 +-
 test/classes/TableTest.php                           |  4 ++--
 .../controllers/TableRelationControllerTest.php      |  4 ++--
 test/libraries/PMA_server_privileges_test.php        |  4 ++--
 17 files changed, 37 insertions(+), 37 deletions(-)
 rename libraries/{PMA.php => DbList.php} (96%)

diff --git a/libraries/DatabaseInterface.php b/libraries/DatabaseInterface.php
index bc4bafaa6d..da9f60f725 100644
--- a/libraries/DatabaseInterface.php
+++ b/libraries/DatabaseInterface.php
@@ -905,14 +905,14 @@ class DatabaseInterface
             // display only databases also in official database list
             // f.e. to apply hide_db and only_db
             $drops = array_diff(
-                array_keys($databases), (array) $GLOBALS['pma']->databases
+                array_keys($databases), (array) $GLOBALS['dblist']->databases
             );
             foreach ($drops as $drop) {
                 unset($databases[$drop]);
             }
         } else {
             $databases = array();
-            foreach ($GLOBALS['pma']->databases as $database_name) {
+            foreach ($GLOBALS['dblist']->databases as $database_name) {
                 // MySQL forward compatibility
                 // so pma could use this array as if every server is of version >5.0
                 // todo : remove and check the rest of the code for usage,
@@ -1130,7 +1130,7 @@ class DatabaseInterface
         } else {
             $columns = array();
             if (null === $database) {
-                foreach ($GLOBALS['pma']->databases as $database) {
+                foreach ($GLOBALS['dblist']->databases as $database) {
                     $columns[$database] = $this->getColumnsFull(
                         $database, null, null, $link
                     );
diff --git a/libraries/PMA.php b/libraries/DbList.php
similarity index 96%
rename from libraries/PMA.php
rename to libraries/DbList.php
index 9775cedbac..0cdcda94e9 100644
--- a/libraries/PMA.php
+++ b/libraries/DbList.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * phpMyAdmin main Controller
+ * holds the DbList class
  *
  * @package PhpMyAdmin
  *
@@ -9,14 +9,14 @@
 namespace PMA\libraries;
 
 /**
- * phpMyAdmin main Controller
+ * holds the DbList class
  *
  * @package PhpMyAdmin
  *
  * @property object $userlink
  * @property object $controllink
  */
-class PMA
+class DbList
 {
     /**
      * Holds database list
diff --git a/libraries/Table.php b/libraries/Table.php
index 1a38b31ab9..c0437309c2 100644
--- a/libraries/Table.php
+++ b/libraries/Table.php
@@ -728,8 +728,8 @@ class Table
         $GLOBALS['asfile']         = 1;
 
         // Ensuring the target database is valid.
-        if (! $GLOBALS['pma']->databases->exists($source_db, $target_db)) {
-            if (! $GLOBALS['pma']->databases->exists($source_db)) {
+        if (! $GLOBALS['dblist']->databases->exists($source_db, $target_db)) {
+            if (! $GLOBALS['dblist']->databases->exists($source_db)) {
                 $GLOBALS['message'] = Message::rawError(
                     sprintf(
                         __('Source database `%s` was not found!'),
@@ -737,7 +737,7 @@ class Table
                     )
                 );
             }
-            if (! $GLOBALS['pma']->databases->exists($target_db)) {
+            if (! $GLOBALS['dblist']->databases->exists($target_db)) {
                 $GLOBALS['message'] = Message::rawError(
                     sprintf(
                         __('Target database `%s` was not found!'),
@@ -1271,7 +1271,7 @@ class Table
 
         if (null !== $new_db && $new_db !== $this->getDbName()) {
             // Ensure the target is valid
-            if (! $GLOBALS['pma']->databases->exists($new_db)) {
+            if (! $GLOBALS['dblist']->databases->exists($new_db)) {
                 $this->errors[] = __('Invalid database:') . ' ' . $new_db;
                 return false;
             }
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index ca5b0a74f8..b6ed4263be 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -35,7 +35,7 @@ use PMA\libraries\DatabaseInterface;
 use PMA\libraries\ErrorHandler;
 use PMA\libraries\Message;
 use PMA\libraries\plugins\AuthenticationPlugin;
-use PMA\libraries\PMA;
+use PMA\libraries\DbList;
 use PMA\libraries\Theme;
 use PMA\libraries\ThemeManager;
 use PMA\libraries\Tracker;
@@ -931,11 +931,11 @@ if (! defined('PMA_MINIMUM_COMMON')) {
         // TODO: Set SQL modes too.
 
         /**
-         * the ListDatabase class
+         * the DbList class as a stub for the ListDatabase class
          */
-        $pma = new PMA;
-        $pma->userlink = $userlink;
-        $pma->controllink = $controllink;
+        $dblist = new DbList;
+        $dblist->userlink = $userlink;
+        $dblist->controllink = $controllink;
 
         /**
          * some resetting has to be done when switching servers
@@ -1077,7 +1077,7 @@ if (! defined('PMA_MINIMUM_COMMON')
     }
     $cfgRelation = PMA_getRelationsParam();
     if (empty($cfgRelation['db'])) {
-        foreach ($GLOBALS['pma']->databases as $database) {
+        foreach ($GLOBALS['dblist']->databases as $database) {
             if ($database == 'phpmyadmin') {
                 PMA_fixPMATables($database, false);
             }
diff --git a/libraries/controllers/server/ServerDatabasesController.php b/libraries/controllers/server/ServerDatabasesController.php
index b798173523..62ec0f90c5 100644
--- a/libraries/controllers/server/ServerDatabasesController.php
+++ b/libraries/controllers/server/ServerDatabasesController.php
@@ -105,7 +105,7 @@ class ServerDatabasesController extends Controller
                 null, $this->_dbstats, null, $this->_sort_by,
                 $this->_sort_order, $this->_pos, true
             );
-            $this->_database_count = count($GLOBALS['pma']->databases);
+            $this->_database_count = count($GLOBALS['dblist']->databases);
         } else {
             $this->_database_count = 0;
         }
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index d4ebd04bf3..95ce9fdcd0 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -58,7 +58,7 @@ function PMA_getHtmlForExportSelectOptions($tmp_select = '')
         $_GET['db_select'] = explode(",", $_GET['db_select']);
     }
 
-    foreach ($GLOBALS['pma']->databases as $current_db) {
+    foreach ($GLOBALS['dblist']->databases as $current_db) {
         if ($GLOBALS['dbi']->isSystemSchema($current_db, true)) {
             continue;
         }
diff --git a/libraries/export.lib.php b/libraries/export.lib.php
index f3bfd93843..cccedcbb83 100644
--- a/libraries/export.lib.php
+++ b/libraries/export.lib.php
@@ -553,7 +553,7 @@ function PMA_exportServer(
         $tmp_select = '|' . $tmp_select . '|';
     }
     // Walk over databases
-    foreach ($GLOBALS['pma']->databases as $current_db) {
+    foreach ($GLOBALS['dblist']->databases as $current_db) {
         if (isset($tmp_select)
             && /*overload*/mb_strpos(' ' . $tmp_select, '|' . $current_db . '|')
         ) {
diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php
index 294cce1627..7e18841a8e 100644
--- a/libraries/mult_submits.inc.php
+++ b/libraries/mult_submits.inc.php
@@ -323,7 +323,7 @@ if (!empty($submit_mult) && !empty($what)) {
     if ($rebuild_database_list) {
         // avoid a problem with the database list navigator
         // when dropping a db from server_databases
-        $GLOBALS['pma']->databases->build();
+        $GLOBALS['dblist']->databases->build();
     }
 } else {
     if (isset($submit_mult)
diff --git a/libraries/mult_submits.lib.php b/libraries/mult_submits.lib.php
index 4bacfffc38..3f89e8af04 100644
--- a/libraries/mult_submits.lib.php
+++ b/libraries/mult_submits.lib.php
@@ -326,7 +326,7 @@ function PMA_getHtmlForCopyMultipleTables($action, $_url_params)
     $html .= PMA_URL_getHiddenInputs($_url_params);
     $html .= '<fieldset class = "input">';
     $html .= '<legend>' . __('Copy tables to') . '</legend>';
-    $databases_list = $GLOBALS['pma']->databases;
+    $databases_list = $GLOBALS['dblist']->databases;
     foreach ($databases_list as $key => $db_name)
         if ($db_name == $GLOBALS['db']){
             $databases_list->offsetUnset($key);
diff --git a/libraries/operations.lib.php b/libraries/operations.lib.php
index 16e8ed4a55..143ad068fd 100644
--- a/libraries/operations.lib.php
+++ b/libraries/operations.lib.php
@@ -389,7 +389,7 @@ function PMA_createDbBeforeCopy()
 
     // rebuild the database list because Table::moveCopy
     // checks in this list if the target db exists
-    $GLOBALS['pma']->databases->build();
+    $GLOBALS['dblist']->databases->build();
 }
 
 /**
@@ -825,13 +825,13 @@ function PMA_getHtmlForMoveTable()
     $html_output .= '<legend>' . __('Move table to (database<b>.</b>table)')
         . '</legend>';
 
-    if (count($GLOBALS['pma']->databases) > $GLOBALS['cfg']['MaxDbList']) {
+    if (count($GLOBALS['dblist']->databases) > $GLOBALS['cfg']['MaxDbList']) {
         $html_output .= '<input type="text" maxlength="100" size="30" '
             . 'name="target_db" value="' . htmlspecialchars($GLOBALS['db'])
             . '"/>';
     } else {
         $html_output .= '<select class="halfWidth" name="target_db">'
-            . $GLOBALS['pma']->databases->getHtmlOptions(true, false)
+            . $GLOBALS['dblist']->databases->getHtmlOptions(true, false)
             . '</select>';
     }
     $html_output .= '&nbsp;<strong>.</strong>&nbsp;';
@@ -1251,13 +1251,13 @@ function PMA_getHtmlForCopytable()
     $html_output .= '<legend>'
         . __('Copy table to (database<b>.</b>table)') . '</legend>';
 
-    if (count($GLOBALS['pma']->databases) > $GLOBALS['cfg']['MaxDbList']) {
+    if (count($GLOBALS['dblist']->databases) > $GLOBALS['cfg']['MaxDbList']) {
         $html_output .= '<input class="halfWidth" type="text" maxlength="100" '
             . 'size="30" name="target_db" '
             . 'value="' . htmlspecialchars($GLOBALS['db']) . '"/>';
     } else {
         $html_output .= '<select class="halfWidth" name="target_db">'
-            . $GLOBALS['pma']->databases->getHtmlOptions(true, false)
+            . $GLOBALS['dblist']->databases->getHtmlOptions(true, false)
             . '</select>';
     }
     $html_output .= '&nbsp;<strong>.</strong>&nbsp;';
diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php
index c082bf0b27..476245d143 100644
--- a/libraries/replication_gui.lib.php
+++ b/libraries/replication_gui.lib.php
@@ -363,7 +363,7 @@ function PMA_getHtmlForReplicationDbMultibox()
     $multi_values .= '<select name="db_select[]" '
         . 'size="6" multiple="multiple" id="db_select">';
 
-    foreach ($GLOBALS['pma']->databases as $current_db) {
+    foreach ($GLOBALS['dblist']->databases as $current_db) {
         if ($GLOBALS['dbi']->isSystemSchema($current_db)) {
             continue;
         }
diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 0a1ef4f7e0..57603169f4 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -3492,7 +3492,7 @@ function PMA_getHtmlForAllTableSpecificRights(
 
         // we already have the list of databases from libraries/common.inc.php
         // via $pma = new PMA;
-        $pred_db_array = $GLOBALS['pma']->databases;
+        $pred_db_array = $GLOBALS['dblist']->databases;
         $databases_to_skip = array('information_schema', 'performance_schema');
 
         $databases = array();
diff --git a/templates/table/relation/foreign_key_row.phtml b/templates/table/relation/foreign_key_row.phtml
index 52ba45c501..3820f35ca3 100644
--- a/templates/table/relation/foreign_key_row.phtml
+++ b/templates/table/relation/foreign_key_row.phtml
@@ -145,7 +145,7 @@ if ($foreign_db) {
                 array(
                     'name' => 'destination_foreign_db[' . $i . ']',
                     'title' => __('Database'),
-                    'values' => $GLOBALS['pma']->databases,
+                    'values' => $GLOBALS['dblist']->databases,
                     'foreign' => $foreign_db
                 )
             ); ?>
@@ -193,4 +193,4 @@ if ($foreign_db) {
             </span>
         <?php endif; ?>
     </td>
-</tr>
\ No newline at end of file
+</tr>
diff --git a/templates/table/relation/internal_relational_row.phtml b/templates/table/relation/internal_relational_row.phtml
index 3d762bd40f..e1f602edcd 100644
--- a/templates/table/relation/internal_relational_row.phtml
+++ b/templates/table/relation/internal_relational_row.phtml
@@ -55,7 +55,7 @@ if ($foreign_db && $foreign_table) {
             array(
                 'name' => 'destination_db[' . $myfield_md5 . ']',
                 'title' => __('Database'),
-                'values' => $GLOBALS['pma']->databases,
+                'values' => $GLOBALS['dblist']->databases,
                 'foreign' => $foreign_db
             )
         ); ?>
diff --git a/test/classes/TableTest.php b/test/classes/TableTest.php
index b5821dc435..666ab27735 100644
--- a/test/classes/TableTest.php
+++ b/test/classes/TableTest.php
@@ -51,8 +51,8 @@ class TableTest extends PMATestCase
         $GLOBALS['pmaThemeImage'] = 'themes/dot.gif';
         $GLOBALS['is_ajax_request'] = false;
         $GLOBALS['cfgRelation'] = PMA_getRelationsParam();
-        $GLOBALS['pma'] = new DataBasePMAMock();
-        $GLOBALS['pma']->databases = new DataBaseMock();
+        $GLOBALS['dblist'] = new DataBasePMAMock();
+        $GLOBALS['dblist']->databases = new DataBaseMock();
 
         $sql_isView_true =  "SELECT TABLE_NAME
             FROM information_schema.VIEWS
diff --git a/test/classes/controllers/TableRelationControllerTest.php b/test/classes/controllers/TableRelationControllerTest.php
index 5ca0ee0cfc..f78bccc13f 100644
--- a/test/classes/controllers/TableRelationControllerTest.php
+++ b/test/classes/controllers/TableRelationControllerTest.php
@@ -47,8 +47,8 @@ class TableRelationControllerTest extends PMATestCase
         $_REQUEST['foreignDb'] = 'db';
         $_REQUEST['foreignTable'] = 'table';
 
-        $GLOBALS['pma'] = new DataBasePMAMockForTblRelation();
-        $GLOBALS['pma']->databases = new DataBaseMockForTblRelation();
+        $GLOBALS['dblist'] = new DataBasePMAMockForTblRelation();
+        $GLOBALS['dblist']->databases = new DataBaseMockForTblRelation();
 
         $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
             ->disableOriginalConstructor()
diff --git a/test/libraries/PMA_server_privileges_test.php b/test/libraries/PMA_server_privileges_test.php
index 50e921259f..abc3b15a78 100644
--- a/test/libraries/PMA_server_privileges_test.php
+++ b/test/libraries/PMA_server_privileges_test.php
@@ -2096,8 +2096,8 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
         );
 
         // Test case 2
-        $GLOBALS['pma'] = new stdClass();
-        $GLOBALS['pma']->databases = array('x', 'y', 'z');
+        $GLOBALS['dblist'] = new stdClass();
+        $GLOBALS['dblist']->databases = array('x', 'y', 'z');
         $actual = PMA_getHtmlForAllTableSpecificRights('pma2', 'host2', 'database', '');
         $this->assertContains(
             '<legend data-submenu-label="Database">'