From 0761fb18011d2d6b80d4894b2c2184afd503e717 Mon Sep 17 00:00:00 2001 From: Hugues Peccatte Date: Sat, 29 Aug 2015 22:29:21 +0200 Subject: [PATCH] Rename classes files. Rename classes. Signed-off-by: Hugues Peccatte --- db_operations.php | 4 +- db_qbe.php | 10 +-- db_structure.php | 2 +- export.php | 4 +- file_echo.php | 4 +- gis_data_editor.php | 4 +- import.php | 4 +- index.php | 8 +- js/common.js | 4 +- libraries/Console.php | 2 +- libraries/DatabaseInterface.php | 12 +-- libraries/DbQbe.php | 8 +- libraries/DisplayResults.php | 18 ++-- libraries/Footer.php | 12 +-- libraries/Header.php | 12 +-- .../{Response.class.php => Response.php} | 0 ...edSearches.class.php => SavedSearches.php} | 2 +- libraries/{Scripts.class.php => Scripts.php} | 4 +- ...tusData.class.php => ServerStatusData.php} | 4 +- ...rageEngine.class.php => StorageEngine.php} | 12 +-- libraries/{String.class.php => String.php} | 18 ++-- ...tType.class.php => StringAbstractType.php} | 10 +-- .../{StringByte.int.php => StringByte.php} | 2 +- ...{StringCType.class.php => StringCType.php} | 8 +- ...iveType.class.php => StringNativeType.php} | 8 +- .../{StringType.int.php => StringType.php} | 2 +- ...mDatabase.class.php => SystemDatabase.php} | 0 libraries/{Table.class.php => Table.php} | 32 +++---- .../{Template.class.php => Template.php} | 0 libraries/Util.php | 8 +- libraries/central_columns.lib.php | 2 +- libraries/common.inc.php | 12 +-- libraries/config/FormDisplay.tpl.php | 4 +- .../DatabaseStructureController.class.php | 2 +- .../TableChartController.class.php | 2 +- .../TableIndexesController.class.php | 2 +- .../TableRelationController.class.php | 8 +- .../TableSearchController.class.php | 2 +- .../TableStructureController.class.php | 16 ++-- libraries/core.lib.php | 8 +- libraries/create_addfield.lib.php | 4 +- libraries/db_common.inc.php | 4 +- libraries/db_designer.lib.php | 2 +- libraries/db_table_exists.lib.php | 4 +- libraries/display_create_table.lib.php | 2 +- libraries/display_export.lib.php | 6 +- libraries/engines/bdb.lib.php | 4 +- libraries/engines/binlog.lib.php | 4 +- libraries/engines/innodb.lib.php | 4 +- libraries/engines/memory.lib.php | 4 +- libraries/engines/merge.lib.php | 4 +- libraries/engines/myisam.lib.php | 4 +- libraries/engines/ndbcluster.lib.php | 4 +- libraries/engines/pbxt.lib.php | 4 +- libraries/engines/performance_schema.lib.php | 4 +- libraries/error_report.lib.php | 2 +- libraries/export.lib.php | 6 +- libraries/import.lib.php | 4 +- libraries/mult_submits.inc.php | 4 +- .../navigation/NavigationHeader.class.php | 2 +- libraries/normalization.lib.php | 2 +- libraries/operations.lib.php | 18 ++-- libraries/pmd_common.php | 4 +- libraries/relation.lib.php | 6 +- libraries/rte/rte_routines.lib.php | 2 +- libraries/server_databases.lib.php | 2 +- libraries/server_engines.lib.php | 8 +- libraries/server_status.lib.php | 10 +-- libraries/server_status_monitor.lib.php | 8 +- libraries/server_status_processes.lib.php | 4 +- libraries/server_status_queries.lib.php | 6 +- libraries/server_status_variables.lib.php | 10 +-- libraries/sql.lib.php | 20 ++--- libraries/tbl_columns_definition_form.inc.php | 12 +-- libraries/tbl_info.inc.php | 8 +- libraries/user_preferences.inc.php | 2 +- libraries/user_preferences.lib.php | 2 +- prefs_manage.php | 4 +- schema_export.php | 2 +- scripts/advisor2po | 2 +- scripts/decode_bug.php | 4 +- server_engines.php | 2 +- server_status.php | 9 +- server_status_advisor.php | 9 +- server_status_monitor.php | 6 +- server_status_processes.php | 6 +- server_status_queries.php | 9 +- server_status_variables.php | 9 +- sql.php | 2 +- tbl_addfield.php | 4 +- tbl_chart.php | 2 +- tbl_create.php | 4 +- tbl_find_replace.php | 2 +- tbl_gis_visualization.php | 2 +- tbl_indexes.php | 2 +- tbl_operations.php | 10 +-- tbl_relation.php | 8 +- tbl_replace.php | 4 +- tbl_select.php | 2 +- tbl_structure.php | 2 +- tbl_zoom_select.php | 2 +- .../column_definitions_form.phtml | 4 +- .../table/relation/foreign_key_row.phtml | 4 +- .../relation/internal_relational_row.phtml | 4 +- test/bootstrap-dist.php | 6 +- test/classes/PMA_DatabaseInterface_test.php | 2 +- test/classes/PMA_DisplayResults_test.php | 4 +- test/classes/PMA_Footer_test.php | 4 +- test/classes/PMA_Header_test.php | 2 +- test/classes/PMA_Menu_test.php | 2 +- test/classes/PMA_Scripts_test.php | 10 +-- test/classes/PMA_ServerStatusData_test.php | 12 +-- test/classes/PMA_StorageEngine_test.php | 10 +-- test/classes/PMA_SystemDatabase_test.php | 6 +- test/classes/PMA_Table_test.php | 88 +++++++++---------- test/classes/PMA_Template_test.php | 2 +- .../DatabaseStructureController_test.php | 4 +- .../TableIndexesController_test.php | 4 +- .../TableStructureController_test.php | 2 +- .../auth/PMA_AuthenticationConfig_test.php | 2 +- .../auth/PMA_AuthenticationCookie_test.php | 2 +- .../plugin/export/PMA_ExportSql_test.php | 16 ++-- .../plugin/export/PMA_ExportXml_test.php | 10 +-- test/classes/plugin/import/ImportCsv_test.php | 2 +- test/classes/plugin/import/ImportLdi_test.php | 2 +- .../plugin/import/ImportMediawiki_test.php | 2 +- test/classes/plugin/import/ImportOds_test.php | 2 +- test/classes/plugin/import/ImportShp_test.php | 2 +- test/classes/plugin/import/ImportSql_test.php | 2 +- test/classes/plugin/import/ImportXml_test.php | 2 +- .../schema/Dia_Relation_Schema_test.php | 2 +- .../schema/Pdf_Relation_Schema_test.php | 2 +- test/engines/PMA_StorageEngine_bdb_test.php | 2 +- .../engines/PMA_StorageEngine_binlog_test.php | 2 +- .../engines/PMA_StorageEngine_innodb_test.php | 2 +- .../engines/PMA_StorageEngine_memory_test.php | 2 +- .../PMA_StorageEngine_mrg_myisam_test.php | 2 +- .../engines/PMA_StorageEngine_myisam_test.php | 2 +- .../PMA_StorageEngine_ndbcluster_test.php | 2 +- test/engines/PMA_StorageEngine_pbxt_test.php | 2 +- test/libraries/PMA_StringCType_test.php | 6 +- test/libraries/PMA_StringNativeType_test.php | 6 +- test/libraries/PMA_display_export_test.php | 4 +- test/libraries/PMA_insert_edit_test.php | 10 +-- test/libraries/PMA_mult_submits_test.php | 4 +- test/libraries/PMA_server_engines_test.php | 12 +-- test/libraries/PMA_server_privileges_test.php | 2 +- .../PMA_server_status_advisor_test.php | 8 +- .../PMA_server_status_monitor_test.php | 8 +- .../PMA_server_status_processes_test.php | 2 +- .../PMA_server_status_queries_test.php | 8 +- test/libraries/PMA_server_status_test.php | 8 +- .../PMA_server_status_variables_test.php | 8 +- test/libraries/PMA_server_variables_test.php | 2 +- test/libraries/PMA_string_test.php | 8 +- .../common/PMA_showMessage_test_disabled.php | 2 +- test/libraries/core/PMA_fatalError_test.php | 2 +- .../core/PMA_getTableCount_test_dis.php | 2 +- .../core/PMA_headerLocation_test.php | 4 +- test/libraries/stubs/ResponseStub.php | 4 +- view_create.php | 2 +- view_operations.php | 4 +- 162 files changed, 469 insertions(+), 465 deletions(-) rename libraries/{Response.class.php => Response.php} (100%) rename libraries/{SavedSearches.class.php => SavedSearches.php} (99%) rename libraries/{Scripts.class.php => Scripts.php} (99%) rename libraries/{ServerStatusData.class.php => ServerStatusData.php} (99%) rename libraries/{StorageEngine.class.php => StorageEngine.php} (97%) rename libraries/{String.class.php => String.php} (91%) rename libraries/{StringAbstractType.class.php => StringAbstractType.php} (67%) rename libraries/{StringByte.int.php => StringByte.php} (99%) rename libraries/{StringCType.class.php => StringCType.php} (91%) rename libraries/{StringNativeType.class.php => StringNativeType.php} (93%) rename libraries/{StringType.int.php => StringType.php} (98%) rename libraries/{SystemDatabase.class.php => SystemDatabase.php} (100%) rename libraries/{Table.class.php => Table.php} (99%) rename libraries/{Template.class.php => Template.php} (100%) diff --git a/db_operations.php b/db_operations.php index 86c762f02d..9e70dfdc5e 100644 --- a/db_operations.php +++ b/db_operations.php @@ -11,7 +11,7 @@ * * @package PhpMyAdmin */ -use PMA\libraries\PMA_String; +use PMA\libraries\String; /** * requirements @@ -37,7 +37,7 @@ $sql_query = ''; /** * Rename/move or copy database */ -/** @var PMA_String $pmaString */ +/** @var String $pmaString */ $pmaString = $GLOBALS['PMA_String']; if (/*overload*/mb_strlen($GLOBALS['db']) && (! empty($_REQUEST['db_rename']) || ! empty($_REQUEST['db_copy'])) diff --git a/db_qbe.php b/db_qbe.php index 7522012bea..6eea2a402e 100644 --- a/db_qbe.php +++ b/db_qbe.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin */ -use PMA\libraries\PMA_SavedSearches; +use PMA\libraries\SavedSearches; /** * requirements @@ -23,13 +23,13 @@ $savedSearchList = array(); $savedSearch = null; $currentSearchId = null; if ($cfgRelation['savedsearcheswork']) { - include 'libraries/SavedSearches.class.php'; + include 'libraries/SavedSearches.php'; $header = $response->getHeader(); $scripts = $header->getScripts(); $scripts->addFile('db_qbe.js'); //Get saved search list. - $savedSearch = new PMA_SavedSearches($GLOBALS); + $savedSearch = new SavedSearches($GLOBALS); $savedSearch->setUsername($GLOBALS['cfg']['Server']['user']) ->setDbname($_REQUEST['db']); @@ -50,14 +50,14 @@ if ($cfgRelation['savedsearcheswork']) { } elseif ('delete' === $_REQUEST['action']) { $deleteResult = $savedSearch->delete(); //After deletion, reset search. - $savedSearch = new PMA_SavedSearches($GLOBALS); + $savedSearch = new SavedSearches($GLOBALS); $savedSearch->setUsername($GLOBALS['cfg']['Server']['user']) ->setDbname($_REQUEST['db']); $_REQUEST = array(); } elseif ('load' === $_REQUEST['action']) { if (empty($_REQUEST['searchId'])) { //when not loading a search, reset the object. - $savedSearch = new PMA_SavedSearches($GLOBALS); + $savedSearch = new SavedSearches($GLOBALS); $savedSearch->setUsername($GLOBALS['cfg']['Server']['user']) ->setDbname($_REQUEST['db']); $_REQUEST = array(); diff --git a/db_structure.php b/db_structure.php index 3240d561af..66a54bd78a 100644 --- a/db_structure.php +++ b/db_structure.php @@ -27,7 +27,7 @@ list( require_once 'libraries/di/Container.class.php'; require_once 'libraries/controllers/DatabaseStructureController.class.php'; -require_once 'libraries/Response.class.php'; +require_once 'libraries/Response.php'; $container = DI\Container::getDefaultContainer(); $container->factory('PMA\Controllers\DatabaseStructureController'); diff --git a/export.php b/export.php index d5edba46a5..4cad88de03 100644 --- a/export.php +++ b/export.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin */ -use PMA\libraries\PMA_String; +use PMA\libraries\String; /** * Get the variables sent or posted to this script and a core script @@ -250,7 +250,7 @@ if (!defined('TESTSUITE')) { } // Generate error url and check for needed variables - /** @var PMA_String $pmaString */ + /** @var String $pmaString */ $pmaString = $GLOBALS['PMA_String']; if ($export_type == 'server') { $err_url = 'server_export.php' . PMA_URL_getCommon(); diff --git a/file_echo.php b/file_echo.php index 0095ae6ec6..71fb474e94 100644 --- a/file_echo.php +++ b/file_echo.php @@ -7,7 +7,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\PMA_String; +use PMA\libraries\String; define('PMA_MINIMUM_COMMON', true); require_once 'libraries/common.inc.php'; @@ -43,7 +43,7 @@ if (isset($_REQUEST['filename']) && isset($_REQUEST['image'])) { $filename = $_REQUEST['filename']; } - /** @var PMA_String $pmaString */ + /** @var String $pmaString */ $pmaString = $GLOBALS['PMA_String']; /* Decode data */ diff --git a/gis_data_editor.php b/gis_data_editor.php index 1344aa3cb0..deeb5a3e73 100644 --- a/gis_data_editor.php +++ b/gis_data_editor.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin */ -use PMA\libraries\PMA_String; +use PMA\libraries\String; /** * Escapes special characters if the variable is set. @@ -40,7 +40,7 @@ $gis_types = array( 'GEOMETRYCOLLECTION' ); -/** @var PMA_String $pmaString */ +/** @var String $pmaString */ $pmaString = $GLOBALS['PMA_String']; // Extract type from the initial call and make sure that it's a valid one. diff --git a/import.php b/import.php index 92df8947f7..ae6f769887 100644 --- a/import.php +++ b/import.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin */ -use PMA\libraries\PMA_String; +use PMA\libraries\String; /** * Get the variables sent or posted to this script and a core script @@ -233,7 +233,7 @@ PMA\libraries\Util::checkParameters(array('import_type', 'format')); // We don't want anything special in format $format = PMA_securePath($format); -/** @var PMA_String $pmaString */ +/** @var String $pmaString */ $pmaString = $GLOBALS['PMA_String']; // Create error and goto url diff --git a/index.php b/index.php index c4aad947e3..196da3ea58 100644 --- a/index.php +++ b/index.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin */ -use PMA\libraries\PMA_String; +use PMA\libraries\String; use PMA\libraries\RecentFavoriteTable; /** @@ -17,7 +17,7 @@ require_once 'libraries/common.inc.php'; * display Git revision if requested */ require_once 'libraries/display_git_revision.lib.php'; -require_once 'libraries/Template.class.php'; +require_once 'libraries/Template.php'; /** * pass variables to child pages @@ -115,7 +115,7 @@ $mysql_cur_user_and_host = ''; // all MySQL-related information if ($server > 0) { include 'libraries/server_common.inc.php'; - include 'libraries/StorageEngine.class.php'; + include 'libraries/StorageEngine.php'; // Use the verbose name of the server instead of the hostname // if a value is set @@ -605,7 +605,7 @@ if (isset($GLOBALS['dbi']) && !PMA_DRIZZLE && $cfg['ServerLibraryDifference_DisableWarning'] == false ) { - /** @var PMA_String $pmaString */ + /** @var String $pmaString */ $pmaString = $GLOBALS['PMA_String']; $_client_info = $GLOBALS['dbi']->getClientInfo(); diff --git a/js/common.js b/js/common.js index 91ab2d20ee..358ce4a142 100644 --- a/js/common.js +++ b/js/common.js @@ -8,7 +8,7 @@ $(function () { * Holds common parameters such as server, db, table, etc * * The content for this is normally loaded from Header.php or - * Response.class.php and executed by ajax.js + * Response.php and executed by ajax.js */ var PMA_commonParams = (function () { /** @@ -99,7 +99,7 @@ var PMA_commonParams = (function () { * Holds common parameters such as server, db, table, etc * * The content for this is normally loaded from Header.php or - * Response.class.php and executed by ajax.js + * Response.php and executed by ajax.js */ var PMA_commonActions = { /** diff --git a/libraries/Console.php b/libraries/Console.php index 41ef2d0ccc..342381a383 100644 --- a/libraries/Console.php +++ b/libraries/Console.php @@ -11,7 +11,7 @@ if (! defined('PHPMYADMIN')) { exit; } -require_once 'libraries/Scripts.class.php'; +require_once 'libraries/Scripts.php'; require_once 'libraries/bookmark.lib.php'; /** diff --git a/libraries/DatabaseInterface.php b/libraries/DatabaseInterface.php index f021a3486b..e275a1536d 100644 --- a/libraries/DatabaseInterface.php +++ b/libraries/DatabaseInterface.php @@ -11,7 +11,7 @@ use PMA\SystemDatabase; require_once './libraries/logging.lib.php'; require_once './libraries/Index.php'; -require_once './libraries/SystemDatabase.class.php'; +require_once './libraries/SystemDatabase.php'; require_once './libraries/util.lib.php'; /** @@ -152,7 +152,7 @@ class DatabaseInterface } /** - * Caches table data so PMA_Table does not require to issue + * Caches table data so Table does not require to issue * SHOW TABLE STATUS again * * @param array $tables information for tables of some databases @@ -520,7 +520,7 @@ class DatabaseInterface * @param string $sort_order direction to sort (ASC or DESC) * @param string $table_type whether table or view * - * @todo move into PMA_Table + * @todo move into Table * * @return array list of tables in given db(s) */ @@ -801,7 +801,7 @@ class DatabaseInterface } // cache table data - // so PMA_Table does not require to issue SHOW TABLE STATUS again + // so Table does not require to issue SHOW TABLE STATUS again $this->_cacheTableData($tables, $table); if (is_array($database)) { @@ -3195,10 +3195,10 @@ class DatabaseInterface * @param string $db_name DB name * @param string $table_name Table name * - * @return PMA_Table + * @return Table */ public function getTable($db_name, $table_name) { - return new PMA_Table($table_name, $db_name, $this); + return new Table($table_name, $db_name, $this); } } diff --git a/libraries/DbQbe.php b/libraries/DbQbe.php index 274e05a80e..2307d21b19 100644 --- a/libraries/DbQbe.php +++ b/libraries/DbQbe.php @@ -204,7 +204,7 @@ class DbQbe * Current search * * @access private - * @var PMA_SavedSearches + * @var SavedSearches */ private $_currentSearch = null; @@ -230,7 +230,7 @@ class DbQbe /** * Getter for current search * - * @return PMA_SavedSearches + * @return SavedSearches */ private function _getCurrentSearch() { @@ -242,7 +242,7 @@ class DbQbe * * @param string $dbname Database name * @param array $savedSearchList List of saved searches - * @param PMA_SavedSearches $currentSearch Current search id + * @param SavedSearches $currentSearch Current search id */ public function __construct( $dbname, $savedSearchList = array(), $currentSearch = null @@ -1476,7 +1476,7 @@ class DbQbe $csize = array(); foreach ($candidate_columns as $table) { if ($checked_tables[$table] != 1) { - $_table = new PMA_Table($table, $this->_db); + $_table = new Table($table, $this->_db); $tsize[$table] = $_table->countRecords(); $checked_tables[$table] = 1; } diff --git a/libraries/DisplayResults.php b/libraries/DisplayResults.php index 632c17503a..a0ee37d5c5 100644 --- a/libraries/DisplayResults.php +++ b/libraries/DisplayResults.php @@ -644,7 +644,7 @@ class DisplayResults // - For a VIEW we (probably) did not count the number of rows // so don't test this number here, it would remove the possibility // of sorting VIEW results. - $_table = new PMA_Table($table, $db); + $_table = new Table($table, $db); if (isset($unlim_num_rows) && ($unlim_num_rows < 2) && ! $_table->isView() @@ -1658,15 +1658,15 @@ class DisplayResults $data_html = ''; // generate the column order, if it is set - $pmatable = new PMA_Table($this->__get('table'), $this->__get('db')); - $col_order = $pmatable->getUiProp(PMA_Table::PROP_COLUMN_ORDER); + $pmatable = new Table($this->__get('table'), $this->__get('db')); + $col_order = $pmatable->getUiProp(Table::PROP_COLUMN_ORDER); if ($col_order) { $data_html .= ''; } - $col_visib = $pmatable->getUiProp(PMA_Table::PROP_COLUMN_VISIB); + $col_visib = $pmatable->getUiProp(Table::PROP_COLUMN_VISIB); if ($col_visib) { $data_html .= '' . "\n"; - foreach (PMA_StorageEngine::getStorageEngines() as $key => $details) { + foreach (StorageEngine::getStorageEngines() as $key => $details) { // Don't show PERFORMANCE_SCHEMA engine (MySQL 5.5) // Don't show MyISAM for Drizzle (allowed only for temporary tables) if (! $offerUnavailableEngines @@ -178,7 +178,7 @@ class PMA_StorageEngine * * @param string $engine The engine ID * - * @return PMA_StorageEngine|bool The engine plugin or false if not found + * @return StorageEngine|bool The engine plugin or false if not found * @static */ static public function getEngine($engine) @@ -217,7 +217,7 @@ class PMA_StorageEngine return false; } - return new PMA_StorageEngine($engine); + return new StorageEngine($engine); } /** @@ -233,7 +233,7 @@ class PMA_StorageEngine if ($engine == "PBMS") { return true; } - $storage_engines = PMA_StorageEngine::getStorageEngines(); + $storage_engines = StorageEngine::getStorageEngines(); return isset($storage_engines[$engine]); } diff --git a/libraries/String.class.php b/libraries/String.php similarity index 91% rename from libraries/String.class.php rename to libraries/String.php index b9bc7965ab..769a9a044b 100644 --- a/libraries/String.class.php +++ b/libraries/String.php @@ -7,20 +7,20 @@ */ namespace PMA\libraries; -use PMA_StringType; +use StringType; -require_once 'libraries/StringType.int.php'; -require_once 'libraries/StringByte.int.php'; +require_once 'libraries/StringType.php'; +require_once 'libraries/StringByte.php'; /** * Specialized string class for phpMyAdmin. * The SQL Parser code relies heavily on these functions. * * @package PhpMyAdmin-String */ -class PMA_String implements PMA_StringType +class String implements StringType { /** - * @var PMA_StringType + * @var StringType */ private $_type; @@ -30,11 +30,11 @@ class PMA_String implements PMA_StringType public function __construct() { if (@extension_loaded('ctype')) { - include_once 'libraries/StringCType.class.php'; - $this->_type = new PMA_StringCType(); + include_once 'libraries/StringCType.php'; + $this->_type = new StringCType(); } else { - include_once 'libraries/StringNativeType.class.php'; - $this->_type = new PMA_StringNativeType(); + include_once 'libraries/StringNativeType.php'; + $this->_type = new StringNativeType(); } } diff --git a/libraries/StringAbstractType.class.php b/libraries/StringAbstractType.php similarity index 67% rename from libraries/StringAbstractType.class.php rename to libraries/StringAbstractType.php index 1527da3edc..bf407956b3 100644 --- a/libraries/StringAbstractType.class.php +++ b/libraries/StringAbstractType.php @@ -1,22 +1,22 @@ freeResult($table_copy_rs); return $last_id; - } // end of 'PMA_Table::duplicateInfo()' function + } // end of 'Table::duplicateInfo()' function /** * Copies or renames table @@ -722,7 +722,7 @@ class PMA_Table // Try moving the tables directly, using native `RENAME` statement. if ($move && $what == 'data') { - $tbl = new PMA_Table($source_table, $source_db); + $tbl = new Table($source_table, $source_db); if ($tbl->rename($target_table, $target_db)) { $GLOBALS['message'] = $tbl->getLastMessage(); return true; @@ -852,7 +852,7 @@ class PMA_Table */ $statement = new DropStatement(); - $tbl = new PMA_Table($target_db, $target_table); + $tbl = new Table($target_db, $target_table); $statement->options = new OptionsArray( array( @@ -1011,7 +1011,7 @@ class PMA_Table $GLOBALS['sql_query'] = ''; } - $_table = new PMA_Table($target_table, $target_db); + $_table = new Table($target_table, $target_db); // Copy the data unless this is a VIEW if (($what == 'data' || $what == 'dataonly') && ! $_table->isView() @@ -1037,7 +1037,7 @@ class PMA_Table // moving table from replicated one to not replicated one $GLOBALS['dbi']->selectDb($source_db); - $_source_table = new PMA_Table($source_table, $source_db); + $_source_table = new Table($source_table, $source_db); if ($_source_table->isView()) { $sql_drop_query = 'DROP VIEW'; } else { @@ -1132,7 +1132,7 @@ class PMA_Table 'db_name' => $target_db, 'table_name' => $target_table ); - PMA_Table::duplicateInfo( + Table::duplicateInfo( 'displaywork', 'table_info', $get_fields, @@ -1157,7 +1157,7 @@ class PMA_Table 'foreign_db' => $target_db, 'master_table' => $target_table ); - PMA_Table::duplicateInfo( + Table::duplicateInfo( 'relwork', 'relation', $get_fields, @@ -1179,7 +1179,7 @@ class PMA_Table 'foreign_db' => $target_db, 'foreign_table' => $target_table ); - PMA_Table::duplicateInfo( + Table::duplicateInfo( 'relwork', 'relation', $get_fields, @@ -1197,7 +1197,7 @@ class PMA_Table $get_fields = array('page_descr'); $where_fields = array('db_name' => $source_db); $new_fields = array('db_name' => $target_db); - $last_id = PMA_Table::duplicateInfo( + $last_id = Table::duplicateInfo( 'pdfwork', 'pdf_pages', $get_fields, @@ -1216,7 +1216,7 @@ class PMA_Table 'table_name' => $target_table, 'pdf_page_number' => $last_id ); - PMA_Table::duplicateInfo( + Table::duplicateInfo( 'pdfwork', 'table_coords', $get_fields, @@ -1280,13 +1280,13 @@ class PMA_Table $new_db = $this->getDbName(); } - $new_table = new PMA_Table($new_name, $new_db); + $new_table = new Table($new_name, $new_db); if ($this->getFullName() === $new_table->getFullName()) { return true; } - if (! PMA_Table::isValidName($new_name)) { + if (! Table::isValidName($new_name)) { $this->errors[] = __('Invalid table name:') . ' ' . $new_table->getFullName(); return false; diff --git a/libraries/Template.class.php b/libraries/Template.php similarity index 100% rename from libraries/Template.class.php rename to libraries/Template.php diff --git a/libraries/Util.php b/libraries/Util.php index 17654e6388..c42b1322d7 100644 --- a/libraries/Util.php +++ b/libraries/Util.php @@ -14,7 +14,7 @@ if (! defined('PHPMYADMIN')) { exit; } -require_once 'libraries/Template.class.php'; +require_once 'libraries/Template.php'; /** * Misc functions used all over the scripts. @@ -817,10 +817,10 @@ class Util // and this would break the navigation panel; // but we can check row count if this is a view or the // information_schema database - // since PMA_Table::countRecords() returns a limited row count + // since Table::countRecords() returns a limited row count // in this case. - // set this because PMA_Table::countRecords() can use it + // set this because Table::countRecords() can use it $tbl_is_view = $table['TABLE_TYPE'] == 'VIEW'; if ($tbl_is_view || $GLOBALS['dbi']->isSystemSchema($db)) { @@ -2088,7 +2088,7 @@ class Util * @param string $Separator The Separator (defaults to "
\n") * * @access public - * @todo add a multibyte safe function $GLOBALS['PMA_String']->split() + * @todo add a multibyte safe function $GLOBALS['String']->split() * * @return string The flipped string */ diff --git a/libraries/central_columns.lib.php b/libraries/central_columns.lib.php index 8319190351..af89ac4878 100644 --- a/libraries/central_columns.lib.php +++ b/libraries/central_columns.lib.php @@ -12,7 +12,7 @@ if (! defined('PHPMYADMIN')) { exit; } -require_once './libraries/Template.class.php'; +require_once './libraries/Template.php'; /** * Defines the central_columns parameters for the current user diff --git a/libraries/common.inc.php b/libraries/common.inc.php index a0fcc98496..3a576def5f 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\PMA; -use PMA\libraries\PMA_String; +use PMA\libraries\String; use PMA\libraries\PMA_Theme; use PMA\libraries\PMA_Theme_Manager; use PMA\libraries\PMA_Tracker; @@ -70,8 +70,8 @@ require_once './libraries/autoloader.php'; /** * String handling (security) */ -require_once './libraries/String.class.php'; -$PMA_String = new PMA_String(); +require_once './libraries/String.php'; +$PMA_String = new String(); /** * initialize the error handler @@ -127,9 +127,9 @@ require './libraries/relation.lib.php'; require './libraries/Tracker.class.php'; /** - * the PMA_Table class + * the Table class */ -require './libraries/Table.class.php'; +require './libraries/Table.php'; /** * the PMA_Types class @@ -151,7 +151,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { /** * Used to generate the page */ - include_once 'libraries/Response.class.php'; + include_once 'libraries/Response.php'; } /******************************************************************************/ diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php index 45d6d7facf..964a1ff004 100644 --- a/libraries/config/FormDisplay.tpl.php +++ b/libraries/config/FormDisplay.tpl.php @@ -60,7 +60,7 @@ function PMA_displayTabsTop($tabs) ); } - include_once './libraries/Template.class.php'; + include_once './libraries/Template.php'; $htmlOutput = PMA\libraries\Template::get('list/unordered')->render( array( 'class' => 'tabs', @@ -494,7 +494,7 @@ function PMA_displayJavascript($js_array) return null; } - include_once './libraries/Template.class.php'; + include_once './libraries/Template.php'; return PMA\libraries\Template::get('javascript/display')->render( array('js_array' => $js_array,) diff --git a/libraries/controllers/DatabaseStructureController.class.php b/libraries/controllers/DatabaseStructureController.class.php index 70ee71e89b..83aed09539 100644 --- a/libraries/controllers/DatabaseStructureController.class.php +++ b/libraries/controllers/DatabaseStructureController.class.php @@ -19,7 +19,7 @@ use PMA_PageSettings; require_once 'libraries/mysql_charsets.inc.php'; require_once 'libraries/config/page_settings.class.php'; require_once 'libraries/display_create_table.lib.php'; -require_once 'libraries/Template.class.php'; +require_once 'libraries/Template.php'; require_once 'libraries/controllers/DatabaseController.class.php'; /** diff --git a/libraries/controllers/TableChartController.class.php b/libraries/controllers/TableChartController.class.php index edcbca956b..697c7abb2d 100644 --- a/libraries/controllers/TableChartController.class.php +++ b/libraries/controllers/TableChartController.class.php @@ -15,7 +15,7 @@ use PMA\libraries\Util; require_once 'libraries/Util.php'; require_once 'libraries/Message.php'; -require_once 'libraries/Template.class.php'; +require_once 'libraries/Template.php'; require_once 'libraries/controllers/TableController.class.php'; /** diff --git a/libraries/controllers/TableIndexesController.class.php b/libraries/controllers/TableIndexesController.class.php index 36ea2e18cb..05ba1a8ed5 100644 --- a/libraries/controllers/TableIndexesController.class.php +++ b/libraries/controllers/TableIndexesController.class.php @@ -20,7 +20,7 @@ require_once 'libraries/Message.php'; require_once 'libraries/Util.php'; require_once 'libraries/Index.php'; require_once 'libraries/controllers/TableController.class.php'; -require_once 'libraries/Template.class.php'; +require_once 'libraries/Template.php'; /** * Class TableIndexesController diff --git a/libraries/controllers/TableRelationController.class.php b/libraries/controllers/TableRelationController.class.php index 7aa70eb3da..6f06af8fee 100644 --- a/libraries/controllers/TableRelationController.class.php +++ b/libraries/controllers/TableRelationController.class.php @@ -11,15 +11,15 @@ namespace PMA\Controllers\Table; require_once 'libraries/DatabaseInterface.php'; require_once 'libraries/controllers/TableController.class.php'; require_once 'libraries/index.lib.php'; -require_once 'libraries/Template.class.php'; -require_once 'libraries/Table.class.php'; +require_once 'libraries/Template.php'; +require_once 'libraries/Table.php'; require_once 'libraries/Index.php'; require_once 'libraries/Util.php'; use PMA\Controllers\TableController; use PMA\libraries\DatabaseInterface; use PMA\libraries\Index; -use PMA\libraries\PMA_Table; +use PMA\libraries\Table; use PMA\libraries\Template; use PMA\libraries\Util; @@ -61,7 +61,7 @@ class TableRelationController extends TableController protected $existrel_foreign; /** - * @var PMA_Table $udp_query + * @var Table $udp_query */ protected $upd_query; diff --git a/libraries/controllers/TableSearchController.class.php b/libraries/controllers/TableSearchController.class.php index 4af50cf7f8..bba39b3477 100644 --- a/libraries/controllers/TableSearchController.class.php +++ b/libraries/controllers/TableSearchController.class.php @@ -13,7 +13,7 @@ use PMA\libraries\Template; use PMA\Controllers\TableController; use PMA\libraries\DatabaseInterface; -require_once 'libraries/Template.class.php'; +require_once 'libraries/Template.php'; require_once 'libraries/mysql_charsets.inc.php'; require_once 'libraries/sql.lib.php'; require_once 'libraries/bookmark.lib.php'; diff --git a/libraries/controllers/TableStructureController.class.php b/libraries/controllers/TableStructureController.class.php index e6e1f228dc..4dffeefbc3 100644 --- a/libraries/controllers/TableStructureController.class.php +++ b/libraries/controllers/TableStructureController.class.php @@ -11,7 +11,7 @@ namespace PMA\Controllers; use PMA\libraries\Index; use PMA\libraries\Message; -use PMA\libraries\PMA_Table; +use PMA\libraries\Table; use PMA\libraries\Template; use PMA\libraries\Util; use PMA\Util as Util_lib; @@ -25,7 +25,7 @@ require_once 'libraries/Partition.php'; require_once 'libraries/mysql_charsets.inc.php'; require_once 'libraries/config/page_settings.class.php'; require_once 'libraries/transformations.lib.php'; -require_once 'libraries/Template.class.php'; +require_once 'libraries/Template.php'; require_once 'libraries/util.lib.php'; require_once 'libraries/controllers/TableController.class.php'; @@ -37,7 +37,7 @@ require_once 'libraries/controllers/TableController.class.php'; class TableStructureController extends TableController { /** - * @var PMA_Table The table object + * @var Table The table object */ protected $_table_obj; /** @@ -422,7 +422,7 @@ class TableStructureController extends TableController $data['Expression'] = $expressions[$column]; } - $changes[] = 'CHANGE ' . PMA_Table::generateAlter( + $changes[] = 'CHANGE ' . Table::generateAlter( $column, $column, /*overload*/mb_strtoupper($extracted_columnspec['type']), @@ -626,7 +626,7 @@ class TableStructureController extends TableController continue; } - $changes[] = 'CHANGE ' . PMA_Table::generateAlter( + $changes[] = 'CHANGE ' . Table::generateAlter( Util_lib\get($_REQUEST, "field_orig.${i}", ''), $_REQUEST['field_name'][$i], $_REQUEST['field_type'][$i], @@ -645,7 +645,7 @@ class TableStructureController extends TableController // find the remembered sort expression $sorted_col = $this->table_obj->getUiProp( - PMA_Table::PROP_SORTED_COLUMN + Table::PROP_SORTED_COLUMN ); // if the old column name is part of the remembered sort expression if (/*overload*/mb_strpos( @@ -653,7 +653,7 @@ class TableStructureController extends TableController Util::backquote($_REQUEST['field_orig'][$i]) ) !== false) { // delete the whole remembered sort expression - $this->table_obj->removeUiProp(PMA_Table::PROP_SORTED_COLUMN); + $this->table_obj->removeUiProp(Table::PROP_SORTED_COLUMN); } if (isset($_REQUEST['field_adjust_privileges'][$i]) @@ -754,7 +754,7 @@ class TableStructureController extends TableController // Change back to Orignal Collation and data type for ($i = 0; $i < $field_cnt; $i++) { if ($changedToBlob[$i]) { - $changes_revert[] = 'CHANGE ' . PMA_Table::generateAlter( + $changes_revert[] = 'CHANGE ' . Table::generateAlter( Util_lib\get($_REQUEST, "field_orig.${i}", ''), $_REQUEST['field_name'][$i], $_REQUEST['field_type_orig'][$i], diff --git a/libraries/core.lib.php b/libraries/core.lib.php index 5edc1d8f6d..7da1ab652c 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -8,7 +8,7 @@ * @package PhpMyAdmin */ use PMA\libraries\Message; -use PMA\libraries\PMA_String; +use PMA\libraries\String; if (! defined('PHPMYADMIN')) { exit; @@ -18,8 +18,8 @@ if (! defined('PHPMYADMIN')) { * String handling (security) */ require_once 'libraries/string.lib.php'; -require_once 'libraries/String.class.php'; -$PMA_String = new PMA_String(); +require_once 'libraries/String.php'; +$PMA_String = new String(); /** * checks given $var and returns it if valid, or $default of not valid @@ -593,7 +593,7 @@ function PMA_sendHeaderLocation($uri, $use_refresh = false) include_once './libraries/js_escape.lib.php'; PMA\libraries\Response::getInstance()->disable(); - include_once './libraries/Template.class.php'; + include_once './libraries/Template.php'; echo PMA\libraries\Template::get('header_location') ->render(array('uri' => $uri)); diff --git a/libraries/create_addfield.lib.php b/libraries/create_addfield.lib.php index a8547e9bb2..0817c4ce67 100644 --- a/libraries/create_addfield.lib.php +++ b/libraries/create_addfield.lib.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\PMA_Table; +use PMA\libraries\Table; if (! defined('PHPMYADMIN')) { exit; @@ -56,7 +56,7 @@ function PMA_buildColumnCreationStatement( } $definition = PMA_getStatementPrefix($is_create_tbl) . - PMA_Table::generateFieldSpec( + Table::generateFieldSpec( trim($_REQUEST['field_name'][$i]), $_REQUEST['field_type'][$i], $_REQUEST['field_length'][$i], diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php index 09c236810e..bf5ce43f8a 100644 --- a/libraries/db_common.inc.php +++ b/libraries/db_common.inc.php @@ -7,7 +7,7 @@ */ use PMA\libraries\Message; use PMA\libraries\Response; -use PMA\libraries\PMA_String; +use PMA\libraries\String; if (! defined('PHPMYADMIN')) { exit; @@ -40,7 +40,7 @@ $err_url = PMA\libraries\Util::getScriptNameForOption( ) . PMA_URL_getCommon(array('db' => $db)); -/** @var PMA_String $pmaString */ +/** @var String $pmaString */ $pmaString = $GLOBALS['PMA_String']; /** diff --git a/libraries/db_designer.lib.php b/libraries/db_designer.lib.php index 7c3bdd649d..5c822801a1 100644 --- a/libraries/db_designer.lib.php +++ b/libraries/db_designer.lib.php @@ -12,7 +12,7 @@ if (! defined('PHPMYADMIN')) { } require_once 'libraries/relation.lib.php'; -require_once 'libraries/Template.class.php'; +require_once 'libraries/Template.php'; /** * Function to get html to display a page selector diff --git a/libraries/db_table_exists.lib.php b/libraries/db_table_exists.lib.php index 397b2123ca..9f30df29e2 100644 --- a/libraries/db_table_exists.lib.php +++ b/libraries/db_table_exists.lib.php @@ -7,13 +7,13 @@ * @package PhpMyAdmin */ use PMA\libraries\Message; -use PMA\libraries\PMA_String; +use PMA\libraries\String; if (! defined('PHPMYADMIN')) { exit; } -/** @var PMA_String $pmaString */ +/** @var String $pmaString */ $pmaString = $GLOBALS['PMA_String']; if (empty($is_db)) { if (/*overload*/mb_strlen($db)) { diff --git a/libraries/display_create_table.lib.php b/libraries/display_create_table.lib.php index 579022d6c7..3d0fdbee11 100644 --- a/libraries/display_create_table.lib.php +++ b/libraries/display_create_table.lib.php @@ -32,7 +32,7 @@ if (! defined('PHPMYADMIN')) { * */ require_once './libraries/check_user_privileges.lib.php'; -require_once 'libraries/Template.class.php'; +require_once 'libraries/Template.php'; /** * Returns the html for create table. diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index 96b206979a..e2d15909dd 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -9,7 +9,7 @@ * @package PhpMyAdmin */ use PMA\libraries\Message; -use PMA\libraries\PMA_Table; +use PMA\libraries\Table; if (! defined('PHPMYADMIN')) { exit; @@ -441,7 +441,7 @@ function PMA_getHtmlForExportOptionsRows($db, $table, $unlim_num_rows) } elseif (!empty($unlim_num_rows)) { $html .= $unlim_num_rows; } else { - $_table = new PMA_Table($table, $db); + $_table = new Table($table, $db); $html .= $_table->countRecords(); } $html .= '" onfocus="this.select()" />'; @@ -872,7 +872,7 @@ function PMA_getHtmlForExportOptions( $html .= PMA_getHtmlForExportOptionsSelection($export_type, $multi_values); $tableLength = /*overload*/mb_strlen($table); - $_table = new PMA_Table($table, $db); + $_table = new Table($table, $db); if ($tableLength && empty($num_tables) && ! $_table->isMerge()) { $html .= PMA_getHtmlForExportOptionsRows($db, $table, $unlim_num_rows); } diff --git a/libraries/engines/bdb.lib.php b/libraries/engines/bdb.lib.php index 393d511e47..5147c736b6 100644 --- a/libraries/engines/bdb.lib.php +++ b/libraries/engines/bdb.lib.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Engines */ -use PMA\libraries\PMA_StorageEngine; +use PMA\libraries\StorageEngine; if (! defined('PHPMYADMIN')) { exit; @@ -16,7 +16,7 @@ if (! defined('PHPMYADMIN')) { * * @package PhpMyAdmin-Engines */ -class PMA_StorageEngine_Bdb extends PMA_StorageEngine +class PMA_StorageEngine_Bdb extends StorageEngine { /** * Returns array with variable names related to this storage engine diff --git a/libraries/engines/binlog.lib.php b/libraries/engines/binlog.lib.php index b2558747e8..edc0921893 100644 --- a/libraries/engines/binlog.lib.php +++ b/libraries/engines/binlog.lib.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Engines */ -use PMA\libraries\PMA_StorageEngine; +use PMA\libraries\StorageEngine; if (! defined('PHPMYADMIN')) { exit; @@ -16,7 +16,7 @@ if (! defined('PHPMYADMIN')) { * * @package PhpMyAdmin-Engines */ -class PMA_StorageEngine_Binlog extends PMA_StorageEngine +class PMA_StorageEngine_Binlog extends StorageEngine { /** * Returns string with filename for the MySQL helppage diff --git a/libraries/engines/innodb.lib.php b/libraries/engines/innodb.lib.php index d46995bed1..53e70ad44b 100644 --- a/libraries/engines/innodb.lib.php +++ b/libraries/engines/innodb.lib.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Engines */ -use PMA\libraries\PMA_StorageEngine; +use PMA\libraries\StorageEngine; if (! defined('PHPMYADMIN')) { exit; @@ -16,7 +16,7 @@ if (! defined('PHPMYADMIN')) { * * @package PhpMyAdmin-Engines */ -class PMA_StorageEngine_Innodb extends PMA_StorageEngine +class PMA_StorageEngine_Innodb extends StorageEngine { /** * Returns array with variable names related to InnoDB storage engine diff --git a/libraries/engines/memory.lib.php b/libraries/engines/memory.lib.php index fabad51d6f..5c12fcf523 100644 --- a/libraries/engines/memory.lib.php +++ b/libraries/engines/memory.lib.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Engines */ -use PMA\libraries\PMA_StorageEngine; +use PMA\libraries\StorageEngine; if (! defined('PHPMYADMIN')) { exit; @@ -16,7 +16,7 @@ if (! defined('PHPMYADMIN')) { * * @package PhpMyAdmin-Engines */ -class PMA_StorageEngine_Memory extends PMA_StorageEngine +class PMA_StorageEngine_Memory extends StorageEngine { /** * Returns array with variable names dedicated to MEMORY storage engine diff --git a/libraries/engines/merge.lib.php b/libraries/engines/merge.lib.php index 34a33dae32..1ed3449184 100644 --- a/libraries/engines/merge.lib.php +++ b/libraries/engines/merge.lib.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Engines */ -use PMA\libraries\PMA_StorageEngine; +use PMA\libraries\StorageEngine; if (! defined('PHPMYADMIN')) { exit; @@ -16,7 +16,7 @@ if (! defined('PHPMYADMIN')) { * * @package PhpMyAdmin-Engines */ -class PMA_StorageEngine_Merge extends PMA_StorageEngine +class PMA_StorageEngine_Merge extends StorageEngine { } diff --git a/libraries/engines/myisam.lib.php b/libraries/engines/myisam.lib.php index ebdc5f3108..4bb82726ec 100644 --- a/libraries/engines/myisam.lib.php +++ b/libraries/engines/myisam.lib.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Engines */ -use PMA\libraries\PMA_StorageEngine; +use PMA\libraries\StorageEngine; if (! defined('PHPMYADMIN')) { exit; @@ -16,7 +16,7 @@ if (! defined('PHPMYADMIN')) { * * @package PhpMyAdmin-Engines */ -class PMA_StorageEngine_Myisam extends PMA_StorageEngine +class PMA_StorageEngine_Myisam extends StorageEngine { /** * Returns array with variable names dedicated to MyISAM storage engine diff --git a/libraries/engines/ndbcluster.lib.php b/libraries/engines/ndbcluster.lib.php index cd11949878..b9bc2c91a6 100644 --- a/libraries/engines/ndbcluster.lib.php +++ b/libraries/engines/ndbcluster.lib.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Engines */ -use PMA\libraries\PMA_StorageEngine; +use PMA\libraries\StorageEngine; if (! defined('PHPMYADMIN')) { exit; @@ -16,7 +16,7 @@ if (! defined('PHPMYADMIN')) { * * @package PhpMyAdmin-Engines */ -class PMA_StorageEngine_Ndbcluster extends PMA_StorageEngine +class PMA_StorageEngine_Ndbcluster extends StorageEngine { /** * Returns array with variable names related to NDBCLUSTER storage engine diff --git a/libraries/engines/pbxt.lib.php b/libraries/engines/pbxt.lib.php index b701428358..25e3769238 100644 --- a/libraries/engines/pbxt.lib.php +++ b/libraries/engines/pbxt.lib.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Engines */ -use PMA\libraries\PMA_StorageEngine; +use PMA\libraries\StorageEngine; if (! defined('PHPMYADMIN')) { exit; @@ -16,7 +16,7 @@ if (! defined('PHPMYADMIN')) { * * @package PhpMyAdmin-Engines */ -class PMA_StorageEngine_Pbxt extends PMA_StorageEngine +class PMA_StorageEngine_Pbxt extends StorageEngine { /** * Returns array with variable names dedicated to PBXT storage engine diff --git a/libraries/engines/performance_schema.lib.php b/libraries/engines/performance_schema.lib.php index bc2bf5aa99..741ec0289b 100644 --- a/libraries/engines/performance_schema.lib.php +++ b/libraries/engines/performance_schema.lib.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Engines */ -use PMA\libraries\PMA_StorageEngine; +use PMA\libraries\StorageEngine; if (! defined('PHPMYADMIN')) { exit; @@ -16,7 +16,7 @@ if (! defined('PHPMYADMIN')) { * * @package PhpMyAdmin-Engines */ -class PMA_StorageEngine_PerformanceSchema extends PMA_StorageEngine +class PMA_StorageEngine_PerformanceSchema extends StorageEngine { /** * Returns string with filename for the MySQL helppage diff --git a/libraries/error_report.lib.php b/libraries/error_report.lib.php index 0a371ac783..b95acbc7d0 100644 --- a/libraries/error_report.lib.php +++ b/libraries/error_report.lib.php @@ -354,7 +354,7 @@ function PMA_getErrorReportForm() $datas['hidden_fields'] = PMA_getHiddenFields($reportData); } - include_once './libraries/Template.class.php'; + include_once './libraries/Template.php'; return PMA\libraries\Template::get('error/report_form') ->render($datas); } diff --git a/libraries/export.lib.php b/libraries/export.lib.php index 62965b34fc..a30d894c2b 100644 --- a/libraries/export.lib.php +++ b/libraries/export.lib.php @@ -8,7 +8,7 @@ */ use PMA\libraries\Message; -use PMA\libraries\PMA_Table; +use PMA\libraries\Table; if (! defined('PHPMYADMIN')) { exit; @@ -627,7 +627,7 @@ function PMA_exportDatabase( $views = array(); foreach ($tables as $table) { - $_table = new PMA_Table($table, $db); + $_table = new Table($table, $db); // if this is a view, collect it for later; // views must be exported after the tables $is_view = $_table->isView(); @@ -822,7 +822,7 @@ function PMA_exportTable( $add_query = ''; } - $_table = new PMA_Table($table, $db); + $_table = new Table($table, $db); $is_view = $_table->isView(); if ($whatStrucOrData == 'structure' || $whatStrucOrData == 'structure_and_data' diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 1b82018ca1..386f44c24d 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin-Import */ use PMA\libraries\Message; -use PMA\libraries\PMA_Table; +use PMA\libraries\Table; if (! defined('PHPMYADMIN')) { exit; @@ -1297,7 +1297,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null, unset($params); - $_table = new PMA_Table($tables[$i][TBL_NAME], $db_name); + $_table = new Table($tables[$i][TBL_NAME], $db_name); if (! $_table->isView()) { $message .= sprintf( '
  • %s (' . __( diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index cb826ed0ae..b958813349 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -7,7 +7,7 @@ */ use PMA\libraries\Message; use PMA\libraries\Response; -use PMA\libraries\PMA_String; +use PMA\libraries\String; if (! defined('PHPMYADMIN')) { exit; @@ -143,7 +143,7 @@ $views = $GLOBALS['dbi']->getVirtualTables($db); if (!empty($submit_mult) && !empty($what)) { unset($message); - /** @var PMA_String $pmaString */ + /** @var String $pmaString */ $pmaString = $GLOBALS['PMA_String']; if (/*overload*/mb_strlen($table)) { include './libraries/tbl_common.inc.php'; diff --git a/libraries/navigation/NavigationHeader.class.php b/libraries/navigation/NavigationHeader.class.php index 072906102d..da176a08d7 100644 --- a/libraries/navigation/NavigationHeader.class.php +++ b/libraries/navigation/NavigationHeader.class.php @@ -9,7 +9,7 @@ if (! defined('PHPMYADMIN')) { exit; } -require_once 'libraries/Template.class.php'; +require_once 'libraries/Template.php'; use PMA\libraries\Template; /** diff --git a/libraries/normalization.lib.php b/libraries/normalization.lib.php index 2e55dec9aa..b50022738a 100644 --- a/libraries/normalization.lib.php +++ b/libraries/normalization.lib.php @@ -14,7 +14,7 @@ if (! defined('PHPMYADMIN')) { exit; } -require_once 'libraries/Template.class.php'; +require_once 'libraries/Template.php'; /** * build the html for columns of $colTypeCategory category diff --git a/libraries/operations.lib.php b/libraries/operations.lib.php index 4da71e7ac1..c2b420af24 100644 --- a/libraries/operations.lib.php +++ b/libraries/operations.lib.php @@ -10,8 +10,8 @@ use PMA\libraries\Message; use PMA\libraries\Partition; use PMA\libraries\Response; -use PMA\libraries\PMA_StorageEngine; -use PMA\libraries\PMA_Table; +use PMA\libraries\StorageEngine; +use PMA\libraries\Table; if (! defined('PHPMYADMIN')) { exit; @@ -400,7 +400,7 @@ function PMA_createDbBeforeCopy() $GLOBALS['dbi']->query($sql_set_mode); } - // rebuild the database list because PMA_Table::moveCopy + // rebuild the database list because Table::moveCopy // checks in this list if the target db exists $GLOBALS['pma']->databases->build(); } @@ -488,7 +488,7 @@ function PMA_copyTables($tables_full, $move, $db) // for importing via the mysql client or our Import feature) $triggers = $GLOBALS['dbi']->getTriggers($db, $each_table, ''); - if (! PMA_Table::moveCopy( + if (! Table::moveCopy( $db, $each_table, $_REQUEST['newname'], $each_table, (isset($this_what) ? $this_what : 'data'), $move, 'db_copy' @@ -566,7 +566,7 @@ function PMA_handleTheViews($views, $move, $db) $_REQUEST['drop_if_exists'] = 'true'; foreach ($views as $view) { - $copying_succeeded = PMA_Table::moveCopy( + $copying_succeeded = Table::moveCopy( $db, $view, $_REQUEST['newname'], $view, 'structure', $move, 'db_copy' ); if (! $copying_succeeded) { @@ -772,7 +772,7 @@ function PMA_duplicateBookmarks($_error, $db) $get_fields = array('user', 'label', 'query'); $where_fields = array('dbase' => $db); $new_fields = array('dbase' => $_REQUEST['newname']); - PMA_Table::duplicateInfo( + Table::duplicateInfo( 'bookmarkwork', 'bookmark', $get_fields, $where_fields, $new_fields ); @@ -1078,7 +1078,7 @@ function PMA_getTableOptionFieldset($comment, $tbl_collation, . ' ' . PMA\libraries\Util::showMySQLDocu('Storage_engines') . '' . '' - . PMA_StorageEngine::getHtmlSelect( + . StorageEngine::getHtmlSelect( 'new_tbl_storage_engine', null, $tbl_storage_engine ) . '' @@ -1232,7 +1232,7 @@ function PMA_getPossibleRowFormat() ); /** @var PMA_StorageEngine_Innodb $innodbEnginePlugin */ - $innodbEnginePlugin = PMA_StorageEngine::getEngine('innodb'); + $innodbEnginePlugin = StorageEngine::getEngine('innodb'); $innodbPluginVersion = $innodbEnginePlugin->getInnodbPluginVersion(); if (!empty($innodbPluginVersion)) { $innodb_file_format = $innodbEnginePlugin->getInnodbFileFormat(); @@ -2117,7 +2117,7 @@ function PMA_moveOrCopyTable($db, $table) $message = Message::error(__('Can\'t copy table to same one!')); } } else { - PMA_Table::moveCopy( + Table::moveCopy( $db, $table, $_REQUEST['target_db'], $_REQUEST['new_name'], $_REQUEST['what'], isset($_REQUEST['submit_move']), 'one_table' ); diff --git a/libraries/pmd_common.php b/libraries/pmd_common.php index 94b6235094..580e92080e 100644 --- a/libraries/pmd_common.php +++ b/libraries/pmd_common.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Designer */ -use PMA\libraries\PMA_Table; +use PMA\libraries\Table; /** * Block attempts to directly run this script @@ -500,7 +500,7 @@ function PMA_saveDisplayField($db, $table, $field) $field = ''; } - $upd_query = new PMA_Table($table, $db, $GLOBALS['dbi']); + $upd_query = new Table($table, $db, $GLOBALS['dbi']); $upd_query->updateDisplayField($disp, $field, $cfgRelation); return true; diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 0da89ab3cc..87b45630a8 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ use PMA\libraries\Message; -use PMA\libraries\PMA_Table; +use PMA\libraries\Table; use PMA\libraries\RecentFavoriteTable; use SqlParser\Statements\CreateStatement; @@ -370,7 +370,7 @@ function PMA_getRelationsParamDiagnostic($cfgRelation) 'Re-login to phpMyAdmin to load the updated configuration file.' ); - include_once './libraries/Template.class.php'; + include_once './libraries/Template.php'; $retval .= PMA\libraries\Template::get('list/unordered')->render( array('items' => $items,) ); @@ -739,7 +739,7 @@ function PMA_getForeigners($db, $table, $column = '', $source = 'both') if (($source == 'both' || $source == 'foreign') && /*overload*/mb_strlen($table) ) { - $tableObj = new PMA_Table($table, $db); + $tableObj = new Table($table, $db); $show_create_table = $tableObj->showCreate(); if ($show_create_table) { $parser = new SqlParser\Parser($show_create_table); diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index c1c749ae29..2e048f2685 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -13,7 +13,7 @@ if (! defined('PHPMYADMIN')) { exit; } -require_once 'libraries/Template.class.php'; +require_once 'libraries/Template.php'; /** * Sets required globals diff --git a/libraries/server_databases.lib.php b/libraries/server_databases.lib.php index 97ba0bd0e2..9fb41d021a 100644 --- a/libraries/server_databases.lib.php +++ b/libraries/server_databases.lib.php @@ -374,7 +374,7 @@ function PMA_getHtmlForNoticeEnableStatistics($url_query, $html) ), ); - include_once './libraries/Template.class.php'; + include_once './libraries/Template.php'; $html .= PMA\libraries\Template::get('list/unordered')->render( array('items' => $items,) ); diff --git a/libraries/server_engines.lib.php b/libraries/server_engines.lib.php index d0506df5ae..0ac4544652 100644 --- a/libraries/server_engines.lib.php +++ b/libraries/server_engines.lib.php @@ -8,7 +8,7 @@ * * @package PhpMyAdmin */ -use PMA\libraries\PMA_StorageEngine; +use PMA\libraries\StorageEngine; if (! defined('PHPMYADMIN')) { exit; @@ -26,7 +26,7 @@ function PMA_getHtmlForServerEngines() */ $html = ''; if (empty($_REQUEST['engine']) - || ! PMA_StorageEngine::isValid($_REQUEST['engine']) + || ! StorageEngine::isValid($_REQUEST['engine']) ) { $html .= PMA_getHtmlForAllServerEngines(); } else { @@ -58,7 +58,7 @@ function PMA_getHtmlForAllServerEngines() * Listing the storage engines */ $odd_row = true; - foreach (PMA_StorageEngine::getStorageEngines() as $engine => $details) { + foreach (StorageEngine::getStorageEngines() as $engine => $details) { $html .= 'getTitle()) . "\n" diff --git a/libraries/server_status.lib.php b/libraries/server_status.lib.php index 1e6749c033..b906a64ee1 100644 --- a/libraries/server_status.lib.php +++ b/libraries/server_status.lib.php @@ -8,7 +8,7 @@ * * @package PhpMyAdmin */ -use PMA\libraries\PMA_ServerStatusData; +use PMA\libraries\ServerStatusData; if (! defined('PHPMYADMIN')) { exit; @@ -17,7 +17,7 @@ if (! defined('PHPMYADMIN')) { /** * Prints server status information: processes, connections and traffic * - * @param PMA_ServerStatusData $ServerStatusData Server status data + * @param ServerStatusData $ServerStatusData Server status data * * @return string */ @@ -45,7 +45,7 @@ function PMA_getHtmlForServerStatus($ServerStatusData) /** * Prints server state General information * - * @param PMA_ServerStatusData $ServerStatusData Server status data + * @param ServerStatusData $ServerStatusData Server status data * * @return string */ @@ -131,7 +131,7 @@ function PMA_getHtmlForReplicationInfo() /** * Prints server state traffic information * - * @param PMA_ServerStatusData $ServerStatusData Server status data + * @param ServerStatusData $ServerStatusData Server status data * * @return string */ @@ -224,7 +224,7 @@ function PMA_getHtmlForServerStateTraffic($ServerStatusData) /** * Prints server state connections information * - * @param PMA_ServerStatusData $ServerStatusData Server status data + * @param ServerStatusData $ServerStatusData Server status data * * @return string */ diff --git a/libraries/server_status_monitor.lib.php b/libraries/server_status_monitor.lib.php index 8de238e39b..472ccd6ea4 100644 --- a/libraries/server_status_monitor.lib.php +++ b/libraries/server_status_monitor.lib.php @@ -8,7 +8,7 @@ * * @package PhpMyAdmin */ -use PMA\libraries\PMA_ServerStatusData; +use PMA\libraries\ServerStatusData; if (! defined('PHPMYADMIN')) { exit; @@ -17,7 +17,7 @@ if (! defined('PHPMYADMIN')) { /** * Prints html with monitor * - * @param PMA_ServerStatusData $ServerStatusData Server status data + * @param ServerStatusData $ServerStatusData Server status data * * @return string */ @@ -288,7 +288,7 @@ function PMA_getHtmlForSettingsDialog() $retval .= '
    '; $retval .= '
    '; $retval .= __('Refresh rate') . '
    '; - $retval .= PMA_ServerStatusData::getHtmlForRefreshList( + $retval .= ServerStatusData::getHtmlForRefreshList( 'gridChartRefresh', 5, Array(2, 3, 4, 5, 10, 20, 40, 60, 120, 300, 600, 1200) @@ -337,7 +337,7 @@ function PMA_getHtmlForSettingsDialog() /** * Define some data and links needed on the client side * - * @param PMA_ServerStatusData $ServerStatusData Server status data + * @param ServerStatusData $ServerStatusData Server status data * * @return string */ diff --git a/libraries/server_status_processes.lib.php b/libraries/server_status_processes.lib.php index b395aeb583..f4554759cd 100644 --- a/libraries/server_status_processes.lib.php +++ b/libraries/server_status_processes.lib.php @@ -9,7 +9,7 @@ * @package PhpMyAdmin */ use PMA\libraries\Message; -use PMA\libraries\PMA_ServerStatusData; +use PMA\libraries\ServerStatusData; if (! defined('PHPMYADMIN')) { exit; @@ -30,7 +30,7 @@ function PMA_getHtmlForProcessListAutoRefresh() )->getDisplay(); $retval = $notice . '
    '; $retval .= '