From bc6486e2e0497f4ec6b04561dccd8a094f8e75c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 6 Sep 2017 14:17:45 +0200 Subject: [PATCH 1/3] Move mysqli flag description sot Dbi class MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- libraries/classes/Dbi/DbiMysqli.php | 18 +++++++++++++++++- libraries/database_interface.inc.php | 1 - libraries/dbi/dbi_mysqli.inc.php | 27 --------------------------- 3 files changed, 17 insertions(+), 29 deletions(-) delete mode 100644 libraries/dbi/dbi_mysqli.inc.php diff --git a/libraries/classes/Dbi/DbiMysqli.php b/libraries/classes/Dbi/DbiMysqli.php index 04b8e254f2..d152c27ef3 100644 --- a/libraries/classes/Dbi/DbiMysqli.php +++ b/libraries/classes/Dbi/DbiMysqli.php @@ -57,6 +57,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 +556,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; } diff --git a/libraries/database_interface.inc.php b/libraries/database_interface.inc.php index a34921eb12..de7d915582 100644 --- a/libraries/database_interface.inc.php +++ b/libraries/database_interface.inc.php @@ -79,7 +79,6 @@ if (defined('TESTSUITE')) { $extension = new DbiMysql(); break; case 'mysqli' : - include_once 'libraries/dbi/dbi_mysqli.inc.php'; $extension = new DbiMysqli(); break; } diff --git a/libraries/dbi/dbi_mysqli.inc.php b/libraries/dbi/dbi_mysqli.inc.php deleted file mode 100644 index 145f09ad05..0000000000 --- a/libraries/dbi/dbi_mysqli.inc.php +++ /dev/null @@ -1,27 +0,0 @@ - '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', -); From a82f8fc768f42ce5b35bb6a8dff3536ab32a2fb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 6 Sep 2017 14:26:39 +0200 Subject: [PATCH 2/3] Move databaase interface load to static method MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- libraries/classes/Controllers/Controller.php | 2 - libraries/classes/DatabaseInterface.php | 81 +++++++++++++++++ libraries/classes/SystemDatabase.php | 2 - libraries/common.inc.php | 2 +- libraries/database_interface.inc.php | 90 ------------------- setup/lib/common.inc.php | 1 - test/bootstrap-dist.php | 3 + test/classes/BookmarkTest.php | 1 - test/classes/CentralColumnsTest.php | 1 - test/classes/Database/DesignerTest.php | 1 - test/classes/DbQbeTest.php | 1 - test/classes/DbSearchTest.php | 1 - test/classes/Display/ExportTest.php | 1 - test/classes/HeaderTest.php | 1 - test/classes/ImportTest.php | 1 - test/classes/InsertEditTest.php | 1 - test/classes/MenuTest.php | 1 - test/classes/NormalizationTest.php | 1 - test/classes/OperationsTest.php | 1 - test/classes/RelationTest.php | 1 - test/classes/Server/PrivilegesTest.php | 1 - test/classes/ServerStatusDataTest.php | 1 - test/classes/StorageEngineTest.php | 1 - test/classes/TableTest.php | 1 - test/classes/TrackerTest.php | 1 - test/classes/TrackingTest.php | 1 - test/classes/TransformationsTest.php | 1 - .../DatabaseStructureControllerTest.php | 1 - .../ServerBinlogControllerTest.php | 1 - .../ServerCollationsControllerTest.php | 1 - .../ServerDatabasesControllerTest.php | 1 - .../ServerEnginesControllerTest.php | 1 - .../ServerPluginsControllerTest.php | 1 - .../ServerVariablesControllerTest.php | 1 - .../TableIndexesControllerTest.php | 1 - .../TableRelationControllerTest.php | 1 - .../TableStructureControllerTest.php | 1 - test/classes/dbi/DbiMysqlTest.php | 1 - test/classes/dbi/DbiMysqliTest.php | 1 - test/classes/engines/BdbTest.php | 1 - test/classes/engines/BinlogTest.php | 1 - test/classes/engines/InnodbTest.php | 1 - test/classes/engines/MemoryTest.php | 1 - test/classes/engines/MrgMyisamTest.php | 1 - test/classes/engines/MyisamTest.php | 1 - test/classes/engines/NdbclusterTest.php | 1 - test/classes/engines/PbxtTest.php | 1 - test/classes/navigation/NavigationTest.php | 1 - .../classes/navigation/NavigationTreeTest.php | 1 - test/classes/navigation/NodeTest.php | 1 - .../plugin/auth/AuthenticationCookieTest.php | 1 - test/classes/plugin/export/ExportYamlTest.php | 1 - test/classes/plugin/import/ImportCsvTest.php | 1 - test/classes/plugin/import/ImportLdiTest.php | 1 - .../plugin/import/ImportMediawikiTest.php | 1 - test/classes/plugin/import/ImportOdsTest.php | 1 - test/classes/plugin/import/ImportShpTest.php | 1 - test/classes/plugin/import/ImportSqlTest.php | 1 - test/classes/plugin/import/ImportXmlTest.php | 1 - test/classes/schema/DiaRelationSchemaTest.php | 1 - test/classes/schema/EpsRelationSchemaTest.php | 1 - .../schema/ExportRelationSchemaTest.php | 1 - test/classes/schema/PdfRelationSchemaTest.php | 1 - test/classes/schema/SvgRelationSchemaTest.php | 1 - test/libraries/PMA_PMD_common_test.php | 1 - .../PMA_check_user_privileges_test.php | 1 - .../PMA_display_change_password_test.php | 1 - .../PMA_display_create_table_test.php | 1 - test/libraries/PMA_ip_allow_deny_test.php | 1 - test/libraries/PMA_mult_submits_test.php | 1 - test/libraries/PMA_relation_cleanup_test.php | 1 - test/libraries/PMA_select_server_test.php | 1 - .../libraries/PMA_server_replication_test.php | 1 - .../PMA_server_status_advisor_test.php | 1 - .../PMA_server_status_monitor_test.php | 1 - .../PMA_server_status_processes_test.php | 1 - .../PMA_server_status_queries_test.php | 1 - test/libraries/PMA_server_status_test.php | 1 - .../PMA_server_status_variables_test.php | 1 - .../libraries/PMA_server_user_groups_test.php | 1 - test/libraries/PMA_sql_query_form_test.php | 1 - test/libraries/database_interface_test.php | 1 - .../rte/PMA_RTN_getEditorForm_test.php | 1 - .../rte/PMA_RTN_getExecuteForm_test.php | 1 - .../rte/PMA_TRI_getEditorForm_test.php | 1 - .../rte/PMA_TRI_getQueryFromRequest_test.php | 1 - 86 files changed, 85 insertions(+), 175 deletions(-) delete mode 100644 libraries/database_interface.inc.php diff --git a/libraries/classes/Controllers/Controller.php b/libraries/classes/Controllers/Controller.php index fb30c3ca8d..5a808eb804 100644 --- a/libraries/classes/Controllers/Controller.php +++ b/libraries/classes/Controllers/Controller.php @@ -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 * diff --git a/libraries/classes/DatabaseInterface.php b/libraries/classes/DatabaseInterface.php index 7f98e6c1f6..a37a860e6c 100644 --- a/libraries/classes/DatabaseInterface.php +++ b/libraries/classes/DatabaseInterface.php @@ -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'); + } } diff --git a/libraries/classes/SystemDatabase.php b/libraries/classes/SystemDatabase.php index 7d78fae457..faedb9d469 100644 --- a/libraries/classes/SystemDatabase.php +++ b/libraries/classes/SystemDatabase.php @@ -11,8 +11,6 @@ use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Relation; use PhpMyAdmin\Util; -require_once 'libraries/database_interface.inc.php'; - /** * Class SystemDatabase * diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 6a0abc20cb..750151df74 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -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 diff --git a/libraries/database_interface.inc.php b/libraries/database_interface.inc.php deleted file mode 100644 index de7d915582..0000000000 --- a/libraries/database_interface.inc.php +++ /dev/null @@ -1,90 +0,0 @@ -set('PMA_DatabaseInterface', $GLOBALS['dbi']); -$container->alias('dbi', 'PMA_DatabaseInterface'); diff --git a/setup/lib/common.inc.php b/setup/lib/common.inc.php index aa999b5adc..45fe35d9a9 100644 --- a/setup/lib/common.inc.php +++ b/setup/lib/common.inc.php @@ -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 diff --git a/test/bootstrap-dist.php b/test/bootstrap-dist.php index b67346b031..3d0528e07b 100644 --- a/test/bootstrap-dist.php +++ b/test/bootstrap-dist.php @@ -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))) { diff --git a/test/classes/BookmarkTest.php b/test/classes/BookmarkTest.php index 621f7c4e7c..8eece388ed 100644 --- a/test/classes/BookmarkTest.php +++ b/test/classes/BookmarkTest.php @@ -7,7 +7,6 @@ */ use PhpMyAdmin\Bookmark; -require_once 'libraries/database_interface.inc.php'; /** * Tests for Bookmark class diff --git a/test/classes/CentralColumnsTest.php b/test/classes/CentralColumnsTest.php index c099f8648c..7b4c740e91 100644 --- a/test/classes/CentralColumnsTest.php +++ b/test/classes/CentralColumnsTest.php @@ -15,7 +15,6 @@ use PhpMyAdmin\Util; $GLOBALS['server'] = 1; -require_once 'libraries/database_interface.inc.php'; /** * tests for PhpMyAdmin\CentralColumns diff --git a/test/classes/Database/DesignerTest.php b/test/classes/Database/DesignerTest.php index b57c657b06..eab496922b 100644 --- a/test/classes/Database/DesignerTest.php +++ b/test/classes/Database/DesignerTest.php @@ -12,7 +12,6 @@ use PhpMyAdmin\DatabaseInterface; /* * Include to test. */ -require_once 'libraries/database_interface.inc.php'; require_once 'libraries/plugin_interface.lib.php'; /** diff --git a/test/classes/DbQbeTest.php b/test/classes/DbQbeTest.php index 6580e7f934..b61cd5d3bb 100644 --- a/test/classes/DbQbeTest.php +++ b/test/classes/DbQbeTest.php @@ -9,7 +9,6 @@ * Include to test. */ -require_once 'libraries/database_interface.inc.php'; require_once 'test/PMATestCase.php'; use PhpMyAdmin\DbQbe; diff --git a/test/classes/DbSearchTest.php b/test/classes/DbSearchTest.php index de573f0bc5..5f84259d2b 100644 --- a/test/classes/DbSearchTest.php +++ b/test/classes/DbSearchTest.php @@ -9,7 +9,6 @@ * Include to test. */ -require_once 'libraries/database_interface.inc.php'; require_once 'test/PMATestCase.php'; use PhpMyAdmin\DbSearch; diff --git a/test/classes/Display/ExportTest.php b/test/classes/Display/ExportTest.php index 49e58807e3..b737e4e5e9 100644 --- a/test/classes/Display/ExportTest.php +++ b/test/classes/Display/ExportTest.php @@ -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'; /** diff --git a/test/classes/HeaderTest.php b/test/classes/HeaderTest.php index 39c556879a..ce328d509f 100644 --- a/test/classes/HeaderTest.php +++ b/test/classes/HeaderTest.php @@ -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'; /** diff --git a/test/classes/ImportTest.php b/test/classes/ImportTest.php index eb91f4919d..c060c08e92 100644 --- a/test/classes/ImportTest.php +++ b/test/classes/ImportTest.php @@ -21,7 +21,6 @@ $GLOBALS['server'] = 0; /* * Include to test. */ -require_once 'libraries/database_interface.inc.php'; /** * Tests for import functions diff --git a/test/classes/InsertEditTest.php b/test/classes/InsertEditTest.php index a018eeac6e..eb6575c813 100644 --- a/test/classes/InsertEditTest.php +++ b/test/classes/InsertEditTest.php @@ -19,7 +19,6 @@ use PhpMyAdmin\TypesMySQL; use ReflectionProperty; use stdClass; -require_once 'libraries/database_interface.inc.php'; /** * Tests for PhpMyAdmin\InsertEdit diff --git a/test/classes/MenuTest.php b/test/classes/MenuTest.php index 637f558a9f..0729c80cc0 100644 --- a/test/classes/MenuTest.php +++ b/test/classes/MenuTest.php @@ -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'; /** diff --git a/test/classes/NormalizationTest.php b/test/classes/NormalizationTest.php index 5bf5960c3f..d0b0489cca 100644 --- a/test/classes/NormalizationTest.php +++ b/test/classes/NormalizationTest.php @@ -15,7 +15,6 @@ use stdClass; $GLOBALS['server'] = 1; -require_once 'libraries/database_interface.inc.php'; /** * tests for PhpMyAdmin\Normalization diff --git a/test/classes/OperationsTest.php b/test/classes/OperationsTest.php index 2fd62bed1b..419d5d2c72 100644 --- a/test/classes/OperationsTest.php +++ b/test/classes/OperationsTest.php @@ -10,7 +10,6 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\Operations; use PhpMyAdmin\Theme; -require_once 'libraries/database_interface.inc.php'; /** * tests for operations diff --git a/test/classes/RelationTest.php b/test/classes/RelationTest.php index 0546948cb0..6cf5809eb8 100644 --- a/test/classes/RelationTest.php +++ b/test/classes/RelationTest.php @@ -10,7 +10,6 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\Relation; use PhpMyAdmin\Theme; -require_once 'libraries/database_interface.inc.php'; /** * Tests for PhpMyAdmin\Relation diff --git a/test/classes/Server/PrivilegesTest.php b/test/classes/Server/PrivilegesTest.php index db013b0d46..e06fc0107e 100644 --- a/test/classes/Server/PrivilegesTest.php +++ b/test/classes/Server/PrivilegesTest.php @@ -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'; /** diff --git a/test/classes/ServerStatusDataTest.php b/test/classes/ServerStatusDataTest.php index dbdcc0daf1..6d611e57f4 100644 --- a/test/classes/ServerStatusDataTest.php +++ b/test/classes/ServerStatusDataTest.php @@ -12,7 +12,6 @@ use PhpMyAdmin\Core; use PhpMyAdmin\ServerStatusData; -require_once 'libraries/database_interface.inc.php'; require_once 'test/PMATestCase.php'; /** diff --git a/test/classes/StorageEngineTest.php b/test/classes/StorageEngineTest.php index 2a001e3bbd..108232b362 100644 --- a/test/classes/StorageEngineTest.php +++ b/test/classes/StorageEngineTest.php @@ -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 diff --git a/test/classes/TableTest.php b/test/classes/TableTest.php index 2a72363da0..132a96490e 100644 --- a/test/classes/TableTest.php +++ b/test/classes/TableTest.php @@ -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'; /** diff --git a/test/classes/TrackerTest.php b/test/classes/TrackerTest.php index da260ef2f8..bebcdc9823 100644 --- a/test/classes/TrackerTest.php +++ b/test/classes/TrackerTest.php @@ -12,7 +12,6 @@ use PhpMyAdmin\Tracker; use PhpMyAdmin\Util; -require_once 'libraries/database_interface.inc.php'; require_once 'test/PMATestCase.php'; /** diff --git a/test/classes/TrackingTest.php b/test/classes/TrackingTest.php index fbe0a7fc1e..3d550c3802 100644 --- a/test/classes/TrackingTest.php +++ b/test/classes/TrackingTest.php @@ -11,7 +11,6 @@ use PhpMyAdmin\Theme; use PhpMyAdmin\Tracking; use PhpMyAdmin\Url; -require_once 'libraries/database_interface.inc.php'; /** * Tests for PhpMyAdmin\Tracking diff --git a/test/classes/TransformationsTest.php b/test/classes/TransformationsTest.php index ea35c1947f..0fd79e033f 100644 --- a/test/classes/TransformationsTest.php +++ b/test/classes/TransformationsTest.php @@ -12,7 +12,6 @@ use PhpMyAdmin\Transformations; /* * Include to test. */ -require_once 'libraries/database_interface.inc.php'; /** * tests for transformation wrappers diff --git a/test/classes/controllers/DatabaseStructureControllerTest.php b/test/classes/controllers/DatabaseStructureControllerTest.php index efb0a12946..d68aff0a01 100644 --- a/test/classes/controllers/DatabaseStructureControllerTest.php +++ b/test/classes/controllers/DatabaseStructureControllerTest.php @@ -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 diff --git a/test/classes/controllers/ServerBinlogControllerTest.php b/test/classes/controllers/ServerBinlogControllerTest.php index a76d1f2832..0b608e31e4 100644 --- a/test/classes/controllers/ServerBinlogControllerTest.php +++ b/test/classes/controllers/ServerBinlogControllerTest.php @@ -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 diff --git a/test/classes/controllers/ServerCollationsControllerTest.php b/test/classes/controllers/ServerCollationsControllerTest.php index e79219d678..6a826064a1 100644 --- a/test/classes/controllers/ServerCollationsControllerTest.php +++ b/test/classes/controllers/ServerCollationsControllerTest.php @@ -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'; diff --git a/test/classes/controllers/ServerDatabasesControllerTest.php b/test/classes/controllers/ServerDatabasesControllerTest.php index 45639b67a2..24351ef369 100644 --- a/test/classes/controllers/ServerDatabasesControllerTest.php +++ b/test/classes/controllers/ServerDatabasesControllerTest.php @@ -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'; /** diff --git a/test/classes/controllers/ServerEnginesControllerTest.php b/test/classes/controllers/ServerEnginesControllerTest.php index 60241763de..14cd674b61 100644 --- a/test/classes/controllers/ServerEnginesControllerTest.php +++ b/test/classes/controllers/ServerEnginesControllerTest.php @@ -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'; diff --git a/test/classes/controllers/ServerPluginsControllerTest.php b/test/classes/controllers/ServerPluginsControllerTest.php index 07c8b157ea..c4b0c29928 100644 --- a/test/classes/controllers/ServerPluginsControllerTest.php +++ b/test/classes/controllers/ServerPluginsControllerTest.php @@ -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'; /** diff --git a/test/classes/controllers/ServerVariablesControllerTest.php b/test/classes/controllers/ServerVariablesControllerTest.php index 0b4f31c080..f3e32507ef 100644 --- a/test/classes/controllers/ServerVariablesControllerTest.php +++ b/test/classes/controllers/ServerVariablesControllerTest.php @@ -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'; /** diff --git a/test/classes/controllers/TableIndexesControllerTest.php b/test/classes/controllers/TableIndexesControllerTest.php index 1b4fd0f2f9..90a9aae9d4 100644 --- a/test/classes/controllers/TableIndexesControllerTest.php +++ b/test/classes/controllers/TableIndexesControllerTest.php @@ -16,7 +16,6 @@ use PhpMyAdmin\Url; /* * Include to test. */ -require_once 'libraries/database_interface.inc.php'; require_once 'test/PMATestCase.php'; /** diff --git a/test/classes/controllers/TableRelationControllerTest.php b/test/classes/controllers/TableRelationControllerTest.php index 4dd4fcd54d..0720c11417 100644 --- a/test/classes/controllers/TableRelationControllerTest.php +++ b/test/classes/controllers/TableRelationControllerTest.php @@ -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'; /** diff --git a/test/classes/controllers/TableStructureControllerTest.php b/test/classes/controllers/TableStructureControllerTest.php index 9694809ccc..6e9ed8170d 100644 --- a/test/classes/controllers/TableStructureControllerTest.php +++ b/test/classes/controllers/TableStructureControllerTest.php @@ -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'; /** diff --git a/test/classes/dbi/DbiMysqlTest.php b/test/classes/dbi/DbiMysqlTest.php index 9148de4aea..53f6a9b529 100644 --- a/test/classes/dbi/DbiMysqlTest.php +++ b/test/classes/dbi/DbiMysqlTest.php @@ -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 diff --git a/test/classes/dbi/DbiMysqliTest.php b/test/classes/dbi/DbiMysqliTest.php index 5446ab92fd..2045ba808b 100644 --- a/test/classes/dbi/DbiMysqliTest.php +++ b/test/classes/dbi/DbiMysqliTest.php @@ -11,7 +11,6 @@ use PhpMyAdmin\Dbi\DbiMysqli; use PhpMyAdmin\Theme; -require_once 'libraries/database_interface.inc.php'; require_once 'test/PMATestCase.php'; /** diff --git a/test/classes/engines/BdbTest.php b/test/classes/engines/BdbTest.php index de7bbfff35..e6493ed0ae 100644 --- a/test/classes/engines/BdbTest.php +++ b/test/classes/engines/BdbTest.php @@ -11,7 +11,6 @@ use PhpMyAdmin\Engines\Bdb; -require_once 'libraries/database_interface.inc.php'; require_once 'test/PMATestCase.php'; /** diff --git a/test/classes/engines/BinlogTest.php b/test/classes/engines/BinlogTest.php index f2dcc761aa..aef7ad3272 100644 --- a/test/classes/engines/BinlogTest.php +++ b/test/classes/engines/BinlogTest.php @@ -11,7 +11,6 @@ use PhpMyAdmin\Engines\Binlog; -require_once 'libraries/database_interface.inc.php'; require_once 'test/PMATestCase.php'; /** diff --git a/test/classes/engines/InnodbTest.php b/test/classes/engines/InnodbTest.php index ec357ce5a5..b25fa26ffa 100644 --- a/test/classes/engines/InnodbTest.php +++ b/test/classes/engines/InnodbTest.php @@ -11,7 +11,6 @@ use PhpMyAdmin\Engines\Innodb; -require_once 'libraries/database_interface.inc.php'; require_once 'test/PMATestCase.php'; /** diff --git a/test/classes/engines/MemoryTest.php b/test/classes/engines/MemoryTest.php index e294235957..89050b9c16 100644 --- a/test/classes/engines/MemoryTest.php +++ b/test/classes/engines/MemoryTest.php @@ -11,7 +11,6 @@ use PhpMyAdmin\Engines\Memory; -require_once 'libraries/database_interface.inc.php'; require_once 'test/PMATestCase.php'; /** diff --git a/test/classes/engines/MrgMyisamTest.php b/test/classes/engines/MrgMyisamTest.php index 2e0566ee5e..63f6826986 100644 --- a/test/classes/engines/MrgMyisamTest.php +++ b/test/classes/engines/MrgMyisamTest.php @@ -11,7 +11,6 @@ use PhpMyAdmin\Engines\MrgMyisam; -require_once 'libraries/database_interface.inc.php'; require_once 'test/PMATestCase.php'; /** diff --git a/test/classes/engines/MyisamTest.php b/test/classes/engines/MyisamTest.php index 4b263c438b..3aadb3e95d 100644 --- a/test/classes/engines/MyisamTest.php +++ b/test/classes/engines/MyisamTest.php @@ -11,7 +11,6 @@ use PhpMyAdmin\Engines\Myisam; -require_once 'libraries/database_interface.inc.php'; require_once 'test/PMATestCase.php'; /** diff --git a/test/classes/engines/NdbclusterTest.php b/test/classes/engines/NdbclusterTest.php index ebc81dea3f..bdd9af4e3a 100644 --- a/test/classes/engines/NdbclusterTest.php +++ b/test/classes/engines/NdbclusterTest.php @@ -11,7 +11,6 @@ use PhpMyAdmin\Engines\Ndbcluster; -require_once 'libraries/database_interface.inc.php'; require_once 'test/PMATestCase.php'; /** diff --git a/test/classes/engines/PbxtTest.php b/test/classes/engines/PbxtTest.php index 29d057bc48..0c3314f29c 100644 --- a/test/classes/engines/PbxtTest.php +++ b/test/classes/engines/PbxtTest.php @@ -13,7 +13,6 @@ use PhpMyAdmin\Core; use PhpMyAdmin\Engines\Pbxt; -require_once 'libraries/database_interface.inc.php'; require_once 'test/PMATestCase.php'; /** diff --git a/test/classes/navigation/NavigationTest.php b/test/classes/navigation/NavigationTest.php index fce13f76f2..f42e2ffe06 100644 --- a/test/classes/navigation/NavigationTest.php +++ b/test/classes/navigation/NavigationTest.php @@ -9,7 +9,6 @@ use PhpMyAdmin\Theme; use PhpMyAdmin\Url; -require_once 'libraries/database_interface.inc.php'; require_once 'test/PMATestCase.php'; /** diff --git a/test/classes/navigation/NavigationTreeTest.php b/test/classes/navigation/NavigationTreeTest.php index 3de803fb09..f93862a642 100644 --- a/test/classes/navigation/NavigationTreeTest.php +++ b/test/classes/navigation/NavigationTreeTest.php @@ -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'; diff --git a/test/classes/navigation/NodeTest.php b/test/classes/navigation/NodeTest.php index 67bc2f64eb..26ef08da6f 100644 --- a/test/classes/navigation/NodeTest.php +++ b/test/classes/navigation/NodeTest.php @@ -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'; /** diff --git a/test/classes/plugin/auth/AuthenticationCookieTest.php b/test/classes/plugin/auth/AuthenticationCookieTest.php index 8783bef005..64adcaa860 100644 --- a/test/classes/plugin/auth/AuthenticationCookieTest.php +++ b/test/classes/plugin/auth/AuthenticationCookieTest.php @@ -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'; /** diff --git a/test/classes/plugin/export/ExportYamlTest.php b/test/classes/plugin/export/ExportYamlTest.php index e68bd83fed..224ff3890c 100644 --- a/test/classes/plugin/export/ExportYamlTest.php +++ b/test/classes/plugin/export/ExportYamlTest.php @@ -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'; /** diff --git a/test/classes/plugin/import/ImportCsvTest.php b/test/classes/plugin/import/ImportCsvTest.php index 7135d9a343..a428a8bd11 100644 --- a/test/classes/plugin/import/ImportCsvTest.php +++ b/test/classes/plugin/import/ImportCsvTest.php @@ -18,7 +18,6 @@ $GLOBALS['server'] = 0; /* * Include to test. */ -require_once 'libraries/database_interface.inc.php'; require_once 'test/PMATestCase.php'; /** diff --git a/test/classes/plugin/import/ImportLdiTest.php b/test/classes/plugin/import/ImportLdiTest.php index 11d791618b..bce0808553 100644 --- a/test/classes/plugin/import/ImportLdiTest.php +++ b/test/classes/plugin/import/ImportLdiTest.php @@ -18,7 +18,6 @@ $GLOBALS['plugin_param'] = "table"; /* * Include to test. */ -require_once 'libraries/database_interface.inc.php'; require_once 'test/PMATestCase.php'; /** diff --git a/test/classes/plugin/import/ImportMediawikiTest.php b/test/classes/plugin/import/ImportMediawikiTest.php index ccdd70075e..1bfc2519b6 100644 --- a/test/classes/plugin/import/ImportMediawikiTest.php +++ b/test/classes/plugin/import/ImportMediawikiTest.php @@ -16,7 +16,6 @@ $GLOBALS['server'] = 0; /* * Include to test. */ -require_once 'libraries/database_interface.inc.php'; require_once 'test/PMATestCase.php'; /** diff --git a/test/classes/plugin/import/ImportOdsTest.php b/test/classes/plugin/import/ImportOdsTest.php index 18e730746f..6fc65e4882 100644 --- a/test/classes/plugin/import/ImportOdsTest.php +++ b/test/classes/plugin/import/ImportOdsTest.php @@ -17,7 +17,6 @@ $GLOBALS['server'] = 0; /* * Include to test. */ -require_once 'libraries/database_interface.inc.php'; require_once 'test/PMATestCase.php'; /** diff --git a/test/classes/plugin/import/ImportShpTest.php b/test/classes/plugin/import/ImportShpTest.php index 019e933d0d..240822185e 100644 --- a/test/classes/plugin/import/ImportShpTest.php +++ b/test/classes/plugin/import/ImportShpTest.php @@ -14,7 +14,6 @@ use PhpMyAdmin\File; $GLOBALS['server'] = 0; -require_once 'libraries/database_interface.inc.php'; require_once 'test/PMATestCase.php'; /** diff --git a/test/classes/plugin/import/ImportSqlTest.php b/test/classes/plugin/import/ImportSqlTest.php index cadd1ea11b..82b32cb366 100644 --- a/test/classes/plugin/import/ImportSqlTest.php +++ b/test/classes/plugin/import/ImportSqlTest.php @@ -17,7 +17,6 @@ $GLOBALS['server'] = 0; /* * Include to test. */ -require_once 'libraries/database_interface.inc.php'; require_once 'test/PMATestCase.php'; /** diff --git a/test/classes/plugin/import/ImportXmlTest.php b/test/classes/plugin/import/ImportXmlTest.php index dac5013494..0f97425817 100644 --- a/test/classes/plugin/import/ImportXmlTest.php +++ b/test/classes/plugin/import/ImportXmlTest.php @@ -17,7 +17,6 @@ $GLOBALS['server'] = 0; /* * Include to test. */ -require_once 'libraries/database_interface.inc.php'; require_once 'test/PMATestCase.php'; /** diff --git a/test/classes/schema/DiaRelationSchemaTest.php b/test/classes/schema/DiaRelationSchemaTest.php index aa15cc2e63..18114be587 100644 --- a/test/classes/schema/DiaRelationSchemaTest.php +++ b/test/classes/schema/DiaRelationSchemaTest.php @@ -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'; /** diff --git a/test/classes/schema/EpsRelationSchemaTest.php b/test/classes/schema/EpsRelationSchemaTest.php index 6b27d7babb..d9c6454a7a 100644 --- a/test/classes/schema/EpsRelationSchemaTest.php +++ b/test/classes/schema/EpsRelationSchemaTest.php @@ -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'; /** diff --git a/test/classes/schema/ExportRelationSchemaTest.php b/test/classes/schema/ExportRelationSchemaTest.php index d48adbb17a..cdf64a1243 100644 --- a/test/classes/schema/ExportRelationSchemaTest.php +++ b/test/classes/schema/ExportRelationSchemaTest.php @@ -11,7 +11,6 @@ use PhpMyAdmin\Plugins\Schema\ExportRelationSchema; -require_once 'libraries/database_interface.inc.php'; require_once 'test/PMATestCase.php'; /** diff --git a/test/classes/schema/PdfRelationSchemaTest.php b/test/classes/schema/PdfRelationSchemaTest.php index 81c3d0ea33..d55719ddc8 100644 --- a/test/classes/schema/PdfRelationSchemaTest.php +++ b/test/classes/schema/PdfRelationSchemaTest.php @@ -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'; /** diff --git a/test/classes/schema/SvgRelationSchemaTest.php b/test/classes/schema/SvgRelationSchemaTest.php index 5887a3667d..9e4ddf0a0f 100644 --- a/test/classes/schema/SvgRelationSchemaTest.php +++ b/test/classes/schema/SvgRelationSchemaTest.php @@ -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'; /** diff --git a/test/libraries/PMA_PMD_common_test.php b/test/libraries/PMA_PMD_common_test.php index 08ca8d3054..0a6fac8dbd 100644 --- a/test/libraries/PMA_PMD_common_test.php +++ b/test/libraries/PMA_PMD_common_test.php @@ -5,7 +5,6 @@ * @package PhpMyAdmin-test */ -require_once 'libraries/database_interface.inc.php'; /** * Tests for libraries/pmd_common.php diff --git a/test/libraries/PMA_check_user_privileges_test.php b/test/libraries/PMA_check_user_privileges_test.php index 589e8896cf..0c6d827ce8 100644 --- a/test/libraries/PMA_check_user_privileges_test.php +++ b/test/libraries/PMA_check_user_privileges_test.php @@ -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'; /** diff --git a/test/libraries/PMA_display_change_password_test.php b/test/libraries/PMA_display_change_password_test.php index f9afd2844b..1881ed3749 100644 --- a/test/libraries/PMA_display_change_password_test.php +++ b/test/libraries/PMA_display_change_password_test.php @@ -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'; diff --git a/test/libraries/PMA_display_create_table_test.php b/test/libraries/PMA_display_create_table_test.php index 0c09fed856..39b2b4d540 100644 --- a/test/libraries/PMA_display_create_table_test.php +++ b/test/libraries/PMA_display_create_table_test.php @@ -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'; /** diff --git a/test/libraries/PMA_ip_allow_deny_test.php b/test/libraries/PMA_ip_allow_deny_test.php index 5af8a18dfd..51dcdc498f 100644 --- a/test/libraries/PMA_ip_allow_deny_test.php +++ b/test/libraries/PMA_ip_allow_deny_test.php @@ -8,7 +8,6 @@ use PhpMyAdmin\Core; -require_once 'libraries/database_interface.inc.php'; require_once 'libraries/ip_allow_deny.lib.php'; /** diff --git a/test/libraries/PMA_mult_submits_test.php b/test/libraries/PMA_mult_submits_test.php index 743a6e5a6c..b80b2fd243 100644 --- a/test/libraries/PMA_mult_submits_test.php +++ b/test/libraries/PMA_mult_submits_test.php @@ -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'; /** diff --git a/test/libraries/PMA_relation_cleanup_test.php b/test/libraries/PMA_relation_cleanup_test.php index 6c2681ccb3..2aa2d6cbb3 100644 --- a/test/libraries/PMA_relation_cleanup_test.php +++ b/test/libraries/PMA_relation_cleanup_test.php @@ -12,7 +12,6 @@ use PhpMyAdmin\Relation; /* * Include to test. */ -require_once 'libraries/database_interface.inc.php'; require_once 'libraries/relation_cleanup.lib.php'; /** diff --git a/test/libraries/PMA_select_server_test.php b/test/libraries/PMA_select_server_test.php index 7bfce396de..733b336a70 100644 --- a/test/libraries/PMA_select_server_test.php +++ b/test/libraries/PMA_select_server_test.php @@ -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 diff --git a/test/libraries/PMA_server_replication_test.php b/test/libraries/PMA_server_replication_test.php index 6b35628c6f..7daa47de91 100644 --- a/test/libraries/PMA_server_replication_test.php +++ b/test/libraries/PMA_server_replication_test.php @@ -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'; diff --git a/test/libraries/PMA_server_status_advisor_test.php b/test/libraries/PMA_server_status_advisor_test.php index 30451290ee..455f90f9b4 100644 --- a/test/libraries/PMA_server_status_advisor_test.php +++ b/test/libraries/PMA_server_status_advisor_test.php @@ -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 diff --git a/test/libraries/PMA_server_status_monitor_test.php b/test/libraries/PMA_server_status_monitor_test.php index 2de34f1fed..fc55bb61bd 100644 --- a/test/libraries/PMA_server_status_monitor_test.php +++ b/test/libraries/PMA_server_status_monitor_test.php @@ -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 diff --git a/test/libraries/PMA_server_status_processes_test.php b/test/libraries/PMA_server_status_processes_test.php index 6bcc56ce78..f73c39d3ba 100644 --- a/test/libraries/PMA_server_status_processes_test.php +++ b/test/libraries/PMA_server_status_processes_test.php @@ -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 diff --git a/test/libraries/PMA_server_status_queries_test.php b/test/libraries/PMA_server_status_queries_test.php index 21e7b381d9..514e840851 100644 --- a/test/libraries/PMA_server_status_queries_test.php +++ b/test/libraries/PMA_server_status_queries_test.php @@ -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 diff --git a/test/libraries/PMA_server_status_test.php b/test/libraries/PMA_server_status_test.php index af7b0d7447..5b097d8206 100644 --- a/test/libraries/PMA_server_status_test.php +++ b/test/libraries/PMA_server_status_test.php @@ -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 diff --git a/test/libraries/PMA_server_status_variables_test.php b/test/libraries/PMA_server_status_variables_test.php index bdb21d5b24..f09efd54e7 100644 --- a/test/libraries/PMA_server_status_variables_test.php +++ b/test/libraries/PMA_server_status_variables_test.php @@ -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 diff --git a/test/libraries/PMA_server_user_groups_test.php b/test/libraries/PMA_server_user_groups_test.php index 87ae690815..f1355bddc7 100644 --- a/test/libraries/PMA_server_user_groups_test.php +++ b/test/libraries/PMA_server_user_groups_test.php @@ -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'; /** diff --git a/test/libraries/PMA_sql_query_form_test.php b/test/libraries/PMA_sql_query_form_test.php index 5ee9553af4..e97e120470 100644 --- a/test/libraries/PMA_sql_query_form_test.php +++ b/test/libraries/PMA_sql_query_form_test.php @@ -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'; /** diff --git a/test/libraries/database_interface_test.php b/test/libraries/database_interface_test.php index 6e51d81314..0983a296e8 100644 --- a/test/libraries/database_interface_test.php +++ b/test/libraries/database_interface_test.php @@ -9,7 +9,6 @@ /* * Include to test. */ -require_once 'libraries/database_interface.inc.php'; /** * Tests basic functionality of dummy dbi driver diff --git a/test/libraries/rte/PMA_RTN_getEditorForm_test.php b/test/libraries/rte/PMA_RTN_getEditorForm_test.php index 1ef13d7332..ce62177b02 100644 --- a/test/libraries/rte/PMA_RTN_getEditorForm_test.php +++ b/test/libraries/rte/PMA_RTN_getEditorForm_test.php @@ -13,7 +13,6 @@ use PhpMyAdmin\Response; $GLOBALS['server'] = 0; -require_once 'libraries/database_interface.inc.php'; /* * Include to test. */ diff --git a/test/libraries/rte/PMA_RTN_getExecuteForm_test.php b/test/libraries/rte/PMA_RTN_getExecuteForm_test.php index 5329416e9e..907199e6e8 100644 --- a/test/libraries/rte/PMA_RTN_getExecuteForm_test.php +++ b/test/libraries/rte/PMA_RTN_getExecuteForm_test.php @@ -11,7 +11,6 @@ use PhpMyAdmin\Response; $GLOBALS['server'] = 0; -require_once 'libraries/database_interface.inc.php'; /* * Include to test. diff --git a/test/libraries/rte/PMA_TRI_getEditorForm_test.php b/test/libraries/rte/PMA_TRI_getEditorForm_test.php index 0bd300f7e5..fdbd79fb27 100644 --- a/test/libraries/rte/PMA_TRI_getEditorForm_test.php +++ b/test/libraries/rte/PMA_TRI_getEditorForm_test.php @@ -7,7 +7,6 @@ */ use PhpMyAdmin\Response; -require_once 'libraries/database_interface.inc.php'; /* * Include to test. diff --git a/test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php b/test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php index 873fe4aa8d..c0169c1c80 100644 --- a/test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php +++ b/test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php @@ -19,7 +19,6 @@ * Include to test. */ require_once 'libraries/rte/rte_triggers.lib.php'; -require_once 'libraries/database_interface.inc.php'; /** From ad99c4ac4bc5f9bb62a14421c08b4b73e1a96ca0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 6 Sep 2017 14:30:02 +0200 Subject: [PATCH 3/3] Remove unused define PMA_MYSQL_CLIENT_API MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove PMA_MYSQL_CLIENT_API and all logic for defining it. Signed-off-by: Michal Čihař --- libraries/classes/Dbi/DbiExtension.php | 2 -- libraries/classes/Dbi/DbiMysql.php | 7 ------- libraries/classes/Dbi/DbiMysqli.php | 7 ------- libraries/dbi/dbi_extension.lib.php | 28 -------------------------- 4 files changed, 44 deletions(-) delete mode 100644 libraries/dbi/dbi_extension.lib.php diff --git a/libraries/classes/Dbi/DbiExtension.php b/libraries/classes/Dbi/DbiExtension.php index 118bcc0d57..a133f8082d 100644 --- a/libraries/classes/Dbi/DbiExtension.php +++ b/libraries/classes/Dbi/DbiExtension.php @@ -6,8 +6,6 @@ */ namespace PhpMyAdmin\Dbi; -require_once 'libraries/dbi/dbi_extension.lib.php'; - /** * Contract for every database extension supported by phpMyAdmin * diff --git a/libraries/classes/Dbi/DbiMysql.php b/libraries/classes/Dbi/DbiMysql.php index c1e647050d..ecea5a8cfd 100644 --- a/libraries/classes/Dbi/DbiMysql.php +++ b/libraries/classes/Dbi/DbiMysql.php @@ -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 * diff --git a/libraries/classes/Dbi/DbiMysqli.php b/libraries/classes/Dbi/DbiMysqli.php index d152c27ef3..182878646f 100644 --- a/libraries/classes/Dbi/DbiMysqli.php +++ b/libraries/classes/Dbi/DbiMysqli.php @@ -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" */ diff --git a/libraries/dbi/dbi_extension.lib.php b/libraries/dbi/dbi_extension.lib.php deleted file mode 100644 index 5e270c7349..0000000000 --- a/libraries/dbi/dbi_extension.lib.php +++ /dev/null @@ -1,28 +0,0 @@ -