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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2017-09-06 16:17:11 +02:00
commit bcbf1c1ac1
91 changed files with 102 additions and 248 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/classes/Controllers/Controller.php
View File

@ -11,8 +11,6 @@ use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Response;
require_once 'libraries/database_interface.inc.php';
/**
* Base class for all of controller
*

81
libraries/classes/DatabaseInterface.php
View File

@ -9,6 +9,10 @@ namespace PhpMyAdmin;
use PhpMyAdmin\Core;
use PhpMyAdmin\Dbi\DbiExtension;
use PhpMyAdmin\Dbi\DbiDummy;
use PhpMyAdmin\Dbi\DbiMysql;
use PhpMyAdmin\Dbi\DbiMysqli;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Error;
use PhpMyAdmin\Index;
use PhpMyAdmin\LanguageManager;
@ -2920,4 +2924,81 @@ class DatabaseInterface
{
return $this->_is_percona;
}
/**
* Load correct database driver
*/
public static function load()
{
if (defined('TESTSUITE')) {
/**
* For testsuite we use dummy driver which can fake some queries.
*/
$extension = new DbiDummy();
} else {
/**
* First check for the mysqli extension, as it's the one recommended
* for the MySQL server's version that we support
* (if PHP 7+, it's the only one supported)
*/
$extension = 'mysqli';
if (! self::checkDbExtension($extension)) {
$docurl = Util::getDocuLink('faq', 'faqmysql');
$doclink = sprintf(
__('See %sour documentation%s for more information.'),
'[a@' . $docurl . '@documentation]',
'[/a]'
);
if (PHP_VERSION_ID < 70000) {
$extension = 'mysql';
if (! self::checkDbExtension($extension)) {
// warn about both extensions missing and exit
Core::warnMissingExtension(
'mysqli',
true,
$doclink
);
} elseif (empty($_SESSION['mysqlwarning'])) {
trigger_error(
__(
'You are using the mysql extension which is deprecated in '
. 'phpMyAdmin. Please consider installing the mysqli '
. 'extension.'
) . ' ' . $doclink,
E_USER_WARNING
);
// tell the user just once per session
$_SESSION['mysqlwarning'] = true;
}
} else {
// mysql extension is not part of PHP 7+, so warn and exit
Core::warnMissingExtension(
'mysqli',
true,
$doclink
);
}
}
/**
* Including The DBI Plugin
*/
switch($extension) {
case 'mysql' :
$extension = new DbiMysql();
break;
case 'mysqli' :
$extension = new DbiMysqli();
break;
}
}
$GLOBALS['dbi'] = new DatabaseInterface($extension);
$container = Container::getDefaultContainer();
$container->set('PMA_DatabaseInterface', $GLOBALS['dbi']);
$container->alias('dbi', 'PMA_DatabaseInterface');
}
}

2
libraries/classes/Dbi/DbiExtension.php
View File

