gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set namespace on config classes.

Browse Source 
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 <hugues.peccatte@gmail.com>
This commit is contained in:
Hugues Peccatte 2015-08-30 10:19:28 +02:00
parent 990b2aa04b
commit 04422d972b
57 changed files with 238 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
db_export.php
View File

@ -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');

7
db_import.php
View File

@ -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();

4
db_sql.php
View File

@ -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

3
db_structure.php
View File

@ -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';

18
libraries/SystemDatabase.php
View File

@ -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']
)
);

21
libraries/Util.php
View File

@ -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
) . '</p>';
$error_msg .= '<p><ol>';
$error_msg .= implode(
\SqlParser\Utils\Error::format(
Error::format(
$errors,
'<li>%2$s (near "%4$s" at position %5$d)</li>'
)
@ -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;
}
}

2
libraries/advisory_rules.txt
View File

@ -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

6
libraries/common.inc.php
View File

@ -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';
}

2
libraries/config.values.php
View File

@ -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
*/

5
libraries/config/ConfigFile.class.php → libraries/config/ConfigFile.php
View File

@ -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;

1
libraries/config/Form.class.php → libraries/config/Form.php
View File

@ -5,6 +5,7 @@
*
* @package PhpMyAdmin
*/
namespace PMA\libraries\config;
/**
* Base class for forms, loads default configuration options, checks allowed

14
libraries/config/FormDisplay.class.php → libraries/config/FormDisplay.php
View File

@ -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)
);

8
libraries/config/FormDisplay.tpl.php
View File

@ -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,)
);
}

27
libraries/config/page_settings.class.php → libraries/config/PageSettings.php
View File

@ -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();
}

1
libraries/config/ServerConfigChecks.class.php → libraries/config/ServerConfigChecks.php
View File

@ -5,6 +5,7 @@
*
* @package PhpMyAdmin
*/
namespace PMA\libraries\config;
/**
* Performs various compatibility, security and consistency checks on current config

9
libraries/config/Validator.class.php → libraries/config/Validator.php
View File

@ -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';

10
libraries/controllers/DatabaseStructureController.class.php
View File

@ -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);

1
libraries/controllers/TableChartController.class.php
View File

@ -10,6 +10,7 @@
namespace PMA\Controllers\Table;
use PMA\Controllers\TableController;
use PMA\libraries\Message;
use PMA\libraries\Template;
use PMA\libraries\Util;

10
libraries/controllers/TableStructureController.class.php
View File

@ -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

4
libraries/navigation/Navigation.class.php
View File

@ -6,6 +6,8 @@
*
* @package PhpMyAdmin-navigation
*/
use PMA\libraries\config\PageSettings;
if (! defined('PHPMYADMIN')) {
exit;
}
@ -62,7 +64,7 @@ class PMA_Navigation
$retval .= '</div>'; // pma_navigation_tree
$retval .= '<div id="pma_navi_settings_container">';
if (!defined('PMA_DISABLE_NAVI_SETTINGS')) {
$retval .= PMA_PageSettings::getNaviSettings();
$retval .= PageSettings::getNaviSettings();
}
$retval .= '</div>'; //pma_navi_settings_container
$retval .= '</div>'; // pma_navigation_content

1
libraries/user_preferences.lib.php
View File

@ -5,6 +5,7 @@
*
* @package PhpMyAdmin
*/
use PMA\libraries\config\ConfigFile;
use PMA\libraries\Message;
if (! defined('PHPMYADMIN')) {

4
navigation.php
View File

@ -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();
}

8
prefs_forms.php
View File

@ -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');

26
prefs_manage.php
View File

