From 04422d972bc8e576b1cbeb149655d5b2140e822d Mon Sep 17 00:00:00 2001 From: Hugues Peccatte Date: Sun, 30 Aug 2015 10:19:28 +0200 Subject: [PATCH] Set namespace on config classes. Update config classes. Add @noinspection tag. Update documentation and script. Set ConfigGenerator in a namespace. Rename ConfigGenerator filename. Remove ConfigGenerator requires. Fix namespaces of mock objects. Remove useless require. Add missing 'use'. Add missing require. Update PHPDoc. Fix class test typo. Signed-off-by: Hugues Peccatte --- db_export.php | 7 ++-- db_import.php | 7 ++-- db_sql.php | 4 +-- db_structure.php | 3 +- libraries/SystemDatabase.php | 18 +++++----- libraries/Util.php | 21 ++++++----- libraries/advisory_rules.txt | 2 +- libraries/common.inc.php | 6 ++-- libraries/config.values.php | 2 +- .../{ConfigFile.class.php => ConfigFile.php} | 5 ++- libraries/config/{Form.class.php => Form.php} | 1 + ...{FormDisplay.class.php => FormDisplay.php} | 14 ++++---- libraries/config/FormDisplay.tpl.php | 8 +++-- ...ge_settings.class.php => PageSettings.php} | 27 +++++++------- ...hecks.class.php => ServerConfigChecks.php} | 1 + .../{Validator.class.php => Validator.php} | 9 ++--- .../DatabaseStructureController.class.php | 10 +++--- .../TableChartController.class.php | 1 + .../TableStructureController.class.php | 10 +++--- libraries/navigation/Navigation.class.php | 4 ++- libraries/user_preferences.lib.php | 1 + navigation.php | 4 ++- prefs_forms.php | 8 ++--- prefs_manage.php | 26 +++++++------- scripts/create-release.sh | 8 ++--- server_export.php | 7 ++-- server_import.php | 7 ++-- server_sql.php | 7 ++-- setup/config.php | 5 ++- setup/frames/config.inc.php | 4 +-- setup/frames/form.inc.php | 4 +-- setup/frames/index.inc.php | 7 ++-- setup/frames/servers.inc.php | 5 +-- ...enerator.class.php => ConfigGenerator.php} | 5 ++- setup/lib/common.inc.php | 2 +- setup/lib/form_processing.lib.php | 1 + setup/validate.php | 4 +-- sql.php | 20 ++++++----- tbl_change.php | 14 ++++---- tbl_export.php | 4 +-- tbl_import.php | 4 +-- tbl_row_action.php | 1 + tbl_sql.php | 5 ++- tbl_structure.php | 4 ++- test/classes/PMA_Scripts_test.php | 4 +-- test/classes/PMA_Types_Drizzle_test.php | 2 +- test/classes/PMA_Types_MySQL_test.php | 2 +- test/classes/config/PMA_FormDisplay_test.php | 36 +++++++++---------- test/classes/config/PMA_Form_test.php | 20 +++++------ test/libraries/PMA_ConfigFile_test.php | 3 +- test/libraries/PMA_ConfigGenerator_test.php | 14 ++++---- test/libraries/PMA_FormDisplay_tpl_test.php | 4 --- test/libraries/PMA_Form_Processing_test.php | 9 +++-- test/libraries/PMA_SetupIndex_test.php | 8 ++--- test/libraries/PMA_page_settings_test.php | 12 +++---- test/libraries/PMA_server_privileges_test.php | 2 +- test/libraries/PMA_user_preferences_test.php | 5 ++- 57 files changed, 238 insertions(+), 200 deletions(-) rename libraries/config/{ConfigFile.class.php => ConfigFile.php} (99%) rename libraries/config/{Form.class.php => Form.php} (99%) rename libraries/config/{FormDisplay.class.php => FormDisplay.php} (99%) rename libraries/config/{page_settings.class.php => PageSettings.php} (87%) rename libraries/config/{ServerConfigChecks.class.php => ServerConfigChecks.php} (99%) rename libraries/config/{Validator.class.php => Validator.php} (98%) rename setup/lib/{ConfigGenerator.class.php => ConfigGenerator.php} (97%) diff --git a/db_export.php b/db_export.php index fa9e4227d4..fc28112dde 100644 --- a/db_export.php +++ b/db_export.php @@ -5,17 +5,18 @@ * * @package PhpMyAdmin */ +use PMA\libraries\config\PageSettings; +use PMA\libraries\Response; /** * Gets some core libraries */ require_once 'libraries/common.inc.php'; -require_once 'libraries/config/page_settings.class.php'; require_once 'libraries/export.lib.php'; -PMA_PageSettings::showGroup('Export'); +PageSettings::showGroup('Export'); -$response = PMA\libraries\Response::getInstance(); +$response = Response::getInstance(); $header = $response->getHeader(); $scripts = $header->getScripts(); $scripts->addFile('export.js'); diff --git a/db_import.php b/db_import.php index f08dfb4c17..bce49f0d05 100644 --- a/db_import.php +++ b/db_import.php @@ -6,10 +6,11 @@ * @package PhpMyAdmin */ -require_once 'libraries/common.inc.php'; -require_once 'libraries/config/page_settings.class.php'; +use PMA\libraries\config\PageSettings; -PMA_PageSettings::showGroup('Import'); +require_once 'libraries/common.inc.php'; + +PageSettings::showGroup('Import'); $response = PMA\libraries\Response::getInstance(); $header = $response->getHeader(); diff --git a/db_sql.php b/db_sql.php index 1f5d0a9efe..88b5dad2a7 100644 --- a/db_sql.php +++ b/db_sql.php @@ -5,14 +5,14 @@ * * @package PhpMyAdmin */ +use PMA\libraries\config\PageSettings; /** * */ require_once 'libraries/common.inc.php'; -require_once 'libraries/config/page_settings.class.php'; -PMA_PageSettings::showGroup('Sql_queries'); +PageSettings::showGroup('Sql_queries'); /** * Runs common work diff --git a/db_structure.php b/db_structure.php index f22dc10d7d..8b5b238b73 100644 --- a/db_structure.php +++ b/db_structure.php @@ -9,6 +9,7 @@ namespace PMA; use PMA\libraries\Response; +use PMA\libraries\Util; require_once 'libraries/common.inc.php'; require_once 'libraries/db_common.inc.php'; @@ -23,7 +24,7 @@ list( $tooltip_truename, $tooltip_aliasname, $pos -) = \PMA\libraries\Util::getDbInfo($GLOBALS['db'], isset($sub_part) ? $sub_part : ''); +) = Util::getDbInfo($GLOBALS['db'], isset($sub_part) ? $sub_part : ''); require_once 'libraries/di/Container.class.php'; require_once 'libraries/controllers/DatabaseStructureController.class.php'; diff --git a/libraries/SystemDatabase.php b/libraries/SystemDatabase.php index 7b91765cea..909356d3f7 100644 --- a/libraries/SystemDatabase.php +++ b/libraries/SystemDatabase.php @@ -17,17 +17,17 @@ require_once 'libraries/database_interface.inc.php'; class SystemDatabase { /** - * @var \PMA\libraries\DatabaseInterface + * @var DatabaseInterface */ protected $dbi; /** * Get instance of SystemDatabase * - * @param \PMA\libraries\DatabaseInterface $dbi Database interface for the system database + * @param DatabaseInterface $dbi Database interface for the system database * */ - function __construct(\PMA\libraries\DatabaseInterface $dbi) + function __construct(DatabaseInterface $dbi) { $this->dbi = $dbi; } @@ -48,9 +48,9 @@ class SystemDatabase // from pma__column_info table $pma_transformation_sql = sprintf( "SELECT * FROM %s.%s WHERE `db_name` = '%s'", - \PMA\libraries\Util::backquote($cfgRelation['db']), - \PMA\libraries\Util::backquote($cfgRelation['column_info']), - \PMA\libraries\Util::sqlAddSlashes($db) + Util::backquote($cfgRelation['db']), + Util::backquote($cfgRelation['column_info']), + Util::sqlAddSlashes($db) ); return $this->dbi->tryQuery($pma_transformation_sql); @@ -77,8 +77,8 @@ class SystemDatabase . "`db_name`, `table_name`, `column_name`, " . "`comment`, `mimetype`, `transformation`, " . "`transformation_options`) VALUES", - \PMA\libraries\Util::backquote($cfgRelation['db']), - \PMA\libraries\Util::backquote($cfgRelation['column_info']) + Util::backquote($cfgRelation['db']), + Util::backquote($cfgRelation['column_info']) ); $column_count = 0; @@ -105,7 +105,7 @@ class SystemDatabase $data_row['comment'], $data_row['mimetype'], $data_row['transformation'], - \PMA\libraries\Util::sqlAddSlashes( + Util::sqlAddSlashes( $data_row['transformation_options'] ) ); diff --git a/libraries/Util.php b/libraries/Util.php index 06a4bf0053..8d33f731b8 100644 --- a/libraries/Util.php +++ b/libraries/Util.php @@ -8,7 +8,12 @@ namespace PMA\libraries; use ImportPlugin; +use SqlParser\Context; +use SqlParser\Lexer; +use SqlParser\Parser; +use SqlParser\Token; use stdClass; +use SqlParser\Utils\Error; if (! defined('PHPMYADMIN')) { exit; @@ -642,21 +647,21 @@ class Util $errors = array(); /** * The lexer used for analysis. - * @var \SqlParser\Lexer $lexer + * @var Lexer $lexer */ - $lexer = new \SqlParser\Lexer($sql_query); + $lexer = new Lexer($sql_query); /** * The parser used for analysis. - * @var \SqlParser\Parser $parser + * @var Parser $parser */ - $parser = new \SqlParser\Parser($lexer->list); + $parser = new Parser($lexer->list); /** * The errors found by the lexer and the parser. * @var array $errors */ - $errors = \SqlParser\Utils\Error::get(array($lexer, $parser)); + $errors = Error::get(array($lexer, $parser)); if (empty($sql_query)) { $formatted_sql = ''; @@ -681,7 +686,7 @@ class Util ) . '