@ -6,8 +6,6 @@
*/
namespace PhpMyAdmin\Dbi;
require_once 'libraries/dbi/dbi_extension.lib.php';
/**
* Contract for every database extension supported by phpMyAdmin
*

7
libraries/classes/Dbi/DbiMysql.php
View File

@ -21,13 +21,6 @@ if (! extension_loaded('mysql')) {
return;
}
require_once 'libraries/dbi/dbi_extension.lib.php';
/**
* MySQL client API
*/
PMA_defineClientAPI(mysql_get_client_info());
/**
* Interface to the classic MySQL extension
*

25
libraries/classes/Dbi/DbiMysqli.php
View File

@ -14,13 +14,6 @@ if (! defined('PHPMYADMIN')) {
exit;
}
require_once 'libraries/dbi/dbi_extension.lib.php';
/**
* MySQL client API
*/
PMA_defineClientAPI(mysqli_get_client_info());
/**
* some PHP versions are reporting extra messages like "No index used in query"
*/
@ -57,6 +50,22 @@ if (! defined('MYSQLI_TYPE_JSON')) {
*/
class DbiMysqli implements DbiExtension
{
static private $pma_mysqli_flag_names = array(
MYSQLI_NUM_FLAG => 'num',
MYSQLI_PART_KEY_FLAG => 'part_key',
MYSQLI_SET_FLAG => 'set',
MYSQLI_TIMESTAMP_FLAG => 'timestamp',
MYSQLI_AUTO_INCREMENT_FLAG => 'auto_increment',
MYSQLI_ENUM_FLAG => 'enum',
MYSQLI_ZEROFILL_FLAG => 'zerofill',
MYSQLI_UNSIGNED_FLAG => 'unsigned',
MYSQLI_BLOB_FLAG => 'blob',
MYSQLI_MULTIPLE_KEY_FLAG => 'multiple_key',
MYSQLI_UNIQUE_KEY_FLAG => 'unique_key',
MYSQLI_PRI_KEY_FLAG => 'primary_key',
MYSQLI_NOT_NULL_FLAG => 'not_null',
);
/**
* connects to the database server
*
@ -540,7 +549,7 @@ class DbiMysqli implements DbiExtension
$charsetnr = $f->charsetnr;
$f = $f->flags;
$flags = array();
foreach ($GLOBALS['pma_mysqli_flag_names'] as $flag => $name) {
foreach (self::$pma_mysqli_flag_names as $flag => $name) {
if ($f & $flag) {
$flags[] = $name;
}

2
libraries/classes/SystemDatabase.php
View File

@ -11,8 +11,6 @@ use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Relation;
use PhpMyAdmin\Util;
require_once 'libraries/database_interface.inc.php';
/**
* Class SystemDatabase
*

2
libraries/common.inc.php
View File

@ -576,7 +576,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
/**
* Loads the proper database interface for this server
*/
include_once './libraries/database_interface.inc.php';
DatabaseInterface::load();
// get LoginCookieValidity from preferences cache
// no generic solution for loading preferences from cache as some settings

91
libraries/database_interface.inc.php
View File

@ -1,91 +0,0 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Creates the database interface required for database interactions
* and add it to GLOBALS.
*
* @package PhpMyAdmin-DBI
*/
use PhpMyAdmin\Core;
use PhpMyAdmin\Dbi\DbiDummy;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Dbi\DbiMysql;
use PhpMyAdmin\Dbi\DbiMysqli;
if (! defined('PHPMYADMIN')) {
exit;
}
if (defined('TESTSUITE')) {
/**
* For testsuite we use dummy driver which can fake some queries.
*/
$extension = new DbiDummy();
} else {
/**
* First check for the mysqli extension, as it's the one recommended
* for the MySQL server's version that we support
* (if PHP 7+, it's the only one supported)
*/
$extension = 'mysqli';
if (!DatabaseInterface::checkDbExtension($extension)) {
$docurl = PhpMyAdmin\Util::getDocuLink('faq', 'faqmysql');
$doclink = sprintf(
__('See %sour documentation%s for more information.'),
'[a@' . $docurl . '@documentation]',
'[/a]'
);
if (PHP_VERSION_ID < 70000) {
$extension = 'mysql';
if (! PhpMyAdmin\DatabaseInterface::checkDbExtension($extension)) {
// warn about both extensions missing and exit
Core::warnMissingExtension(
'mysqli',
true,
$doclink
);
} elseif (empty($_SESSION['mysqlwarning'])) {
trigger_error(
__(
'You are using the mysql extension which is deprecated in '
. 'phpMyAdmin. Please consider installing the mysqli '
. 'extension.'
) . ' ' . $doclink,
E_USER_WARNING
);
// tell the user just once per session
$_SESSION['mysqlwarning'] = true;
}
} else {
// mysql extension is not part of PHP 7+, so warn and exit
Core::warnMissingExtension(
'mysqli',
true,
$doclink
);
}
}
/**
* Including The DBI Plugin
*/
switch($extension) {
case 'mysql' :
$extension = new DbiMysql();
break;
case 'mysqli' :
include_once 'libraries/dbi/dbi_mysqli.inc.php';
$extension = new DbiMysqli();
break;
}
}
$GLOBALS['dbi'] = new DatabaseInterface($extension);
$container = Container::getDefaultContainer();
$container->set('PMA_DatabaseInterface', $GLOBALS['dbi']);
$container->alias('dbi', 'PMA_DatabaseInterface');

28
libraries/dbi/dbi_extension.lib.php
View File

@ -1,28 +0,0 @@
<?php
/**
* Contract for every database extension supported by phpMyAdmin
*
* @package PhpMyAdmin-DBI
*/
/**
* Defines PMA_MYSQL_CLIENT_API if it does not exist based
* on MySQL client version.
*
* @param string $version MySQL version string
*
* @return void
*/
function PMA_defineClientAPI($version)
{
if (!defined('PMA_MYSQL_CLIENT_API')) {
$client_api = explode('.', $version);
define(
'PMA_MYSQL_CLIENT_API',
(int)sprintf(
'%d%02d%02d',
$client_api[0], $client_api[1], intval($client_api[2])
)
);
}
}

27
libraries/dbi/dbi_mysqli.inc.php
View File

@ -1,27 +0,0 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Interface to the improved MySQL extension (MySQLi)
*
* @package PhpMyAdmin-DBI
* @subpackage MySQLi
*/
/**
* Names of field flags.
*/
$GLOBALS['pma_mysqli_flag_names'] = array(
MYSQLI_NUM_FLAG => 'num',
MYSQLI_PART_KEY_FLAG => 'part_key',
MYSQLI_SET_FLAG => 'set',
MYSQLI_TIMESTAMP_FLAG => 'timestamp',
MYSQLI_AUTO_INCREMENT_FLAG => 'auto_increment',
MYSQLI_ENUM_FLAG => 'enum',
MYSQLI_ZEROFILL_FLAG => 'zerofill',
MYSQLI_UNSIGNED_FLAG => 'unsigned',
MYSQLI_BLOB_FLAG => 'blob',
MYSQLI_MULTIPLE_KEY_FLAG => 'multiple_key',
MYSQLI_UNIQUE_KEY_FLAG => 'unique_key',
MYSQLI_PRI_KEY_FLAG => 'primary_key',
MYSQLI_NOT_NULL_FLAG => 'not_null',
);

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

@ -20,7 +20,6 @@ if (!file_exists('./libraries/common.inc.php')) {
require_once './libraries/common.inc.php';
require_once './libraries/user_preferences.lib.php';
require_once './libraries/database_interface.inc.php';
require_once './setup/lib/ConfigGenerator.php';
// use default error handler

3
test/bootstrap-dist.php
View File

@ -67,6 +67,9 @@ unset($CFG);
/* Ensure default langauge is active */
PhpMyAdmin\LanguageManager::getInstance()->getLanguage('en')->activate();
/* Load Database interface */
PhpMyAdmin\DatabaseInterface::load();
// Set proxy information from env, if available
$http_proxy = getenv('http_proxy');
if (PHP_SAPI == 'cli' && $http_proxy && ($url_info = parse_url($http_proxy))) {

1
test/classes/BookmarkTest.php
View File

@ -7,7 +7,6 @@
*/
use PhpMyAdmin\Bookmark;
require_once 'libraries/database_interface.inc.php';
/**
* Tests for Bookmark class

1
test/classes/CentralColumnsTest.php
View File

@ -15,7 +15,6 @@ use PhpMyAdmin\Util;
$GLOBALS['server'] = 1;
require_once 'libraries/database_interface.inc.php';
/**
* tests for PhpMyAdmin\CentralColumns

1
test/classes/Database/DesignerTest.php
View File

@ -12,7 +12,6 @@ use PhpMyAdmin\DatabaseInterface;
/*
* Include to test.
*/
require_once 'libraries/database_interface.inc.php';
require_once 'libraries/plugin_interface.lib.php';
/**

1
test/classes/DbQbeTest.php
View File

@ -9,7 +9,6 @@
* Include to test.
*/
require_once 'libraries/database_interface.inc.php';
require_once 'test/PMATestCase.php';
use PhpMyAdmin\DbQbe;

1
test/classes/DbSearchTest.php
View File

@ -9,7 +9,6 @@
* Include to test.
*/
require_once 'libraries/database_interface.inc.php';
require_once 'test/PMATestCase.php';
use PhpMyAdmin\DbSearch;

1
test/classes/Display/ExportTest.php
View File

@ -13,7 +13,6 @@ use PhpMyAdmin\Theme;
use PhpMyAdmin\Url;
use PhpMyAdmin\Util;
require_once 'libraries/database_interface.inc.php';
require_once 'libraries/plugin_interface.lib.php';
/**

1
test/classes/HeaderTest.php
View File

@ -11,7 +11,6 @@ use PhpMyAdmin\Core;
use PhpMyAdmin\Header;
use PhpMyAdmin\Theme;
require_once 'libraries/database_interface.inc.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/ImportTest.php
View File

@ -21,7 +21,6 @@ $GLOBALS['server'] = 0;
/*
* Include to test.
*/
require_once 'libraries/database_interface.inc.php';
/**
* Tests for import functions

1
test/classes/InsertEditTest.php
View File

@ -19,7 +19,6 @@ use PhpMyAdmin\TypesMySQL;
use ReflectionProperty;
use stdClass;
require_once 'libraries/database_interface.inc.php';
/**
* Tests for PhpMyAdmin\InsertEdit

1
test/classes/MenuTest.php
View File

@ -13,7 +13,6 @@ use PhpMyAdmin\Core;
use PhpMyAdmin\Menu;
use PhpMyAdmin\Theme;
require_once 'libraries/database_interface.inc.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/NormalizationTest.php
View File

@ -15,7 +15,6 @@ use stdClass;
$GLOBALS['server'] = 1;
require_once 'libraries/database_interface.inc.php';
/**
* tests for PhpMyAdmin\Normalization

1
test/classes/OperationsTest.php
View File

@ -10,7 +10,6 @@ namespace PhpMyAdmin\Tests;
use PhpMyAdmin\Operations;
use PhpMyAdmin\Theme;
require_once 'libraries/database_interface.inc.php';
/**
* tests for operations

1
test/classes/RelationTest.php
View File

@ -10,7 +10,6 @@ namespace PhpMyAdmin\Tests;
use PhpMyAdmin\Relation;
use PhpMyAdmin\Theme;
require_once 'libraries/database_interface.inc.php';
/**
* Tests for PhpMyAdmin\Relation

1
test/classes/Server/PrivilegesTest.php
View File

@ -14,7 +14,6 @@ use PhpMyAdmin\Theme;
use PhpMyAdmin\Url;
use PhpMyAdmin\Util;
require_once 'libraries/database_interface.inc.php';
require_once 'libraries/relation_cleanup.lib.php';
/**

1
test/classes/ServerStatusDataTest.php
View File

@ -12,7 +12,6 @@
use PhpMyAdmin\Core;
use PhpMyAdmin\ServerStatusData;
require_once 'libraries/database_interface.inc.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/StorageEngineTest.php
View File

@ -12,7 +12,6 @@ require_once 'test/PMATestCase.php';
* Include to test.
*/
require_once 'libraries/config.default.php';
require_once 'libraries/database_interface.inc.php';
/**
* Tests for StorageEngine.php

1
test/classes/TableTest.php
View File

@ -14,7 +14,6 @@ use PhpMyAdmin\Table;
use PhpMyAdmin\Theme;
use PhpMyAdmin\Util;
require_once 'libraries/database_interface.inc.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/TrackerTest.php
View File

@ -12,7 +12,6 @@
use PhpMyAdmin\Tracker;
use PhpMyAdmin\Util;
require_once 'libraries/database_interface.inc.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/TrackingTest.php
View File

@ -11,7 +11,6 @@ use PhpMyAdmin\Theme;
use PhpMyAdmin\Tracking;
use PhpMyAdmin\Url;
require_once 'libraries/database_interface.inc.php';
/**
* Tests for PhpMyAdmin\Tracking

1
test/classes/TransformationsTest.php
View File

@ -12,7 +12,6 @@ use PhpMyAdmin\Transformations;
/*
* Include to test.
*/
require_once 'libraries/database_interface.inc.php';
/**
* tests for transformation wrappers

1
test/classes/controllers/DatabaseStructureControllerTest.php
View File

@ -18,7 +18,6 @@ use PhpMyAdmin\Tests\Stubs\Response as ResponseStub;
use PhpMyAdmin\Theme;
require_once 'test/PMATestCase.php';
require_once 'libraries/database_interface.inc.php';
/**
* DatabaseStructureController_Test class

1
test/classes/controllers/ServerBinlogControllerTest.php
View File

@ -12,7 +12,6 @@ use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Util;
require_once 'test/PMATestCase.php';
require_once 'libraries/database_interface.inc.php';
/**
* Tests for ServerCollationsController class

1
test/classes/controllers/ServerCollationsControllerTest.php
View File

@ -28,7 +28,6 @@ $GLOBALS['cfg']['Server'] = array(
require_once 'libraries/database_interface.inc.php';
require_once 'libraries/server_common.inc.php';
require_once 'test/PMATestCase.php';

1
test/classes/controllers/ServerDatabasesControllerTest.php
View File

@ -11,7 +11,6 @@ use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Tests\Stubs\Response as ResponseStub;
use PhpMyAdmin\Theme;
require_once 'libraries/database_interface.inc.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/controllers/ServerEnginesControllerTest.php
View File

@ -11,7 +11,6 @@ use PhpMyAdmin\Theme;
use PhpMyAdmin\Controllers\Server\ServerEnginesController;
use PhpMyAdmin\Url;
require_once 'libraries/database_interface.inc.php';
require_once 'test/PMATestCase.php';

1
test/classes/controllers/ServerPluginsControllerTest.php
View File

@ -13,7 +13,6 @@ use PhpMyAdmin\Theme;
use PhpMyAdmin\Controllers\Server\ServerPluginsController;
use PhpMyAdmin\Di\Container;
require_once 'libraries/database_interface.inc.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/controllers/ServerVariablesControllerTest.php
View File

@ -12,7 +12,6 @@ use PhpMyAdmin\Tests\Stubs\Response as ResponseStub;
use PhpMyAdmin\Theme;
use PhpMyAdmin\Url;
require_once 'libraries/database_interface.inc.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/controllers/TableIndexesControllerTest.php
View File

@ -16,7 +16,6 @@ use PhpMyAdmin\Url;
/*
* Include to test.
*/
require_once 'libraries/database_interface.inc.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/controllers/TableRelationControllerTest.php
View File

@ -13,7 +13,6 @@ use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Tests\Stubs\Response as ResponseStub;
use PhpMyAdmin\Theme;
require_once 'libraries/database_interface.inc.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/controllers/TableStructureControllerTest.php
View File

@ -15,7 +15,6 @@ use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Tests\Stubs\Response as ResponseStub;
use PhpMyAdmin\Theme;
require_once 'libraries/database_interface.inc.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/dbi/DbiMysqlTest.php
View File

@ -13,7 +13,6 @@ use PhpMyAdmin\Dbi\DbiMysql;
require_once 'test/PMATestCase.php';
require_once 'libraries/database_interface.inc.php';
/**
* Tests for PhpMyAdmin\Dbi\DbiMysql class

1
test/classes/dbi/DbiMysqliTest.php
View File

@ -11,7 +11,6 @@
use PhpMyAdmin\Dbi\DbiMysqli;
use PhpMyAdmin\Theme;
require_once 'libraries/database_interface.inc.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/engines/BdbTest.php
View File

@ -11,7 +11,6 @@
use PhpMyAdmin\Engines\Bdb;
require_once 'libraries/database_interface.inc.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/engines/BinlogTest.php
View File

@ -11,7 +11,6 @@
use PhpMyAdmin\Engines\Binlog;
require_once 'libraries/database_interface.inc.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/engines/InnodbTest.php
View File

@ -11,7 +11,6 @@
use PhpMyAdmin\Engines\Innodb;
require_once 'libraries/database_interface.inc.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/engines/MemoryTest.php
View File

@ -11,7 +11,6 @@
use PhpMyAdmin\Engines\Memory;
require_once 'libraries/database_interface.inc.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/engines/MrgMyisamTest.php
View File

@ -11,7 +11,6 @@
use PhpMyAdmin\Engines\MrgMyisam;
require_once 'libraries/database_interface.inc.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/engines/MyisamTest.php
View File

@ -11,7 +11,6 @@
use PhpMyAdmin\Engines\Myisam;
require_once 'libraries/database_interface.inc.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/engines/NdbclusterTest.php
View File

@ -11,7 +11,6 @@
use PhpMyAdmin\Engines\Ndbcluster;
require_once 'libraries/database_interface.inc.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/engines/PbxtTest.php
View File

@ -13,7 +13,6 @@
use PhpMyAdmin\Core;
use PhpMyAdmin\Engines\Pbxt;
require_once 'libraries/database_interface.inc.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/navigation/NavigationTest.php
View File

@ -9,7 +9,6 @@
use PhpMyAdmin\Theme;
use PhpMyAdmin\Url;
require_once 'libraries/database_interface.inc.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/navigation/NavigationTreeTest.php
View File

@ -16,7 +16,6 @@ use PhpMyAdmin\Theme;
$GLOBALS['server'] = 0;
$GLOBALS['cfg']['Server']['DisableIS'] = false;
require_once 'libraries/database_interface.inc.php';
require_once 'libraries/check_user_privileges.lib.php';
require_once 'test/PMATestCase.php';

1
test/classes/navigation/NodeTest.php
View File

@ -10,7 +10,6 @@ use PhpMyAdmin\Navigation\NodeFactory;
use PhpMyAdmin\Navigation\Nodes\Node;
use PhpMyAdmin\Theme;
require_once 'libraries/database_interface.inc.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/plugin/auth/AuthenticationCookieTest.php
View File

@ -12,7 +12,6 @@ use PhpMyAdmin\Theme;
$GLOBALS['PMA_Config'] = new PhpMyAdmin\Config();
require_once 'libraries/config.default.php';
require_once 'libraries/database_interface.inc.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/plugin/export/ExportYamlTest.php
View File

@ -8,7 +8,6 @@
use PhpMyAdmin\Plugins\Export\ExportYaml;
require_once 'libraries/config.default.php';
require_once 'libraries/database_interface.inc.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/plugin/import/ImportCsvTest.php
View File

@ -18,7 +18,6 @@ $GLOBALS['server'] = 0;
/*
* Include to test.
*/
require_once 'libraries/database_interface.inc.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/plugin/import/ImportLdiTest.php
View File

@ -18,7 +18,6 @@ $GLOBALS['plugin_param'] = "table";
/*
* Include to test.
*/
require_once 'libraries/database_interface.inc.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/plugin/import/ImportMediawikiTest.php
View File

@ -16,7 +16,6 @@ $GLOBALS['server'] = 0;
/*
* Include to test.
*/
require_once 'libraries/database_interface.inc.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/plugin/import/ImportOdsTest.php
View File

@ -17,7 +17,6 @@ $GLOBALS['server'] = 0;
/*
* Include to test.
*/
require_once 'libraries/database_interface.inc.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/plugin/import/ImportShpTest.php
View File

@ -14,7 +14,6 @@ use PhpMyAdmin\File;
$GLOBALS['server'] = 0;
require_once 'libraries/database_interface.inc.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/plugin/import/ImportSqlTest.php
View File

@ -17,7 +17,6 @@ $GLOBALS['server'] = 0;
/*
* Include to test.
*/
require_once 'libraries/database_interface.inc.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/plugin/import/ImportXmlTest.php
View File

@ -17,7 +17,6 @@ $GLOBALS['server'] = 0;
/*
* Include to test.
*/
require_once 'libraries/database_interface.inc.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/schema/DiaRelationSchemaTest.php
View File

@ -11,7 +11,6 @@
use PhpMyAdmin\Plugins\Schema\Dia\DiaRelationSchema;
use PhpMyAdmin\Relation;
require_once 'libraries/database_interface.inc.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/schema/EpsRelationSchemaTest.php
View File

@ -11,7 +11,6 @@
use PhpMyAdmin\Plugins\Schema\Eps\EpsRelationSchema;
use PhpMyAdmin\Relation;
require_once 'libraries/database_interface.inc.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/schema/ExportRelationSchemaTest.php
View File

@ -11,7 +11,6 @@
use PhpMyAdmin\Plugins\Schema\ExportRelationSchema;
require_once 'libraries/database_interface.inc.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/schema/PdfRelationSchemaTest.php
View File

@ -11,7 +11,6 @@
use PhpMyAdmin\Plugins\Schema\Pdf\PdfRelationSchema;
use PhpMyAdmin\Relation;
require_once 'libraries/database_interface.inc.php';
require_once 'test/PMATestCase.php';
/**

1
test/classes/schema/SvgRelationSchemaTest.php
View File

@ -11,7 +11,6 @@
use PhpMyAdmin\Plugins\Schema\Svg\SvgRelationSchema;
use PhpMyAdmin\Relation;
require_once 'libraries/database_interface.inc.php';
require_once 'test/PMATestCase.php';
/**

1
test/libraries/PMA_PMD_common_test.php
View File

@ -5,7 +5,6 @@
* @package PhpMyAdmin-test
*/
require_once 'libraries/database_interface.inc.php';
/**
* Tests for libraries/pmd_common.php

1
test/libraries/PMA_check_user_privileges_test.php
View File

@ -12,7 +12,6 @@
$GLOBALS['server'] = 1;
$GLOBALS['cfg']['Server']['DisableIS'] = false;
require_once 'libraries/database_interface.inc.php';
require_once 'libraries/check_user_privileges.lib.php';
/**

1
test/libraries/PMA_display_change_password_test.php
View File

@ -15,7 +15,6 @@ use PhpMyAdmin\Url;
require_once 'libraries/display_change_password.lib.php';
require_once 'libraries/database_interface.inc.php';
require_once 'libraries/config.default.php';

1
test/libraries/PMA_display_create_table_test.php
View File

@ -16,7 +16,6 @@ $GLOBALS['cfg']['DBG']['sql'] = false;
* Include to test.
*/
require_once 'libraries/database_interface.inc.php';
require_once 'libraries/display_create_table.lib.php';
/**

1
test/libraries/PMA_ip_allow_deny_test.php
View File

@ -8,7 +8,6 @@
use PhpMyAdmin\Core;
require_once 'libraries/database_interface.inc.php';
require_once 'libraries/ip_allow_deny.lib.php';
/**

1
test/libraries/PMA_mult_submits_test.php
View File

@ -13,7 +13,6 @@ use PhpMyAdmin\Theme;
use PhpMyAdmin\Url;
require_once 'libraries/mult_submits.lib.php';
require_once 'libraries/database_interface.inc.php';
require_once 'libraries/relation_cleanup.lib.php';
/**

1
test/libraries/PMA_relation_cleanup_test.php
View File

@ -12,7 +12,6 @@ use PhpMyAdmin\Relation;
/*
* Include to test.
*/
require_once 'libraries/database_interface.inc.php';
require_once 'libraries/relation_cleanup.lib.php';
/**

1
test/libraries/PMA_select_server_test.php
View File

@ -14,7 +14,6 @@ use PhpMyAdmin\Theme;
require_once 'libraries/select_server.lib.php';
require_once 'libraries/database_interface.inc.php';
/**
* PMA_SelectServer_Test class

1
test/libraries/PMA_server_replication_test.php
View File

@ -12,7 +12,6 @@
use PhpMyAdmin\Theme;
require_once 'libraries/database_interface.inc.php';
require_once 'libraries/replication.inc.php';
require_once 'libraries/replication_gui.lib.php';

1
test/libraries/PMA_server_status_advisor_test.php
View File

@ -11,7 +11,6 @@ use PhpMyAdmin\ServerStatusData;
use PhpMyAdmin\Theme;
require_once 'libraries/server_status_advisor.lib.php';
require_once 'libraries/database_interface.inc.php';
/**
* class PMA_ServerStatusAdvisor_Test

1
test/libraries/PMA_server_status_monitor_test.php
View File

@ -11,7 +11,6 @@ use PhpMyAdmin\ServerStatusData;
use PhpMyAdmin\Theme;
require_once 'libraries/server_status_monitor.lib.php';
require_once 'libraries/database_interface.inc.php';
/**
* class PMA_ServerStatusMonitor_Test

1
test/libraries/PMA_server_status_processes_test.php
View File

@ -12,7 +12,6 @@ use PhpMyAdmin\Url;
require_once 'libraries/server_status_processes.lib.php';
require_once 'libraries/database_interface.inc.php';
/**
* class PMA_ServerStatusProcesses_Test

1
test/libraries/PMA_server_status_queries_test.php
View File

@ -11,7 +11,6 @@ use PhpMyAdmin\ServerStatusData;
use PhpMyAdmin\Theme;
require_once 'libraries/server_status_queries.lib.php';
require_once 'libraries/database_interface.inc.php';
/**
* class PMA_ServerStatusVariables_Test

1
test/libraries/PMA_server_status_test.php
View File

@ -11,7 +11,6 @@ use PhpMyAdmin\ServerStatusData;
use PhpMyAdmin\Theme;
require_once 'libraries/server_status.lib.php';
require_once 'libraries/database_interface.inc.php';
/**
* class PMA_ServerStatus_Test

1
test/libraries/PMA_server_status_variables_test.php
View File

@ -11,7 +11,6 @@ use PhpMyAdmin\ServerStatusData;
use PhpMyAdmin\Theme;
require_once 'libraries/server_status_variables.lib.php';
require_once 'libraries/database_interface.inc.php';
/**
* class PMA_ServerStatusVariables_Test

1
test/libraries/PMA_server_user_groups_test.php
View File

@ -12,7 +12,6 @@ use PhpMyAdmin\Url;
/*
* Include to test.
*/
require_once 'libraries/database_interface.inc.php';
require_once 'libraries/server_user_groups.lib.php';
/**

1
test/libraries/PMA_sql_query_form_test.php
View File

@ -17,7 +17,6 @@ $GLOBALS['server'] = 0;
/*
* Include to test.
*/
require_once 'libraries/database_interface.inc.php';
require_once 'libraries/sql_query_form.lib.php';
/**

1
test/libraries/database_interface_test.php
View File

@ -9,7 +9,6 @@
/*
* Include to test.
*/
require_once 'libraries/database_interface.inc.php';
/**
* Tests basic functionality of dummy dbi driver

1
test/libraries/rte/PMA_RTN_getEditorForm_test.php
View File

@ -13,7 +13,6 @@ use PhpMyAdmin\Response;
$GLOBALS['server'] = 0;
require_once 'libraries/database_interface.inc.php';
/*
* Include to test.
*/

1
test/libraries/rte/PMA_RTN_getExecuteForm_test.php
View File

@ -11,7 +11,6 @@ use PhpMyAdmin\Response;
$GLOBALS['server'] = 0;
require_once 'libraries/database_interface.inc.php';
/*
* Include to test.

1
test/libraries/rte/PMA_TRI_getEditorForm_test.php
View File

@ -7,7 +7,6 @@
*/
use PhpMyAdmin\Response;
require_once 'libraries/database_interface.inc.php';
/*
* Include to test.

1
test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php
View File

@ -19,7 +19,6 @@
* Include to test.
*/
require_once 'libraries/rte/rte_triggers.lib.php';
require_once 'libraries/database_interface.inc.php';
/**