@ -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 '<h2>' . __('Import') . '</h2>'
. '<form class="group-cnt prefs-form disableAjax" name="prefs_import"'
. ' action="prefs_manage.php" method="post" enctype="multipart/form-data">'
. PMA\libraries\Util::generateHiddenMaxFileSize($GLOBALS['max_upload_size'])
. Util::generateHiddenMaxFileSize($GLOBALS['max_upload_size'])
. PMA_URL_getHiddenInputs()
. '<input type="hidden" name="json" value="" />'
. '<input type="radio" id="import_text_file" name="import_type"'
@ -261,11 +263,11 @@ echo '<h2>' . __('Import') . '</h2>'
. __('Saved on: @DATE@')
. '</div>'
. '<div class="localStorage-empty">';
PMA\libraries\Message::notice(__('You have no saved settings!'))->display();
Message::notice(__('You have no saved settings!'))->display();
echo '</div>'
. '</div>'
. '<div class="localStorage-unsupported">';
PMA\libraries\Message::notice(
Message::notice(
__('This feature is not supported by your web browser')
)->display();
echo '</div>'
@ -304,7 +306,7 @@ if (file_exists('setup/index.php')) {
<h2><?php echo __('Export'); ?></h2>
<div class="click-hide-message group-cnt" style="display:none">
<?php
PMA\libraries\Message::rawSuccess(
Message::rawSuccess(
__('Configuration has been saved.')
)->display();
?>
@ -344,7 +346,7 @@ if (file_exists('setup/index.php')) {
</span>
<div class="localStorage-unsupported">
<?php
PMA\libraries\Message::notice(
Message::notice(
__('This feature is not supported by your web browser')
)->display();
?>

8
scripts/create-release.sh
View File

@ -56,7 +56,7 @@ shift
cat <<END
Please ensure you have incremented rc count or version in the repository :
- in libraries/Config.class.php PMA_Config::__constructor() the line
- in libraries/Config.php PMA\libraries\Config::__constructor() the line
" \$this->set( 'PMA_VERSION', '$version' ); "
- in doc/conf.py the line
" version = '$version' "
@ -88,8 +88,8 @@ ensure_local_branch $branch
git checkout $branch
# Check release version
if ! grep -q "'PMA_VERSION', '$version'" libraries/Config.class.php ; then
echo "There seems to be wrong version in libraries/Config.class.php!"
if ! grep -q "'PMA_VERSION', '$version'" libraries/Config.php ; then
echo "There seems to be wrong version in libraries/Config.php!"
exit 2
fi
if test -f Documentation.html && ! grep -q "phpMyAdmin $version - Documentation" Documentation.html ; then
@ -301,7 +301,7 @@ Todo now:
based on documentation.
6. increment rc count or version in the repository :
- in libraries/Config.class.php PMA_Config::__constructor() the line
- in libraries/Config.php PMA\libraries\Config::__constructor() the line
" \$this->set( 'PMA_VERSION', '2.7.1-dev' ); "
- in Documentation.html (if it exists) the 2 lines
" <title>phpMyAdmin 2.2.2-rc1 - Documentation</title> "

7
server_export.php
View File

@ -5,6 +5,8 @@
*
* @package PhpMyAdmin
*/
use PMA\libraries\config\PageSettings;
use PMA\libraries\Response;
/**
* Does the common work
@ -12,11 +14,10 @@
require_once 'libraries/common.inc.php';
require_once 'libraries/server_common.inc.php';
require_once 'libraries/display_export.lib.php';
require_once 'libraries/config/page_settings.class.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');

7
server_import.php
View File

@ -5,14 +5,15 @@
*
* @package PhpMyAdmin
*/
use PMA\libraries\config\PageSettings;
use PMA\libraries\Response;
/**
*
*/
require_once 'libraries/common.inc.php';
require_once 'libraries/config/page_settings.class.php';
PMA_PageSettings::showGroup('Import');
PageSettings::showGroup('Import');
$response = PMA\libraries\Response::getInstance();
$header = $response->getHeader();
@ -25,7 +26,7 @@ $scripts->addFile('import.js');
require 'libraries/server_common.inc.php';
require 'libraries/display_import.lib.php';
$response = PMA\libraries\Response::getInstance();
$response = Response::getInstance();
$response->addHTML(
PMA_getImportDisplay(
'server', $db, $table, $max_upload_size

7
server_sql.php
View File

@ -5,19 +5,20 @@
*
* @package PhpMyAdmin
*/
use PMA\libraries\config\PageSettings;
use PMA\libraries\Response;
/**
*
*/
require_once 'libraries/common.inc.php';
require_once 'libraries/config/page_settings.class.php';
PMA_PageSettings::showGroup('Sql_queries');
PageSettings::showGroup('Sql_queries');
/**
* Does the common work
*/
$response = PMA\libraries\Response::getInstance();
$response = Response::getInstance();
$header = $response->getHeader();
$scripts = $header->getScripts();
$scripts->addFile('makegrid.js');

5
setup/config.php
View File

@ -5,14 +5,13 @@
*
* @package PhpMyAdmin-Setup
*/
use PMA\libraries\config\FormDisplay;
use PMA\setup\lib\ConfigGenerator;
/**
* Core libraries.
*/
require './lib/common.inc.php';
require_once './libraries/config/Form.class.php';
require_once './libraries/config/FormDisplay.class.php';
require_once './setup/lib/ConfigGenerator.class.php';
require './libraries/config/setup.forms.php';

4
setup/frames/config.inc.php
View File

@ -6,6 +6,8 @@
* @package PhpMyAdmin-Setup
*/
use PMA\setup\lib\ConfigGenerator;
if (!defined('PHPMYADMIN')) {
exit;
}
@ -13,9 +15,7 @@ if (!defined('PHPMYADMIN')) {
/**
* Core libraries.
*/
require_once './libraries/config/FormDisplay.class.php';
require_once './setup/lib/index.lib.php';
require_once './setup/lib/ConfigGenerator.class.php';
$config_readable = false;
$config_writable = false;

4
setup/frames/form.inc.php
View File

@ -6,6 +6,8 @@
* @package PhpMyAdmin-Setup
*/
use PMA\libraries\config\FormDisplay;
if (!defined('PHPMYADMIN')) {
exit;
}
@ -13,8 +15,6 @@ if (!defined('PHPMYADMIN')) {
/**
* Core libraries.
*/
require_once './libraries/config/Form.class.php';
require_once './libraries/config/FormDisplay.class.php';
require_once './setup/lib/form_processing.lib.php';
require './libraries/config/setup.forms.php';

7
setup/frames/index.inc.php
View File

@ -6,6 +6,10 @@
* @package PhpMyAdmin-Setup
*/
use PMA\libraries\config\ConfigFile;
use PMA\libraries\config\FormDisplay;
use PMA\libraries\config\ServerConfigChecks;
if (!defined('PHPMYADMIN')) {
exit;
}
@ -14,9 +18,8 @@ if (!defined('PHPMYADMIN')) {
* Core libraries.
*/
require_once './libraries/display_select_lang.lib.php';
require_once './libraries/config/FormDisplay.class.php';
require_once './libraries/config/ServerConfigChecks.class.php';
require_once './setup/lib/index.lib.php';
require_once './libraries/config/FormDisplay.tpl.php';
// prepare unfiltered language list
$all_languages = PMA_langList();

5
setup/frames/servers.inc.php
View File

@ -6,6 +6,9 @@
* @package PhpMyAdmin-Setup
*/
use PMA\libraries\config\ConfigFile;
use PMA\libraries\config\FormDisplay;
if (!defined('PHPMYADMIN')) {
exit;
}
@ -13,8 +16,6 @@ if (!defined('PHPMYADMIN')) {
/**
* Core libraries.
*/
require_once './libraries/config/Form.class.php';
require_once './libraries/config/FormDisplay.class.php';
require_once './setup/lib/form_processing.lib.php';
require './libraries/config/setup.forms.php';

5
setup/lib/ConfigGenerator.class.php → setup/lib/ConfigGenerator.php
View File

@ -5,6 +5,9 @@
*
* @package PhpMyAdmin-Setup
*/
namespace PMA\setup\lib;
use PMA\libraries\config\ConfigFile;
/**
* Config file generation class
@ -145,7 +148,7 @@ class ConfigGenerator
/**
* Generate server part of config file
*
* @param ConfigFile $cf Config file
* @param \PMA\libraries\config\ConfigFile $cf Config file
* @param string $crlf Carriage return char
* @param array $servers Servers list
*

2
setup/lib/common.inc.php
View File

@ -5,6 +5,7 @@
*
* @package PhpMyAdmin-Setup
*/
use PMA\libraries\config\ConfigFile;
/**
* Do not include full common.
@ -21,7 +22,6 @@ if (!file_exists('./libraries/common.inc.php')) {
require_once './libraries/common.inc.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/url_generating.lib.php';
require_once './libraries/user_preferences.lib.php';

1
setup/lib/form_processing.lib.php
View File

@ -5,6 +5,7 @@
*
* @package PhpMyAdmin-Setup
*/
use PMA\libraries\config\FormDisplay;
/**
* Processes forms registered in $form_display, handles error correction

4
setup/validate.php
View File

@ -12,7 +12,7 @@
require './lib/common.inc.php';
$validators = array();
require './libraries/config/Validator.class.php';
require './libraries/config/Validator.php';
header('Content-type: application/json');
@ -24,7 +24,7 @@ if (!($values instanceof stdClass)) {
PMA_fatalError(__('Wrong data'));
}
$values = (array)$values;
$result = PMA_Validator::validate($GLOBALS['ConfigFile'], $vids, $values, true);
$result = PMA\libraries\config\Validator::validate($GLOBALS['ConfigFile'], $vids, $values, true);
if ($result === false) {
$result = 'Wrong data or no validation for ' . $vids;
}

20
sql.php
View File

@ -7,6 +7,9 @@
* that returns 0 rows - to prevent cyclic redirects or includes
* @package PhpMyAdmin
*/
use PMA\libraries\config\PageSettings;
use PMA\libraries\Response;
use PMA\libraries\Util;
/**
* Gets some core libraries
@ -15,12 +18,11 @@ require_once 'libraries/common.inc.php';
require_once 'libraries/check_user_privileges.lib.php';
require_once 'libraries/bookmark.lib.php';
require_once 'libraries/sql.lib.php';
require_once 'libraries/config/page_settings.class.php';
PMA_PageSettings::showGroup('Browse');
PageSettings::showGroup('Browse');
$response = PMA\libraries\Response::getInstance();
$response = Response::getInstance();
$header = $response->getHeader();
$scripts = $header->getScripts();
$scripts->addFile('jquery/jquery-ui-timepicker-addon.js');
@ -51,11 +53,11 @@ if (! empty($goto)) {
}
} else {
if (empty($table)) {
$goto = PMA\libraries\Util::getScriptNameForOption(
$goto = Util::getScriptNameForOption(
$GLOBALS['cfg']['DefaultTabDatabase'], 'database'
);
} else {
$goto = PMA\libraries\Util::getScriptNameForOption(
$goto = Util::getScriptNameForOption(
$GLOBALS['cfg']['DefaultTabTable'], 'table'
);
}
@ -109,9 +111,9 @@ if (isset($_REQUEST['get_set_values']) && $_REQUEST['get_set_values'] == true) {
if (isset($_REQUEST['get_default_fk_check_value'])
&& $_REQUEST['get_default_fk_check_value'] == true
) {
$response = PMA\libraries\Response::getInstance();
$response = Response::getInstance();
$response->addJSON(
'default_fk_check_value', PMA\libraries\Util::isForeignKeyCheck()
'default_fk_check_value', Util::isForeignKeyCheck()
);
exit;
}
@ -135,7 +137,7 @@ if (empty($sql_query) && $tableLength && $dbLength) {
$goto = '';
} else {
// Now we can check the parameters
PMA\libraries\Util::checkParameters(array('sql_query'));
Util::checkParameters(array('sql_query'));
}
/**
@ -154,7 +156,7 @@ require_once 'libraries/parse_analyze.inc.php';
if (PMA_hasNoRightsToDropDatabase(
$analyzed_sql_results, $cfg['AllowUserDropDatabase'], $is_superuser
)) {
PMA\libraries\Util::mysqlDie(
Util::mysqlDie(
__('"DROP DATABASE" statements are disabled.'),
'',
false,

14
tbl_change.php
View File

@ -7,14 +7,16 @@
*
* @package PhpMyAdmin
*/
use PMA\libraries\config\PageSettings;
use PMA\libraries\Response;
use PMA\libraries\Util;
/**
* Gets the variables sent or posted to this script and displays the header
*/
require_once 'libraries/common.inc.php';
require_once 'libraries/config/page_settings.class.php';
PMA_PageSettings::showGroup('Edit');
PageSettings::showGroup('Edit');
/**
* Ensures db and table are valid, else moves to the "parent" script
@ -72,7 +74,7 @@ $comments_map = PMA_getCommentsMap($db, $table);
/**
* Load JavaScript files
*/
$response = PMA\libraries\Response::getInstance();
$response = Response::getInstance();
$header = $response->getHeader();
$scripts = $header->getScripts();
$scripts->addFile('functions.js');
@ -90,7 +92,7 @@ $scripts->addFile('gis_data_editor.js');
* $disp_message come from tbl_replace.php
*/
if (! empty($disp_message)) {
$response->addHTML(PMA\libraries\Util::getMessage($disp_message, null));
$response->addHTML(Util::getMessage($disp_message, null));
}
$table_columns = PMA_getTableColumns($db, $table);
@ -152,7 +154,7 @@ $html_output .= PMA_getHtmlForInsertEditFormHeader($has_blob_field, $is_upload);
$html_output .= PMA_URL_getHiddenInputs($_form_params);
$titles['Browse'] = PMA\libraries\Util::getIcon('b_browse.png', __('Browse foreign values'));
$titles['Browse'] = Util::getIcon('b_browse.png', __('Browse foreign values'));
// user can toggle the display of Function column and column types
// (currently does not work for multi-edits)
@ -214,7 +216,7 @@ $html_output .= PMA_getActionsPanel(
if ($biggest_max_file_size > 0) {
$html_output .= ' '
. PMA\libraries\Util::generateHiddenMaxFileSize(
. Util::generateHiddenMaxFileSize(
$biggest_max_file_size
) . "\n";
}

4
tbl_export.php
View File

@ -5,15 +5,15 @@
*
* @package PhpMyAdmin
*/
use PMA\libraries\config\PageSettings;
/**
*
*/
require_once 'libraries/common.inc.php';
require_once 'libraries/config/page_settings.class.php';
require_once 'libraries/display_export.lib.php';
PMA_PageSettings::showGroup('Export');
PageSettings::showGroup('Export');
$response = PMA\libraries\Response::getInstance();
$header = $response->getHeader();

4
tbl_import.php
View File

@ -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('Import');
PageSettings::showGroup('Import');
$response = PMA\libraries\Response::getInstance();
$header = $response->getHeader();

1
tbl_row_action.php
View File

@ -72,6 +72,7 @@ if (!empty($submit_mult)) {
}
switch($submit_mult) {
/** @noinspection PhpMissingBreakStatementInspection */
case 'row_copy':
$_REQUEST['default_action'] = 'insert';
// no break to allow for fallthough

5
tbl_sql.php
View File

@ -5,15 +5,14 @@
*
* @package PhpMyAdmin
*/
use PMA\libraries\Response;
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

4
tbl_structure.php
View File

@ -14,10 +14,12 @@ use PMA\libraries\Response;
require_once 'libraries/common.inc.php';
require_once 'libraries/tbl_info.inc.php';
require_once 'libraries/mysql_charsets.inc.php';
require_once 'libraries/config/page_settings.class.php';
require_once 'libraries/bookmark.lib.php';
require_once 'libraries/di/Container.class.php';
require_once 'libraries/controllers/TableStructureController.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';
$container = DI\Container::getDefaultContainer();
$container->factory('PMA\Controllers\TableStructureController');

4
test/classes/PMA_Scripts_test.php
View File

@ -1,7 +1,7 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Tests for Script.class.php
* Tests for Script.php
*
* @package PhpMyAdmin-test
*/
@ -16,7 +16,7 @@ require_once 'libraries/js_escape.lib.php';
require_once 'libraries/url_generating.lib.php';
/**
* Tests for Script.class.php
* Tests for Script.php
*
* @package PhpMyAdmin-test
*/

2
test/classes/PMA_Types_Drizzle_test.php
View File

@ -22,7 +22,7 @@ require_once 'libraries/database_interface.inc.php';
class PMA_Types_Drizzle_Test extends PHPUnit_Framework_TestCase
{
/**
* @var Types
* @var PMA\libraries\Types
*/
protected $object;

2
test/classes/PMA_Types_MySQL_test.php
View File

@ -21,7 +21,7 @@ require_once 'libraries/php-gettext/gettext.inc';
class PMA_Types_MySQL_Test extends PHPUnit_Framework_TestCase
{
/**
* @var Types
* @var PMA\libraries\Types
*/
protected $object;

36
test/classes/config/PMA_FormDisplay_test.php
View File

@ -6,16 +6,12 @@
* @package PhpMyAdmin-test
*/
use PMA\libraries\Config;
use PMA\libraries\config\ConfigFile;
use PMA\libraries\config\FormDisplay;
use PMA\libraries\Theme;
require_once 'libraries/config/ConfigFile.class.php';
require_once 'libraries/config/Form.class.php';
require_once 'libraries/config/FormDisplay.class.php';
require_once 'libraries/config/Form.class.php';
require_once 'libraries/config/config_functions.lib.php';
require_once 'libraries/php-gettext/gettext.inc';
require_once 'libraries/user_preferences.lib.php';
@ -41,7 +37,7 @@ class PMA_FormDisplay_Test extends PHPUnit_Framework_TestCase
$_SESSION['PMA_Theme'] = new Theme();
$GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
$GLOBALS['pmaThemeImage'] = 'theme/';
$GLOBALS['PMA_Config'] = new PMA\libraries\Config();
$GLOBALS['PMA_Config'] = new Config();
$GLOBALS['PMA_Config']->enableBc();
$GLOBALS['server'] = 0;
$this->object = new FormDisplay(new ConfigFile());
@ -79,7 +75,7 @@ class PMA_FormDisplay_Test extends PHPUnit_Framework_TestCase
*/
public function testRegisterForm()
{
$reflection = new \ReflectionClass('FormDisplay');
$reflection = new \ReflectionClass('PMA\libraries\config\FormDisplay');
$attrForms = $reflection->getProperty('_forms');
$attrForms->setAccessible(true);
@ -96,7 +92,7 @@ class PMA_FormDisplay_Test extends PHPUnit_Framework_TestCase
$this->object->registerForm('pma_testform', $array, 2);
$_forms = $attrForms->getValue($this->object);
$this->assertInstanceOf(
'Form',
'PMA\libraries\config\Form',
$_forms['pma_testform']
);
@ -129,12 +125,12 @@ class PMA_FormDisplay_Test extends PHPUnit_Framework_TestCase
$this->object->process(true, true)
);
$this->object = $this->getMockBuilder('FormDisplay')
$this->object = $this->getMockBuilder('PMA\libraries\config\FormDisplay')
->disableOriginalConstructor()
->setMethods(array('save'))
->getMock();
$attrForms = new \ReflectionProperty('FormDisplay', '_forms');
$attrForms = new \ReflectionProperty('PMA\libraries\config\FormDisplay', '_forms');
$attrForms->setAccessible(true);
$attrForms->setValue($this->object, array(1, 2, 3));
@ -161,7 +157,7 @@ class PMA_FormDisplay_Test extends PHPUnit_Framework_TestCase
*/
public function testDisplayErrors()
{
$reflection = new \ReflectionClass('FormDisplay');
$reflection = new \ReflectionClass('PMA\libraries\config\FormDisplay');
$attrIsValidated = $reflection->getProperty('_isValidated');
$attrIsValidated->setAccessible(true);
@ -209,7 +205,7 @@ class PMA_FormDisplay_Test extends PHPUnit_Framework_TestCase
*/
public function testFixErrors()
{
$reflection = new \ReflectionClass('FormDisplay');
$reflection = new \ReflectionClass('PMA\libraries\config\FormDisplay');
$attrIsValidated = $reflection->getProperty('_isValidated');
$attrIsValidated->setAccessible(true);
@ -261,7 +257,7 @@ class PMA_FormDisplay_Test extends PHPUnit_Framework_TestCase
public function testValidateSelect()
{
$attrValidateSelect = new \ReflectionMethod(
'FormDisplay',
'PMA\libraries\config\FormDisplay',
'_validateSelect'
);
$attrValidateSelect->setAccessible(true);
@ -314,7 +310,7 @@ class PMA_FormDisplay_Test extends PHPUnit_Framework_TestCase
*/
public function testHasErrors()
{
$attrErrors = new \ReflectionProperty('FormDisplay', '_errors');
$attrErrors = new \ReflectionProperty('PMA\libraries\config\FormDisplay', '_errors');
$attrErrors->setAccessible(true);
$this->assertFalse(
@ -362,7 +358,7 @@ class PMA_FormDisplay_Test extends PHPUnit_Framework_TestCase
*/
public function testGetOptName()
{
$method = new \ReflectionMethod('FormDisplay', '_getOptName');
$method = new \ReflectionMethod('PMA\libraries\config\FormDisplay', '_getOptName');
$method->setAccessible(true);
$this->assertEquals(
@ -383,11 +379,11 @@ class PMA_FormDisplay_Test extends PHPUnit_Framework_TestCase
*/
public function testLoadUserprefsInfo()
{
$method = new \ReflectionMethod('FormDisplay', '_loadUserprefsInfo');
$method = new \ReflectionMethod('PMA\libraries\config\FormDisplay', '_loadUserprefsInfo');
$method->setAccessible(true);
$attrUserprefs = new \ReflectionProperty(
'FormDisplay',
'PMA\libraries\config\FormDisplay',
'_userprefsDisallow'
);
@ -410,7 +406,7 @@ class PMA_FormDisplay_Test extends PHPUnit_Framework_TestCase
$this->markTestSkipped('Cannot redefine constant');
}
$method = new \ReflectionMethod('FormDisplay', '_setComments');
$method = new \ReflectionMethod('PMA\libraries\config\FormDisplay', '_setComments');
$method->setAccessible(true);
// recoding

20
test/classes/config/PMA_Form_test.php
View File

@ -6,13 +6,11 @@
* @package PhpMyAdmin-test
*/
use PMA\libraries\Config;
use PMA\libraries\config\ConfigFile;
use PMA\libraries\config\Form;
use PMA\libraries\Theme;
require_once 'libraries/config/ConfigFile.class.php';
require_once 'libraries/config/Form.class.php';
require_once 'libraries/php-gettext/gettext.inc';
/**
@ -37,7 +35,7 @@ class PMA_Form_Test extends PHPUnit_Framework_TestCase
$_SESSION['PMA_Theme'] = new Theme();
$GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
$GLOBALS['pmaThemeImage'] = 'theme/';
$GLOBALS['PMA_Config'] = new PMA\libraries\Config();
$GLOBALS['PMA_Config'] = new Config();
$GLOBALS['PMA_Config']->enableBc();
$GLOBALS['server'] = 0;
$this->object = new Form(
@ -84,7 +82,7 @@ class PMA_Form_Test extends PHPUnit_Framework_TestCase
*/
public function testGetOptionType()
{
$attrFieldsTypes = new \ReflectionProperty('Form', '_fieldsTypes');
$attrFieldsTypes = new \ReflectionProperty('PMA\libraries\config\Form', '_fieldsTypes');
$attrFieldsTypes->setAccessible(true);
$attrFieldsTypes->setValue(
$this->object,
@ -140,7 +138,7 @@ class PMA_Form_Test extends PHPUnit_Framework_TestCase
*/
public function testReadFormPathsCallBack()
{
$reflection = new \ReflectionClass('Form');
$reflection = new \ReflectionClass('PMA\libraries\config\Form');
$method = $reflection->getMethod('_readFormPathsCallback');
$method->setAccessible(true);
@ -192,7 +190,7 @@ class PMA_Form_Test extends PHPUnit_Framework_TestCase
*/
public function testReadFormPaths()
{
$reflection = new \ReflectionClass('Form');
$reflection = new \ReflectionClass('PMA\libraries\config\Form');
$method = $reflection->getMethod('readFormPaths');
$method->setAccessible(true);
@ -247,7 +245,7 @@ class PMA_Form_Test extends PHPUnit_Framework_TestCase
*/
public function testReadTypes()
{
$reflection = new \ReflectionClass('Form');
$reflection = new \ReflectionClass('PMA\libraries\config\Form');
$method = $reflection->getMethod('readTypes');
$method->setAccessible(true);
@ -281,7 +279,7 @@ class PMA_Form_Test extends PHPUnit_Framework_TestCase
*/
public function testLoadForm()
{
$this->object = $this->getMockBuilder('Form')
$this->object = $this->getMockBuilder('PMA\libraries\config\Form')
->disableOriginalConstructor()
->setMethods(array('readFormPaths', 'readTypes'))
->getMock();

3
test/libraries/PMA_ConfigFile_test.php
View File

@ -9,7 +9,8 @@
/*
* Include to test.
*/
require_once 'libraries/config/ConfigFile.class.php';
use PMA\libraries\config\ConfigFile;
require_once 'libraries/php-gettext/gettext.inc';
/**

14
test/libraries/PMA_ConfigGenerator_test.php
View File

@ -9,8 +9,10 @@
/*
* Include to test
*/
require_once 'setup/lib/ConfigGenerator.class.php';
require_once 'libraries/config/ConfigFile.class.php';
use PMA\libraries\Config;
use PMA\libraries\config\ConfigFile;
use PMA\setup\lib\ConfigGenerator;
require_once 'libraries/core.lib.php';
require_once 'libraries/php-gettext/gettext.inc';
@ -34,7 +36,7 @@ class PMA_ConfigGenerator_Test extends PHPUnit_Framework_TestCase
$GLOBALS['cfg']['AvailableCharsets'] = array();
unset($_SESSION['eol']);
$GLOBALS['PMA_Config'] = new PMA\libraries\Config();
$GLOBALS['PMA_Config'] = new Config();
$GLOBALS['server'] = 0;
$cf = new ConfigFile();
@ -85,7 +87,7 @@ class PMA_ConfigGenerator_Test extends PHPUnit_Framework_TestCase
*/
public function testGetVarExport()
{
$reflection = new \ReflectionClass('ConfigGenerator');
$reflection = new \ReflectionClass('PMA\setup\lib\ConfigGenerator');
$method = $reflection->getMethod('_getVarExport');
$method->setAccessible(true);
@ -132,7 +134,7 @@ class PMA_ConfigGenerator_Test extends PHPUnit_Framework_TestCase
*/
public function testIsZeroBasedArray()
{
$reflection = new \ReflectionClass('ConfigGenerator');
$reflection = new \ReflectionClass('PMA\setup\lib\ConfigGenerator');
$method = $reflection->getMethod('_isZeroBasedArray');
$method->setAccessible(true);
@ -179,7 +181,7 @@ class PMA_ConfigGenerator_Test extends PHPUnit_Framework_TestCase
*/
public function testExportZeroBasedArray()
{
$reflection = new \ReflectionClass('ConfigGenerator');
$reflection = new \ReflectionClass('PMA\setup\lib\ConfigGenerator');
$method = $reflection->getMethod('_exportZeroBasedArray');
$method->setAccessible(true);

4
test/libraries/PMA_FormDisplay_tpl_test.php
View File

@ -8,11 +8,7 @@
use PMA\libraries\Theme;
require_once 'libraries/config/ConfigFile.class.php';
require_once 'libraries/config/FormDisplay.tpl.php';
require_once 'libraries/php-gettext/gettext.inc';
require_once 'libraries/user_preferences.lib.php';
require_once 'libraries/php-gettext/gettext.inc';

9
test/libraries/PMA_Form_Processing_test.php
View File

@ -10,7 +10,6 @@
* Include to test
*/
require_once 'setup/lib/form_processing.lib.php';
require_once 'libraries/config/ConfigFile.class.php';
require_once 'libraries/core.lib.php';
@ -19,7 +18,7 @@ require_once 'libraries/core.lib.php';
*
* @package PhpMyAdmin-test
*/
class PMA_From_Processing_Test extends PHPUnit_Framework_TestCase
class PMA_Form_Processing_Test extends PHPUnit_Framework_TestCase
{
/**
@ -36,7 +35,7 @@ class PMA_From_Processing_Test extends PHPUnit_Framework_TestCase
}
// case 1
$formDisplay = $this->getMockBuilder('FormDisplay')
$formDisplay = $this->getMockBuilder('PMA\libraries\config\FormDisplay')
->disableOriginalConstructor()
->setMethods(array('process', 'getDisplay'))
->getMock();
@ -53,7 +52,7 @@ class PMA_From_Processing_Test extends PHPUnit_Framework_TestCase
PMA_Process_formset($formDisplay);
// case 2
$formDisplay = $this->getMockBuilder('FormDisplay')
$formDisplay = $this->getMockBuilder('PMA\libraries\config\FormDisplay')
->disableOriginalConstructor()
->setMethods(array('process', 'hasErrors', 'displayErrors'))
->getMock();
@ -93,7 +92,7 @@ class PMA_From_Processing_Test extends PHPUnit_Framework_TestCase
);
// case 3
$formDisplay = $this->getMockBuilder('FormDisplay')
$formDisplay = $this->getMockBuilder('PMA\libraries\config\FormDisplay')
->disableOriginalConstructor()
->setMethods(array('process', 'hasErrors'))
->getMock();

8
test/libraries/PMA_SetupIndex_test.php
View File

@ -9,13 +9,13 @@
/*
* Include to test
*/
use PMA\libraries\config\ConfigFile;
use PMA\libraries\config\ServerConfigChecks;
require_once 'libraries/php-gettext/gettext.inc';
require_once 'libraries/sanitizing.lib.php';
require_once 'libraries/config/config_functions.lib.php';
require_once 'libraries/config/ConfigFile.class.php';
require_once 'libraries/core.lib.php';
require_once 'libraries/config/ServerConfigChecks.class.php';
require_once 'setup/lib/index.lib.php';
require_once 'libraries/php-gettext/gettext.inc';
require_once 'libraries/sanitizing.lib.php';
@ -261,7 +261,7 @@ class PMA_SetupIndex_Test extends PHPUnit_Framework_TestCase
$cf = new ConfigFile();
$GLOBALS['ConfigFile'] = $cf;
$reflection = new \ReflectionProperty('ConfigFile', '_id');
$reflection = new \ReflectionProperty('PMA\libraries\config\ConfigFile', '_id');
$reflection->setAccessible(true);
$sessionID = $reflection->getValue($cf);

12
test/libraries/PMA_page_settings_test.php
View File

@ -5,11 +5,9 @@
*
* @package PhpMyAdmin-test
*/
use PMA\libraries\config\PageSettings;
/*
* Include to test.
*/
require_once 'libraries/config/page_settings.class.php';
require_once './libraries/config/PageSettings.php';
/**
* Tests for Page-related settings
@ -35,7 +33,7 @@ class PMA_PageSettings_Test extends PHPUnit_Framework_TestCase
*/
public function testShowGroupNonExistent()
{
$object = PMA_PageSettings::showGroup('NonExistent');
$object = PageSettings::showGroup('NonExistent');
$this->assertEquals('', $object->getHTML());
}
@ -47,7 +45,7 @@ class PMA_PageSettings_Test extends PHPUnit_Framework_TestCase
*/
public function testShowGroupBrowse()
{
$object = PMA_PageSettings::showGroup('Browse');
$object = PageSettings::showGroup('Browse');
$html = $object->getHTML();
@ -81,7 +79,7 @@ class PMA_PageSettings_Test extends PHPUnit_Framework_TestCase
*/
function testGetNaviSettings()
{
$html = PMA_PageSettings::getNaviSettings();
$html = PageSettings::getNaviSettings();
// Test some sample parts
$this->assertContains(

2
test/libraries/PMA_server_privileges_test.php
View File

@ -97,7 +97,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
'menuswork' => true
);
$pmaconfig = $this->getMockBuilder('PMA_Config')
$pmaconfig = $this->getMockBuilder('PMA\libraries\Config')
->disableOriginalConstructor()
->getMock();

5
test/libraries/PMA_user_preferences_test.php
View File

@ -9,11 +9,10 @@
/*
* Include to test
*/
use PMA\libraries\config\ConfigFile;
require_once 'libraries/user_preferences.lib.php';
require_once 'libraries/config/ConfigFile.class.php';
require_once 'libraries/core.lib.php';
require_once 'libraries/php-gettext/gettext.inc';
require_once 'libraries/relation.lib.php';
require_once 'libraries/url_generating.lib.php';