'; $error_msg .= '

    '; $error_msg .= implode( - \SqlParser\Utils\Error::format( + Error::format( $errors, '
  1. %2$s (near "%4$s" at position %5$d)
    2. ' ) @@ -966,7 +971,7 @@ class Util } if (! $do_it) { - if (!(\SqlParser\Context::isKeyword($a_name) & \SqlParser\Token::FLAG_KEYWORD_RESERVED) + if (!(Context::isKeyword($a_name) & Token::FLAG_KEYWORD_RESERVED) ) { return $a_name; } @@ -1014,7 +1019,7 @@ class Util } if (! $do_it) { - if (!\SqlParser\Context::isKeyword($a_name)) { + if (!Context::isKeyword($a_name)) { return $a_name; } } diff --git a/libraries/advisory_rules.txt b/libraries/advisory_rules.txt index 5d6bf4e4fc..6c98d811d7 100644 --- a/libraries/advisory_rules.txt +++ b/libraries/advisory_rules.txt @@ -2,7 +2,7 @@ # # Use only UNIX style newlines # -# This file is being parsed by Advisor.class.php, which should handle syntax +# This file is being parsed by Advisor.php, which should handle syntax # errors correctly. However, PHP Warnings and the like are being consumed by # the phpMyAdmin error handler, so those won't show up E.g.: Justification line # is empty because you used an unescape percent sign, sprintf() returns an diff --git a/libraries/common.inc.php b/libraries/common.inc.php index c76c80f5a8..04748bb7f8 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -1211,5 +1211,7 @@ if (! defined('PMA_MINIMUM_COMMON') } if (! defined('PMA_MINIMUM_COMMON')) { - include_once 'libraries/config/page_settings.class.php'; -} + include_once 'libraries/config/messages.inc.php'; + include_once 'libraries/config/user_preferences.forms.php'; + include_once 'libraries/config/page_settings.forms.php'; +} \ No newline at end of file diff --git a/libraries/config.values.php b/libraries/config.values.php index 218eab6ec0..54735b49a7 100644 --- a/libraries/config.values.php +++ b/libraries/config.values.php @@ -219,7 +219,7 @@ $cfg_db['Export']['texytext_null'] = 'short_string'; $cfg_db['_overrides'] = array(); /** - * Basic validator assignments (functions from libraries/config/Validator.class.php + * Basic validator assignments (functions from libraries/config/Validator.php * and 'validators' object in js/config.js) * Use only full paths and form ids */ diff --git a/libraries/config/ConfigFile.class.php b/libraries/config/ConfigFile.php similarity index 99% rename from libraries/config/ConfigFile.class.php rename to libraries/config/ConfigFile.php index 868896582f..dc7692a326 100644 --- a/libraries/config/ConfigFile.class.php +++ b/libraries/config/ConfigFile.php @@ -5,6 +5,9 @@ * * @package PhpMyAdmin */ +namespace PMA\libraries\config; + +use PMA\libraries\Config; /** * Config file management class. @@ -28,7 +31,7 @@ class ConfigFile /** * Stores original PMA config, not modified by user preferences - * @var PMA\libraries\Config + * @var Config */ private $_baseCfg; diff --git a/libraries/config/Form.class.php b/libraries/config/Form.php similarity index 99% rename from libraries/config/Form.class.php rename to libraries/config/Form.php index d31e0f234f..4c308f44da 100644 --- a/libraries/config/Form.class.php +++ b/libraries/config/Form.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin */ +namespace PMA\libraries\config; /** * Base class for forms, loads default configuration options, checks allowed diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.php similarity index 99% rename from libraries/config/FormDisplay.class.php rename to libraries/config/FormDisplay.php index 17faaf1145..447397d53b 100644 --- a/libraries/config/FormDisplay.class.php +++ b/libraries/config/FormDisplay.php @@ -12,13 +12,15 @@ * * @package PhpMyAdmin */ +namespace PMA\libraries\config; /** * Core libraries. */ -require_once './libraries/config/FormDisplay.tpl.php'; -require_once './libraries/config/Validator.class.php'; +use PMA\libraries\Util; + require_once './libraries/js_escape.lib.php'; +require_once './libraries/config/FormDisplay.tpl.php'; /** * Form management class, displays and processes forms @@ -100,7 +102,7 @@ class FormDisplay 'error_value_lte' => __('Value must be equal or lower than %s!')); $this->_configFile = $cf; // initialize validators - PMA_Validator::getValidators($this->_configFile); + Validator::getValidators($this->_configFile); } /** @@ -184,7 +186,7 @@ class FormDisplay } // run validation - $errors = PMA_Validator::validate( + $errors = Validator::validate( $this->_configFile, $paths, $values, false ); @@ -220,7 +222,7 @@ class FormDisplay $show_restore_default, array &$js_default, array &$js, $show_buttons ) { $htmlOutput = ''; - $validators = PMA_Validator::getValidators($this->_configFile); + $validators = Validator::getValidators($this->_configFile); foreach ($this->_forms as $form) { /* @var $form Form */ @@ -748,7 +750,7 @@ class FormDisplay if ($test == 'Import' || $test == 'Export') { return ''; } - return PMA\libraries\Util::getDocuLink( + return Util::getDocuLink( 'config', 'cfg_' . $this->_getOptName($path) ); diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php index d609218baa..15713feb49 100644 --- a/libraries/config/FormDisplay.tpl.php +++ b/libraries/config/FormDisplay.tpl.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +use PMA\libraries\Template; +use PMA\libraries\Util; /** * Displays top part of the form @@ -60,7 +62,7 @@ function PMA_displayTabsTop($tabs) ); } - $htmlOutput = PMA\libraries\Template::get('list/unordered')->render( + $htmlOutput = Template::get('list/unordered')->render( array( 'class' => 'tabs', 'items' => $items, @@ -181,7 +183,7 @@ function PMA_displayInput($path, $name, $type, $value, $description = '', } else { // In this case we just use getImage() because it's available foreach ($icon_init as $k => $v) { - $icons[$k] = PMA\libraries\Util::getImage( + $icons[$k] = Util::getImage( $v[0], $v[1] ); } @@ -493,7 +495,7 @@ function PMA_displayJavascript($js_array) return null; } - return PMA\libraries\Template::get('javascript/display')->render( + return Template::get('javascript/display')->render( array('js_array' => $js_array,) ); } diff --git a/libraries/config/page_settings.class.php b/libraries/config/PageSettings.php similarity index 87% rename from libraries/config/page_settings.class.php rename to libraries/config/PageSettings.php index bc774cbf8b..af6a1e2380 100644 --- a/libraries/config/page_settings.class.php +++ b/libraries/config/PageSettings.php @@ -5,13 +5,14 @@ * * @package PhpMyAdmin */ +namespace PMA\libraries\config; + +use PMA\libraries\Message; +use PMA\libraries\Response; require_once 'libraries/user_preferences.lib.php'; require_once 'libraries/config/config_functions.lib.php'; require_once 'libraries/config/messages.inc.php'; -require_once 'libraries/config/ConfigFile.class.php'; -require_once 'libraries/config/Form.class.php'; -require_once 'libraries/config/FormDisplay.class.php'; require 'libraries/config/user_preferences.forms.php'; require 'libraries/config/page_settings.forms.php'; @@ -20,7 +21,7 @@ require 'libraries/config/page_settings.forms.php'; * * @package PhpMyAdmin */ -class PMA_PageSettings +class PageSettings { /** @@ -100,7 +101,7 @@ class PMA_PageSettings * * @param FormDisplay &$form_display Form * @param ConfigFile &$cf Configuration file - * @param PMA\libraries\Message|null &$error Error message + * @param Message|null &$error Error message * * @return void */ @@ -123,7 +124,7 @@ class PMA_PageSettings * Store errors in _errorHTML * * @param FormDisplay &$form_display Form - * @param PMA\libraries\Message|null &$error Error message + * @param Message|null &$error Error message * * @return void */ @@ -150,13 +151,13 @@ class PMA_PageSettings * Display page-related settings * * @param FormDisplay &$form_display Form - * @param PMA\libraries\Message &$error Error message + * @param Message &$error Error message * * @return string */ private function _getPageSettingsDisplay(&$form_display, &$error) { - $response = PMA\libraries\Response::getInstance(); + $response = Response::getInstance(); $retval = ''; @@ -202,13 +203,13 @@ class PMA_PageSettings /** * Group to show for Page-related settings * @param string $formGroupName The name of config form group to display - * @return PMA_PageSettings + * @return PageSettings */ public static function showGroup($formGroupName) { - $object = new PMA_PageSettings($formGroupName); + $object = new PageSettings($formGroupName); - $response = PMA\libraries\Response::getInstance(); + $response = Response::getInstance(); $response->addHTML($object->getErrorHTML()); $response->addHTML($object->getHTML()); @@ -221,9 +222,9 @@ class PMA_PageSettings */ public static function getNaviSettings() { - $object = new PMA_PageSettings('Navi_panel', 'pma_navigation_settings'); + $object = new PageSettings('Navi_panel', 'pma_navigation_settings'); - $response = PMA\libraries\Response::getInstance(); + $response = Response::getInstance(); $response->addHTML($object->getErrorHTML()); return $object->getHTML(); } diff --git a/libraries/config/ServerConfigChecks.class.php b/libraries/config/ServerConfigChecks.php similarity index 99% rename from libraries/config/ServerConfigChecks.class.php rename to libraries/config/ServerConfigChecks.php index 5d540a2f1f..99ffcf2f86 100644 --- a/libraries/config/ServerConfigChecks.class.php +++ b/libraries/config/ServerConfigChecks.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin */ +namespace PMA\libraries\config; /** * Performs various compatibility, security and consistency checks on current config diff --git a/libraries/config/Validator.class.php b/libraries/config/Validator.php similarity index 98% rename from libraries/config/Validator.class.php rename to libraries/config/Validator.php index 80d7e5e042..879dc1f943 100644 --- a/libraries/config/Validator.class.php +++ b/libraries/config/Validator.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin */ +namespace PMA\libraries\config; /** * Validation class for various validation functions @@ -20,7 +21,7 @@ * * @package PhpMyAdmin */ -class PMA_Validator +class Validator { /** * Returns validator list @@ -122,7 +123,7 @@ class PMA_Validator foreach ((array)$validators[$vid] as $validator) { $vdef = (array) $validator; $vname = array_shift($vdef); - $vname = "PMA_Validator::" . $vname; + $vname = 'PMA\libraries\config\Validator::' . $vname; $args = array_merge(array($vid, &$arguments), $vdef); $r = call_user_func_array($vname, $args); @@ -187,7 +188,7 @@ class PMA_Validator ini_set('html_errors', 'false'); ini_set('track_errors', 'true'); ini_set('display_errors', 'true'); - set_error_handler(array("PMA_Validator", "nullErrorHandler")); + set_error_handler(array('PMA\libraries\config\Validator', "nullErrorHandler")); ob_start(); } else { ob_end_clean(); @@ -224,7 +225,7 @@ class PMA_Validator // static::testPHPErrorMsg(); $error = null; - if (PMA\libraries\DatabaseInterface::checkDbExtension('mysqli')) { + if (DatabaseInterface::checkDbExtension('mysqli')) { $socket = empty($socket) || $connect_type == 'tcp' ? null : $socket; $port = empty($port) || $connect_type == 'socket' ? null : $port; $extension = 'mysqli'; diff --git a/libraries/controllers/DatabaseStructureController.class.php b/libraries/controllers/DatabaseStructureController.class.php index 6fb4dc1fae..5a7e719be1 100644 --- a/libraries/controllers/DatabaseStructureController.class.php +++ b/libraries/controllers/DatabaseStructureController.class.php @@ -9,17 +9,19 @@ namespace PMA\Controllers; +use PMA\libraries\config\PageSettings; use PMA\libraries\Message; -use PMA\libraries\Tracker; use PMA\libraries\RecentFavoriteTable; use PMA\libraries\Template; +use PMA\libraries\Tracker; use PMA\libraries\Util; -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/controllers/DatabaseController.class.php'; +require_once 'libraries/config/messages.inc.php'; +require_once 'libraries/config/user_preferences.forms.php'; +require_once 'libraries/config/page_settings.forms.php'; /** * Handles database structure logic @@ -166,7 +168,7 @@ class DatabaseStructureController extends DatabaseController $GLOBALS['replication_info']['slave']['status'] = false; } - PMA_PageSettings::showGroup('DbStructure'); + PageSettings::showGroup('DbStructure'); $db_collation = PMA_getDbCollation($this->db); diff --git a/libraries/controllers/TableChartController.class.php b/libraries/controllers/TableChartController.class.php index 9449560079..dd1b9974eb 100644 --- a/libraries/controllers/TableChartController.class.php +++ b/libraries/controllers/TableChartController.class.php @@ -10,6 +10,7 @@ namespace PMA\Controllers\Table; use PMA\Controllers\TableController; +use PMA\libraries\Message; use PMA\libraries\Template; use PMA\libraries\Util; diff --git a/libraries/controllers/TableStructureController.class.php b/libraries/controllers/TableStructureController.class.php index cc5f82b534..7dff83cab5 100644 --- a/libraries/controllers/TableStructureController.class.php +++ b/libraries/controllers/TableStructureController.class.php @@ -9,21 +9,23 @@ namespace PMA\Controllers; +use PMA\libraries\config\PageSettings; use PMA\libraries\Index; use PMA\libraries\Message; -use PMA\libraries\Table; use PMA\libraries\Template; use PMA\libraries\Util; use PMA\Util as Util_lib; -use PMA_PageSettings; use SqlParser; use SqlParser\Statements\CreateStatement; +use SqlParser\Utils\Table; require_once 'libraries/mysql_charsets.inc.php'; -require_once 'libraries/config/page_settings.class.php'; require_once 'libraries/transformations.lib.php'; require_once 'libraries/util.lib.php'; require_once 'libraries/controllers/TableController.class.php'; +require_once 'libraries/config/messages.inc.php'; +require_once 'libraries/config/user_preferences.forms.php'; +require_once 'libraries/config/page_settings.forms.php'; /** * Handles table structure logic @@ -108,7 +110,7 @@ class TableStructureController extends TableController */ public function indexAction() { - PMA_PageSettings::showGroup('TableStructure'); + PageSettings::showGroup('TableStructure'); /** * Function implementations for this script diff --git a/libraries/navigation/Navigation.class.php b/libraries/navigation/Navigation.class.php index 407d435c9a..91bc7f45f5 100644 --- a/libraries/navigation/Navigation.class.php +++ b/libraries/navigation/Navigation.class.php @@ -6,6 +6,8 @@ * * @package PhpMyAdmin-navigation */ +use PMA\libraries\config\PageSettings; + if (! defined('PHPMYADMIN')) { exit; } @@ -62,7 +64,7 @@ class PMA_Navigation $retval .= ''; // pma_navigation_tree $retval .= '
    '; if (!defined('PMA_DISABLE_NAVI_SETTINGS')) { - $retval .= PMA_PageSettings::getNaviSettings(); + $retval .= PageSettings::getNaviSettings(); } $retval .= '
    '; //pma_navi_settings_container $retval .= ''; // pma_navigation_content diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php index a1681aa93f..a61f44ce11 100644 --- a/libraries/user_preferences.lib.php +++ b/libraries/user_preferences.lib.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin */ +use PMA\libraries\config\ConfigFile; use PMA\libraries\Message; if (! defined('PHPMYADMIN')) { diff --git a/navigation.php b/navigation.php index f59da42610..425f79067d 100644 --- a/navigation.php +++ b/navigation.php @@ -7,6 +7,8 @@ */ // Include common functionalities +use PMA\libraries\config\PageSettings; + require_once './libraries/common.inc.php'; // Also initialises the collapsible tree class @@ -24,7 +26,7 @@ if (! $response->isAjax()) { } if (isset($_REQUEST['getNaviSettings']) && $_REQUEST['getNaviSettings']) { - $response->addJSON('message', PMA_PageSettings::getNaviSettings()); + $response->addJSON('message', PageSettings::getNaviSettings()); exit(); } diff --git a/prefs_forms.php b/prefs_forms.php index 0242164655..11ea1dff24 100644 --- a/prefs_forms.php +++ b/prefs_forms.php @@ -5,6 +5,9 @@ * * @package PhpMyAdmin */ +use PMA\libraries\config\ConfigFile; +use PMA\libraries\config\FormDisplay; +use PMA\libraries\Response; /** * Gets some core libraries and displays a top message if required @@ -13,9 +16,6 @@ require_once 'libraries/common.inc.php'; require_once 'libraries/user_preferences.lib.php'; require_once 'libraries/config/config_functions.lib.php'; require_once 'libraries/config/messages.inc.php'; -require_once 'libraries/config/ConfigFile.class.php'; -require_once 'libraries/config/Form.class.php'; -require_once 'libraries/config/FormDisplay.class.php'; require 'libraries/config/user_preferences.forms.php'; $cf = new ConfigFile($GLOBALS['PMA_Config']->base_settings); @@ -71,7 +71,7 @@ if ($form_display->process(false) && !$form_display->hasErrors()) { } // display forms -$response = PMA\libraries\Response::getInstance(); +$response = Response::getInstance(); $header = $response->getHeader(); $scripts = $header->getScripts(); $scripts->addFile('config.js'); diff --git a/prefs_manage.php b/prefs_manage.php index 4c959eaecc..608e8293c5 100644 --- a/prefs_manage.php +++ b/prefs_manage.php @@ -5,7 +5,12 @@ * * @package PhpMyAdmin */ +use PMA\libraries\config\ConfigFile; +use PMA\libraries\config\FormDisplay; +use PMA\libraries\Message; +use PMA\libraries\Response; use PMA\libraries\String; +use PMA\libraries\Util; /** * Gets some core libraries and displays a top message if required @@ -14,9 +19,6 @@ require_once 'libraries/common.inc.php'; require_once 'libraries/user_preferences.lib.php'; require_once 'libraries/config/config_functions.lib.php'; require_once 'libraries/config/messages.inc.php'; -require_once 'libraries/config/ConfigFile.class.php'; -require_once 'libraries/config/Form.class.php'; -require_once 'libraries/config/FormDisplay.class.php'; require 'libraries/config/user_preferences.forms.php'; $cf = new ConfigFile($GLOBALS['PMA_Config']->base_settings); @@ -113,7 +115,7 @@ if (isset($_POST['submit_export']) if (!$all_ok) { // mimic original form and post json in a hidden field include 'libraries/user_preferences.inc.php'; - $msg = PMA\libraries\Message::error( + $msg = Message::error( __('Configuration contains incorrect data for some fields.') ); $msg->display(); @@ -214,15 +216,15 @@ if (isset($_POST['submit_export']) exit; } -$response = PMA\libraries\Response::getInstance(); +$response = Response::getInstance(); $header = $response->getHeader(); $scripts = $header->getScripts(); $scripts->addFile('config.js'); require 'libraries/user_preferences.inc.php'; if ($error) { - if (!$error instanceof PMA\libraries\Message) { - $error = PMA\libraries\Message::error($error); + if (!$error instanceof Message) { + $error = Message::error($error); } $error->display(); } @@ -239,7 +241,7 @@ PMA_printJsValue("PMA_messages['strSavedOn']", __('Saved on: @DATE@')); echo '

    ' . __('Import') . '

    ' . '
    ' - . PMA\libraries\Util::generateHiddenMaxFileSize($GLOBALS['max_upload_size']) + . Util::generateHiddenMaxFileSize($GLOBALS['max_upload_size']) . PMA_URL_getHiddenInputs() . '' . '' . __('Import') . '' . __('Saved on: @DATE@') . '' . '
    '; -PMA\libraries\Message::notice(__('You have no saved settings!'))->display(); +Message::notice(__('You have no saved settings!'))->display(); echo '
    ' . '' . '
    '; -PMA\libraries\Message::notice( +Message::notice( __('This feature is not supported by your web browser') )->display(); echo '
    ' @@ -304,7 +306,7 @@ if (file_exists('setup/index.php')) {