From 13c0f7bc3cb8900a2a3b9e938b6d2914efbfe4c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Fri, 23 Jun 2017 20:24:39 -0300 Subject: [PATCH] Move classes to PhpMyAdmin namespace MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Move Advisor to PhpMyAdmin namespace - Move Bookmark to PhpMyAdmin namespace - Move Charsets to PhpMyAdmin namespace - Move Config class to PhpMyAdmin namespace - Move Console class to PhpMyAdmin namespace - Move Core to PhpMyAdmin namespace - Move DatabaseInterface to PhpMyAdmin namespace - Move DbList to PhpMyAdmin namespace - Move DbQbe to PhpMyAdmin namespace - Move DbSearch to PhpMyAdmin namespace - Move DisplayResults to PhpMyAdmin namespace - Move Encoding to PhpMyAdmin namespace - Move Error to PhpMyAdmin namespace - Move ErrorHandler to PhpMyAdmin namespace - Move File to PhpMyAdmin namespace - Move Font to PhpMyAdmin namespace - Move Footer to PhpMyAdmin namespace - Move Header to PhpMyAdmin namespace - Move Index to PhpMyAdmin namespace - Move IndexColumn to PhpMyAdmin namespace - Move LanguageManager to PhpMyAdmin namespace - Move Language to PhpMyAdmin namespace - Move Linter to PhpMyAdmin namespace - Move ListAbstract to PhpMyAdmin namespace - Move ListDatabase to PhpMyAdmin namespace Signed-off-by: Maurício Meneghini Fauth --- composer.json | 3 +- db_central_columns.php | 2 +- db_datadict.php | 4 +- db_operations.php | 2 +- db_qbe.php | 2 +- db_search.php | 2 +- export.php | 4 +- gis_data_editor.php | 2 +- import.php | 10 +-- import_status.php | 2 +- index.php | 8 +-- libraries/Logging.php | 2 +- libraries/Menu.php | 2 +- libraries/PDF.php | 2 +- libraries/Response.php | 10 +-- libraries/Sanitize.php | 2 +- libraries/Scripts.php | 1 + libraries/Sql.php | 10 +-- libraries/SystemDatabase.php | 2 + libraries/Table.php | 2 + libraries/Transformations.php | 2 +- libraries/Util.php | 3 +- libraries/central_columns.lib.php | 2 +- libraries/{ => classes}/Advisor.php | 5 +- libraries/{ => classes}/Bookmark.php | 4 +- libraries/{ => classes}/Charsets.php | 3 +- libraries/{ => classes}/Config.php | 13 ++-- libraries/{ => classes}/Console.php | 5 +- libraries/{ => classes}/Core.php | 4 +- libraries/{ => classes}/DatabaseInterface.php | 16 +++-- libraries/{ => classes}/DbList.php | 4 +- libraries/{ => classes}/DbQbe.php | 6 +- libraries/{ => classes}/DbSearch.php | 3 +- libraries/{ => classes}/DisplayResults.php | 17 +++-- libraries/{ => classes}/Encoding.php | 6 +- libraries/{ => classes}/Error.php | 31 ++++---- libraries/{ => classes}/ErrorHandler.php | 8 ++- libraries/{ => classes}/File.php | 10 +-- libraries/{ => classes}/Font.php | 2 +- libraries/{ => classes}/Footer.php | 14 ++-- libraries/{ => classes}/Header.php | 18 +++-- libraries/{ => classes}/Index.php | 7 +- libraries/{ => classes}/IndexColumn.php | 2 +- libraries/{ => classes}/Language.php | 7 +- libraries/{ => classes}/LanguageManager.php | 10 +-- libraries/{ => classes}/Linter.php | 3 +- libraries/{ => classes}/ListAbstract.php | 2 +- libraries/{ => classes}/ListDatabase.php | 5 +- libraries/common.inc.php | 24 +++---- libraries/config/ConfigFile.php | 6 +- libraries/config/PageSettings.php | 2 +- libraries/config/ServerConfigChecks.php | 2 +- libraries/config/Validator.php | 6 +- libraries/controllers/Controller.php | 2 +- .../database/DatabaseStructureController.php | 4 +- .../server/ServerBinlogController.php | 2 +- .../server/ServerCollationsController.php | 2 +- .../server/ServerDatabasesController.php | 4 +- .../table/TableGisVisualizationController.php | 2 +- .../table/TableIndexesController.php | 2 +- .../table/TableRelationController.php | 6 +- .../table/TableSearchController.php | 2 +- .../table/TableStructureController.php | 4 +- libraries/create_addfield.lib.php | 4 +- libraries/database_interface.inc.php | 6 +- libraries/db_common.inc.php | 2 +- libraries/db_designer.lib.php | 2 +- libraries/db_table_exists.inc.php | 6 +- libraries/dbi/DBIMysql.php | 2 +- libraries/dbi/DBIMysqli.php | 2 +- libraries/display_export.lib.php | 4 +- libraries/display_git_revision.lib.php | 2 +- libraries/display_import.lib.php | 6 +- libraries/display_import_ajax.lib.php | 2 +- libraries/engines/Pbxt.php | 2 +- libraries/error_report.lib.php | 2 +- libraries/export.lib.php | 2 +- libraries/gis/GISVisualization.php | 2 +- libraries/import.lib.php | 2 +- libraries/insert_edit.lib.php | 6 +- libraries/ip_allow_deny.lib.php | 2 +- libraries/normalization.lib.php | 12 ++-- libraries/operations.lib.php | 4 +- libraries/plugins/AuthenticationPlugin.php | 2 +- .../plugins/auth/AuthenticationCookie.php | 6 +- libraries/plugins/auth/AuthenticationHttp.php | 4 +- .../plugins/auth/AuthenticationSignon.php | 2 +- libraries/plugins/export/ExportCsv.php | 3 +- libraries/plugins/export/ExportHtmlword.php | 2 +- libraries/plugins/export/ExportJson.php | 3 +- libraries/plugins/export/ExportLatex.php | 2 +- libraries/plugins/export/ExportMediawiki.php | 3 +- libraries/plugins/export/ExportOds.php | 2 +- libraries/plugins/export/ExportOdt.php | 2 +- libraries/plugins/export/ExportPhparray.php | 3 +- libraries/plugins/export/ExportSql.php | 6 +- libraries/plugins/export/ExportTexytext.php | 2 +- libraries/plugins/export/ExportXml.php | 2 +- libraries/plugins/export/ExportYaml.php | 3 +- libraries/plugins/export/helpers/Pdf.php | 2 +- libraries/plugins/import/ImportSql.php | 2 +- .../plugins/schema/ExportRelationSchema.php | 6 +- libraries/plugins/schema/TableStats.php | 14 ++-- libraries/plugins/schema/dia/Dia.php | 2 +- libraries/plugins/schema/eps/Eps.php | 2 +- .../plugins/schema/eps/TableStatsEps.php | 7 +- libraries/plugins/schema/svg/Svg.php | 2 +- .../plugins/schema/svg/TableStatsSvg.php | 7 +- libraries/pmd_common.php | 26 +++---- libraries/relation.lib.php | 10 +-- libraries/replication.inc.php | 4 +- libraries/replication_gui.lib.php | 2 +- libraries/rte/rte_routines.lib.php | 6 +- libraries/server_privileges.lib.php | 16 ++--- libraries/server_status_advisor.lib.php | 4 +- libraries/session.inc.php | 4 +- libraries/session.lib.php | 2 +- libraries/sql_query_form.lib.php | 4 +- libraries/tbl_columns_definition_form.inc.php | 2 +- libraries/tbl_partition_definition.inc.php | 2 +- libraries/tracking.lib.php | 2 +- libraries/twig/CharsetsExtension.php | 2 +- libraries/user_preferences.lib.php | 2 +- lint.php | 4 +- logout.php | 2 +- normalization.php | 2 +- prefs_forms.php | 2 +- prefs_manage.php | 4 +- schema_export.php | 2 +- scripts/advisor2po | 6 +- scripts/create-release.sh | 4 +- server_privileges.php | 2 +- setup/config.php | 2 +- setup/frames/config.inc.php | 2 +- setup/frames/form.inc.php | 2 +- setup/frames/index.inc.php | 4 +- setup/frames/servers.inc.php | 2 +- setup/index.php | 2 +- setup/lib/form_processing.lib.php | 2 +- setup/validate.php | 2 +- tbl_create.php | 2 +- tbl_get_field.php | 2 +- tbl_indexes.php | 2 +- tbl_operations.php | 2 +- tbl_replace.php | 4 +- .../column_attributes.phtml | 2 +- .../column_definitions_form.phtml | 2 +- .../structure/body_for_table_summary.phtml | 2 +- .../database/structure/show_create_row.phtml | 2 +- .../database/structure/sortable_header.phtml | 2 +- templates/server/databases/create.phtml | 2 +- .../table/relation/foreign_key_row.phtml | 2 +- .../table/structure/display_structure.phtml | 2 +- test/bootstrap-dist.php | 4 +- test/classes/AdvisorTest.php | 2 +- test/classes/BookmarkTest.php | 2 +- test/classes/CharsetsTest.php | 15 ++-- test/classes/ConfigGeneratorTest.php | 2 +- test/classes/ConfigTest.php | 32 ++++----- test/classes/CoreTest.php | 8 +-- test/classes/DatabaseInterfaceTest.php | 10 +-- test/classes/DbQbeTest.php | 8 +-- test/classes/DbSearchTest.php | 6 +- test/classes/DisplayResultsTest.php | 29 ++++---- test/classes/EncodingTest.php | 2 +- test/classes/ErrorHandlerTest.php | 7 +- test/classes/ErrorTest.php | 4 +- test/classes/FileTest.php | 16 ++--- test/classes/FontTest.php | 72 ++++++++++--------- test/classes/FooterTest.php | 23 +++--- test/classes/HeaderTest.php | 33 ++++----- test/classes/IndexTest.php | 19 +++-- test/classes/LanguageTest.php | 2 +- test/classes/LinterTest.php | 4 +- test/classes/ListDatabaseTest.php | 4 +- test/classes/MenuTest.php | 2 +- test/classes/PDFTest.php | 2 +- test/classes/ServerStatusDataTest.php | 4 +- test/classes/SystemDatabaseTest.php | 2 +- test/classes/TableTest.php | 20 +++--- test/classes/ThemeManagerTest.php | 4 +- test/classes/ThemeTest.php | 2 +- test/classes/TrackerTest.php | 14 ++-- test/classes/TransformationsTest.php | 2 +- test/classes/config/FormDisplayTest.php | 2 +- test/classes/config/FormTest.php | 2 +- .../DatabaseStructureControllerTest.php | 2 +- .../ServerBinlogControllerTest.php | 2 +- .../ServerCollationsControllerTest.php | 2 +- .../ServerDatabasesControllerTest.php | 6 +- .../ServerEnginesControllerTest.php | 2 +- .../ServerPluginsControllerTest.php | 2 +- .../ServerVariablesControllerTest.php | 4 +- .../TableIndexesControllerTest.php | 4 +- .../TableRelationControllerTest.php | 2 +- .../controllers/TableSearchControllerTest.php | 2 +- .../TableStructureControllerTest.php | 4 +- test/classes/engines/PbxtTest.php | 2 +- test/classes/navigation/NavigationTest.php | 6 +- .../classes/navigation/NavigationTreeTest.php | 2 +- test/classes/navigation/NodeTest.php | 14 ++-- .../plugin/auth/AuthenticationConfigTest.php | 6 +- .../plugin/auth/AuthenticationCookieTest.php | 18 ++--- .../plugin/auth/AuthenticationHttpTest.php | 8 +-- .../plugin/auth/AuthenticationSignonTest.php | 6 +- .../plugin/export/ExportCodegenTest.php | 6 +- test/classes/plugin/export/ExportCsvTest.php | 22 +++--- .../plugin/export/ExportHtmlwordTest.php | 16 ++--- test/classes/plugin/export/ExportJsonTest.php | 2 +- .../classes/plugin/export/ExportLatexTest.php | 10 +-- .../plugin/export/ExportMediawikiTest.php | 6 +- test/classes/plugin/export/ExportOdsTest.php | 12 ++-- test/classes/plugin/export/ExportOdtTest.php | 22 +++--- .../plugin/export/ExportPhparrayTest.php | 8 +-- test/classes/plugin/export/ExportSqlTest.php | 44 ++++++------ .../plugin/export/ExportTexytextTest.php | 12 ++-- test/classes/plugin/export/ExportXmlTest.php | 8 +-- test/classes/plugin/export/ExportYamlTest.php | 4 +- test/classes/plugin/import/ImportCsvTest.php | 4 +- test/classes/plugin/import/ImportLdiTest.php | 4 +- .../plugin/import/ImportMediawikiTest.php | 4 +- test/classes/plugin/import/ImportOdsTest.php | 4 +- test/classes/plugin/import/ImportShpTest.php | 4 +- test/classes/plugin/import/ImportSqlTest.php | 4 +- test/classes/plugin/import/ImportXmlTest.php | 4 +- .../TransformationPluginsTest.php | 2 +- test/classes/schema/DiaRelationSchemaTest.php | 2 +- test/classes/schema/EpsRelationSchemaTest.php | 2 +- test/classes/schema/PdfRelationSchemaTest.php | 2 +- test/classes/schema/SvgRelationSchemaTest.php | 2 +- test/libraries/PMA_PMD_common_test.php | 24 +++---- test/libraries/PMA_central_columns_test.php | 2 +- test/libraries/PMA_designer_test.php | 4 +- .../PMA_display_change_password_test.php | 2 +- test/libraries/PMA_display_export_test.php | 8 +-- test/libraries/PMA_import_test.php | 4 +- test/libraries/PMA_insert_edit_test.php | 38 +++++----- test/libraries/PMA_ip_allow_deny_test.php | 2 +- test/libraries/PMA_mult_submits_test.php | 2 +- test/libraries/PMA_normalization_test.php | 2 +- test/libraries/PMA_relation_cleanup_test.php | 2 +- test/libraries/PMA_relation_test.php | 6 +- test/libraries/PMA_server_privileges_test.php | 28 ++++---- .../libraries/PMA_server_replication_test.php | 2 +- .../PMA_server_status_advisor_test.php | 4 +- .../PMA_server_status_monitor_test.php | 12 ++-- .../PMA_server_status_processes_test.php | 4 +- .../PMA_server_status_queries_test.php | 4 +- test/libraries/PMA_server_status_test.php | 4 +- .../PMA_server_status_variables_test.php | 4 +- .../libraries/PMA_server_user_groups_test.php | 8 +-- test/libraries/PMA_sql_query_form_test.php | 6 +- test/libraries/PMA_tbl_tracking_test.php | 6 +- test/libraries/PMA_user_preferences_test.php | 6 +- .../common/PMA_checkParameters_test.php | 4 +- .../common/PMA_expandUserString_test.php | 2 +- .../rte/PMA_EVN_getQueryFromRequest_test.php | 2 +- .../rte/PMA_RTN_getQueryFromRequest_test.php | 2 +- test/libraries/stubs/ResponseStub.php | 8 +-- themes.php | 2 +- transformation_wrapper.php | 6 +- url.php | 2 +- user_password.php | 2 +- version_check.php | 2 +- view_create.php | 2 +- 265 files changed, 815 insertions(+), 748 deletions(-) rename libraries/{ => classes}/Advisor.php (99%) rename libraries/{ => classes}/Bookmark.php (99%) rename libraries/{ => classes}/Charsets.php (99%) rename libraries/{ => classes}/Config.php (99%) rename libraries/{ => classes}/Console.php (97%) rename libraries/{ => classes}/Core.php (99%) rename libraries/{ => classes}/DatabaseInterface.php (99%) rename libraries/{ => classes}/DbList.php (97%) rename libraries/{ => classes}/DbQbe.php (99%) rename libraries/{ => classes}/DbSearch.php (99%) rename libraries/{ => classes}/DisplayResults.php (99%) rename libraries/{ => classes}/Encoding.php (99%) rename libraries/{ => classes}/Error.php (93%) rename libraries/{ => classes}/ErrorHandler.php (99%) rename libraries/{ => classes}/File.php (99%) rename libraries/{ => classes}/Font.php (99%) rename libraries/{ => classes}/Footer.php (98%) rename libraries/{ => classes}/Header.php (98%) rename libraries/{ => classes}/Index.php (99%) rename libraries/{ => classes}/IndexColumn.php (99%) rename libraries/{ => classes}/Language.php (97%) rename libraries/{ => classes}/LanguageManager.php (99%) rename libraries/{ => classes}/Linter.php (99%) rename libraries/{ => classes}/ListAbstract.php (99%) rename libraries/{ => classes}/ListDatabase.php (98%) diff --git a/composer.json b/composer.json index 57f36e1365..938a734202 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,8 @@ "non-feature-branches": ["RELEASE_.*"], "autoload": { "psr-4": { - "PMA\\": "./" + "PMA\\": "./", + "PhpMyAdmin\\": "libraries/classes" } }, "repositories": [ diff --git a/db_central_columns.php b/db_central_columns.php index e5d182d409..4b01cebcae 100644 --- a/db_central_columns.php +++ b/db_central_columns.php @@ -7,7 +7,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\URL; use PMA\libraries\Response; diff --git a/db_datadict.php b/db_datadict.php index 8c02c89431..cf3f66d6a1 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -201,8 +201,8 @@ foreach ($tables as $table) { $count++; echo ''; // display indexes information - if (count(PMA\libraries\Index::getFromTable($table, $db)) > 0) { - echo PMA\libraries\Index::getHtmlForIndexes($table, $db, true); + if (count(PhpMyAdmin\Index::getFromTable($table, $db)) > 0) { + echo PhpMyAdmin\Index::getHtmlForIndexes($table, $db, true); } echo ''; } //ends main while diff --git a/db_operations.php b/db_operations.php index 468cdc134e..e24c49306b 100644 --- a/db_operations.php +++ b/db_operations.php @@ -303,6 +303,6 @@ if ($cfgRelation['pdfwork'] && $num_tables > 0) { $test_rs = PMA_queryAsControlUser( $test_query, false, - PMA\libraries\DatabaseInterface::QUERY_STORE + PhpMyAdmin\DatabaseInterface::QUERY_STORE ); } // end if diff --git a/db_qbe.php b/db_qbe.php index 0cb1b2df28..f64e973398 100644 --- a/db_qbe.php +++ b/db_qbe.php @@ -131,7 +131,7 @@ if ($message_to_display) { unset($message_to_display); // create new qbe search instance -$db_qbe = new PMA\libraries\DbQbe($GLOBALS['db'], $savedSearchList, $savedSearch); +$db_qbe = new PhpMyAdmin\DbQbe($GLOBALS['db'], $savedSearchList, $savedSearch); $url = 'db_designer.php' . URL::getCommon( array_merge( diff --git a/db_search.php b/db_search.php index 314eb487cc..2ebf417223 100644 --- a/db_search.php +++ b/db_search.php @@ -14,7 +14,7 @@ require_once 'libraries/common.inc.php'; use PMA\libraries\Response; -use PMA\libraries\DbSearch; +use PhpMyAdmin\DbSearch; $response = Response::getInstance(); $header = $response->getHeader(); diff --git a/export.php b/export.php index d354ccf88f..e9e82a9938 100644 --- a/export.php +++ b/export.php @@ -6,8 +6,8 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; -use PMA\libraries\Encoding; +use PhpMyAdmin\Core; +use PhpMyAdmin\Encoding; use PMA\libraries\plugins\ExportPlugin; use PMA\libraries\URL; use PMA\libraries\Sanitize; diff --git a/gis_data_editor.php b/gis_data_editor.php index 538271e3c2..a3ec478170 100644 --- a/gis_data_editor.php +++ b/gis_data_editor.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\gis\GISFactory; use PMA\libraries\gis\GISVisualization; use PMA\libraries\Response; diff --git a/import.php b/import.php index 7cd6affe6d..d910c34cfc 100644 --- a/import.php +++ b/import.php @@ -6,10 +6,10 @@ * @package PhpMyAdmin */ -use PMA\libraries\Bookmark; -use PMA\libraries\Core; -use PMA\libraries\Encoding; -use PMA\libraries\File; +use PhpMyAdmin\Bookmark; +use PhpMyAdmin\Core; +use PhpMyAdmin\Encoding; +use PhpMyAdmin\File; use PMA\libraries\plugins\ImportPlugin; use PMA\libraries\Response; use PMA\libraries\Sql; @@ -43,7 +43,7 @@ $response = Response::getInstance(); // If it's a refresh console bookmarks request if (isset($_REQUEST['console_bookmark_refresh'])) { $response->addJSON( - 'console_message_bookmark', PMA\libraries\Console::getBookmarkContent() + 'console_message_bookmark', PhpMyAdmin\Console::getBookmarkContent() ); exit; } diff --git a/import_status.php b/import_status.php index 3b906fb9dc..d735308d78 100644 --- a/import_status.php +++ b/import_status.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; /* PHP 5.4 stores upload progress data only in the default session. * After calling session_name(), we won't find the progress data anymore. diff --git a/index.php b/index.php index d8663cade3..02cb9d28fe 100644 --- a/index.php +++ b/index.php @@ -6,9 +6,9 @@ * @package PhpMyAdmin */ -use PMA\libraries\Charsets; -use PMA\libraries\Core; -use PMA\libraries\LanguageManager; +use PhpMyAdmin\Charsets; +use PhpMyAdmin\Core; +use PhpMyAdmin\LanguageManager; use PMA\libraries\Message; use PMA\libraries\RecentFavoriteTable; use PMA\libraries\Response; @@ -263,7 +263,7 @@ if ($GLOBALS['cfg']['ThemeManager']) { echo ''; } echo '
  • '; -echo PMA\libraries\Config::getFontsizeForm(); +echo PhpMyAdmin\Config::getFontsizeForm(); echo '
    • '; echo ''; diff --git a/libraries/Logging.php b/libraries/Logging.php index 59b29515bd..625caeb795 100644 --- a/libraries/Logging.php +++ b/libraries/Logging.php @@ -9,7 +9,7 @@ */ namespace PMA\libraries; -use PMA\libraries\Core; +use PhpMyAdmin\Core; /** * Misc logging functions diff --git a/libraries/Menu.php b/libraries/Menu.php index ae2f0c9e85..6d5778d42b 100644 --- a/libraries/Menu.php +++ b/libraries/Menu.php @@ -7,6 +7,7 @@ */ namespace PMA\libraries; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\URL; /** @@ -655,4 +656,3 @@ class Menu return $this; } } - diff --git a/libraries/PDF.php b/libraries/PDF.php index 5195c16596..56cfd2b979 100644 --- a/libraries/PDF.php +++ b/libraries/PDF.php @@ -7,7 +7,7 @@ */ namespace PMA\libraries; -use PMA\libraries\Core; +use PhpMyAdmin\Core; use TCPDF; use TCPDF_FONTS; diff --git a/libraries/Response.php b/libraries/Response.php index dc5caf2695..cd7ea5385a 100644 --- a/libraries/Response.php +++ b/libraries/Response.php @@ -7,7 +7,9 @@ */ namespace PMA\libraries; -use PMA\libraries\Core; +use PhpMyAdmin\Core; +use PhpMyAdmin\Footer; +use PhpMyAdmin\Header; /** * Singleton class used to manage the rendering of pages in PMA @@ -47,7 +49,7 @@ class Response */ private $_JSON; /** - * PMA\libraries\Footer instance + * PhpMyAdmin\Footer instance * * @access private * @var Footer @@ -182,7 +184,7 @@ class Response } /** - * Returns a PMA\libraries\Header object + * Returns a PhpMyAdmin\Header object * * @return Header */ @@ -192,7 +194,7 @@ class Response } /** - * Returns a PMA\libraries\Footer object + * Returns a PhpMyAdmin\Footer object * * @return Footer */ diff --git a/libraries/Sanitize.php b/libraries/Sanitize.php index 8f604a4021..e05340a5ca 100644 --- a/libraries/Sanitize.php +++ b/libraries/Sanitize.php @@ -7,7 +7,7 @@ */ namespace PMA\libraries; -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Util; /** diff --git a/libraries/Scripts.php b/libraries/Scripts.php index f7a6152763..551d0102b3 100644 --- a/libraries/Scripts.php +++ b/libraries/Scripts.php @@ -7,6 +7,7 @@ */ namespace PMA\libraries; +use PhpMyAdmin\Header; use PMA\libraries\URL; use PMA\libraries\Sanitize; diff --git a/libraries/Sql.php b/libraries/Sql.php index bc18b1a8d2..af42467844 100644 --- a/libraries/Sql.php +++ b/libraries/Sql.php @@ -11,11 +11,11 @@ use PhpMyAdmin\SqlParser\Statements\AlterStatement; use PhpMyAdmin\SqlParser\Statements\DropStatement; use PhpMyAdmin\SqlParser\Statements\SelectStatement; use PhpMyAdmin\SqlParser\Utils\Query; -use PMA\libraries\Bookmark; -use PMA\libraries\Core; -use PMA\libraries\DatabaseInterface; -use PMA\libraries\DisplayResults; -use PMA\libraries\Index; +use PhpMyAdmin\Bookmark; +use PhpMyAdmin\Core; +use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\DisplayResults; +use PhpMyAdmin\Index; use PMA\libraries\Message; use PMA\libraries\Response; use PMA\libraries\Table; diff --git a/libraries/SystemDatabase.php b/libraries/SystemDatabase.php index 7e39e46293..df5976a4e7 100644 --- a/libraries/SystemDatabase.php +++ b/libraries/SystemDatabase.php @@ -7,6 +7,8 @@ */ namespace PMA\libraries; +use PhpMyAdmin\DatabaseInterface; + require_once 'libraries/database_interface.inc.php'; /** diff --git a/libraries/Table.php b/libraries/Table.php index 9d050be638..ddeb0f0986 100644 --- a/libraries/Table.php +++ b/libraries/Table.php @@ -7,6 +7,8 @@ */ namespace PMA\libraries; +use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Index; use PMA\libraries\plugins\export\ExportSql; use PhpMyAdmin\SqlParser\Components\Expression; use PhpMyAdmin\SqlParser\Components\OptionsArray; diff --git a/libraries/Transformations.php b/libraries/Transformations.php index 00cfa214f7..9581154860 100644 --- a/libraries/Transformations.php +++ b/libraries/Transformations.php @@ -17,7 +17,7 @@ */ namespace PMA\libraries; -use PMA\libraries\DatabaseInterface; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\Util; /** diff --git a/libraries/Util.php b/libraries/Util.php index e2c470ba37..cbbed3dc0e 100644 --- a/libraries/Util.php +++ b/libraries/Util.php @@ -7,13 +7,14 @@ */ namespace PMA\libraries; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\plugins\ImportPlugin; use PhpMyAdmin\SqlParser\Context; use PhpMyAdmin\SqlParser\Lexer; use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Token; use stdClass; -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\URL; use PMA\libraries\Sanitize; use PMA\libraries\Template; diff --git a/libraries/central_columns.lib.php b/libraries/central_columns.lib.php index 524ca5970d..fb1e4aae1e 100644 --- a/libraries/central_columns.lib.php +++ b/libraries/central_columns.lib.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin */ -use PMA\libraries\Charsets; +use PhpMyAdmin\Charsets; use PMA\libraries\Message; use PMA\libraries\Util; use PMA\libraries\URL; diff --git a/libraries/Advisor.php b/libraries/classes/Advisor.php similarity index 99% rename from libraries/Advisor.php rename to libraries/classes/Advisor.php index bf81f7909f..7ad674126b 100644 --- a/libraries/Advisor.php +++ b/libraries/classes/Advisor.php @@ -6,11 +6,12 @@ * * @package PhpMyAdmin */ -namespace PMA\libraries; +namespace PhpMyAdmin; use Exception; -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\URL; +use PMA\libraries\Util; use Symfony\Component\ExpressionLanguage\ExpressionLanguage; /** diff --git a/libraries/Bookmark.php b/libraries/classes/Bookmark.php similarity index 99% rename from libraries/Bookmark.php rename to libraries/classes/Bookmark.php index 9a34a9a88b..565f37b5b0 100644 --- a/libraries/Bookmark.php +++ b/libraries/classes/Bookmark.php @@ -5,10 +5,10 @@ * * @package PhpMyAdmin */ -namespace PMA\libraries; +namespace PhpMyAdmin; use PMA\libraries\Util; -use PMA\libraries\DatabaseInterface; +use PhpMyAdmin\DatabaseInterface; /** * Handles bookmarking SQL queries diff --git a/libraries/Charsets.php b/libraries/classes/Charsets.php similarity index 99% rename from libraries/Charsets.php rename to libraries/classes/Charsets.php index 56c5625222..b757ce6cae 100644 --- a/libraries/Charsets.php +++ b/libraries/classes/Charsets.php @@ -5,7 +5,8 @@ * * @package PhpMyAdmin */ -namespace PMA\libraries; +namespace PhpMyAdmin; + use PMA\libraries\Util; /** diff --git a/libraries/Config.php b/libraries/classes/Config.php similarity index 99% rename from libraries/Config.php rename to libraries/classes/Config.php index 40fc174e2e..15514f8972 100644 --- a/libraries/Config.php +++ b/libraries/classes/Config.php @@ -5,12 +5,15 @@ * * @package PhpMyAdmin */ -namespace PMA\libraries; +namespace PhpMyAdmin; use DirectoryIterator; -use PMA\libraries\Core; -use PMA\libraries\URL; +use PhpMyAdmin\Core; +use PhpMyAdmin\Error; +use PhpMyAdmin\LanguageManager; use PMA\libraries\ThemeManager; +use PMA\libraries\URL; +use PMA\libraries\Util; /** * Indication for error handler (see end of this file). @@ -88,7 +91,7 @@ class Config $this->settings = array(); // functions need to refresh in case of config file changed goes in - // PMA\libraries\Config::load() + // PhpMyAdmin\Config::load() $this->load($source); // other settings, independent from config file, comes in @@ -1794,5 +1797,5 @@ class Config } if (!defined('TESTSUITE')) { - register_shutdown_function(array('PMA\libraries\Config', 'fatalErrorHandler')); + register_shutdown_function(array('PhpMyAdmin\Config', 'fatalErrorHandler')); } diff --git a/libraries/Console.php b/libraries/classes/Console.php similarity index 97% rename from libraries/Console.php rename to libraries/classes/Console.php index a419cef0ad..d7419a79b1 100644 --- a/libraries/Console.php +++ b/libraries/classes/Console.php @@ -5,10 +5,11 @@ * * @package PhpMyAdmin */ -namespace PMA\libraries; +namespace PhpMyAdmin; +use PhpMyAdmin\Bookmark; use PMA\libraries\Template; -use PMA\libraries\Bookmark; +use PMA\libraries\Util; if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/Core.php b/libraries/classes/Core.php similarity index 99% rename from libraries/Core.php rename to libraries/classes/Core.php index a4155f436f..9b9748162a 100644 --- a/libraries/Core.php +++ b/libraries/classes/Core.php @@ -7,9 +7,9 @@ * * @package PhpMyAdmin */ -namespace PMA\libraries; +namespace PhpMyAdmin; -use PMA\libraries\DatabaseInterface; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\Message; use PMA\libraries\Response; use PMA\libraries\Sanitize; diff --git a/libraries/DatabaseInterface.php b/libraries/classes/DatabaseInterface.php similarity index 99% rename from libraries/DatabaseInterface.php rename to libraries/classes/DatabaseInterface.php index 9e9bc03aac..101b4e2efb 100644 --- a/libraries/DatabaseInterface.php +++ b/libraries/classes/DatabaseInterface.php @@ -5,12 +5,18 @@ * * @package PhpMyAdmin-DBI */ -namespace PMA\libraries; +namespace PhpMyAdmin; -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\dbi\DBIExtension; -use PMA\libraries\LanguageManager; +use PhpMyAdmin\Error; +use PhpMyAdmin\Index; +use PhpMyAdmin\LanguageManager; +use PMA\libraries\SystemDatabase; +use PMA\libraries\Table; +use PMA\libraries\Tracker; use PMA\libraries\URL; +use PMA\libraries\Util; require_once './libraries/util.lib.php'; @@ -917,7 +923,7 @@ class DatabaseInterface $GLOBALS['callback_sort_by'] = $sort_by; usort( $databases, - array('PMA\libraries\DatabaseInterface', '_usortComparisonCallback') + array(self::class, '_usortComparisonCallback') ); unset($GLOBALS['callback_sort_order'], $GLOBALS['callback_sort_by']); @@ -1391,7 +1397,7 @@ class DatabaseInterface } } - if (PMA_MYSQL_INT_VERSION > 50503) { + if (PMA_MYSQL_INT_VERSION > 50503) { $default_charset = 'utf8mb4'; $default_collation = 'utf8mb4_general_ci'; } else { diff --git a/libraries/DbList.php b/libraries/classes/DbList.php similarity index 97% rename from libraries/DbList.php rename to libraries/classes/DbList.php index c315ed0b44..2f62b2040a 100644 --- a/libraries/DbList.php +++ b/libraries/classes/DbList.php @@ -6,7 +6,9 @@ * @package PhpMyAdmin * */ -namespace PMA\libraries; +namespace PhpMyAdmin; + +use PhpMyAdmin\ListDatabase; /** * holds the DbList class diff --git a/libraries/DbQbe.php b/libraries/classes/DbQbe.php similarity index 99% rename from libraries/DbQbe.php rename to libraries/classes/DbQbe.php index ee616c41b9..d1dc8e963e 100644 --- a/libraries/DbQbe.php +++ b/libraries/classes/DbQbe.php @@ -5,9 +5,11 @@ * * @package PhpMyAdmin */ -namespace PMA\libraries; +namespace PhpMyAdmin; -use PMA\libraries\Core; +use PhpMyAdmin\Core; +use PhpMyAdmin\DatabaseInterface; +use PMA\libraries\Table; use PMA\libraries\URL; use PMA\libraries\Util; diff --git a/libraries/DbSearch.php b/libraries/classes/DbSearch.php similarity index 99% rename from libraries/DbSearch.php rename to libraries/classes/DbSearch.php index aa6c8b6558..c8fdee8838 100644 --- a/libraries/DbSearch.php +++ b/libraries/classes/DbSearch.php @@ -5,9 +5,10 @@ * * @package PhpMyAdmin */ -namespace PMA\libraries; +namespace PhpMyAdmin; use PMA\libraries\URL; +use PMA\libraries\Util; use PMA\libraries\Sanitize; /** diff --git a/libraries/DisplayResults.php b/libraries/classes/DisplayResults.php similarity index 99% rename from libraries/DisplayResults.php rename to libraries/classes/DisplayResults.php index 46a0aa037c..c7811bf4bb 100644 --- a/libraries/DisplayResults.php +++ b/libraries/classes/DisplayResults.php @@ -1,19 +1,26 @@ transformation_info [$dbLower][$tblLower][$nameLower][1](null); - $transform_options = Transformations::getOptions( + $transform_options = Transformations::getOptions( isset($mime_map[$orgFullColName]['transformation_options']) ? $mime_map[$orgFullColName]['transformation_options'] : '' diff --git a/libraries/Encoding.php b/libraries/classes/Encoding.php similarity index 99% rename from libraries/Encoding.php rename to libraries/classes/Encoding.php index 2cc398c0c3..2764729faf 100644 --- a/libraries/Encoding.php +++ b/libraries/classes/Encoding.php @@ -1,13 +1,13 @@ count($Adest)) { array_pop($Ahere); - $result .= DIRECTORY_SEPARATOR . '..'; + $result .= DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..'; } else { array_pop($Adest); } diff --git a/libraries/ErrorHandler.php b/libraries/classes/ErrorHandler.php similarity index 99% rename from libraries/ErrorHandler.php rename to libraries/classes/ErrorHandler.php index 73a1cd6263..24633ff090 100644 --- a/libraries/ErrorHandler.php +++ b/libraries/classes/ErrorHandler.php @@ -1,13 +1,15 @@ _menuEnabled = true; $this->_warningsEnabled = true; $this->_isPrintView = false; - $this->_scripts = new Scripts(); + $this->_scripts = new Scripts(); $this->_addDefaultScripts(); $this->_headerIsSent = false; // if database storage for user preferences is transient, diff --git a/libraries/Index.php b/libraries/classes/Index.php similarity index 99% rename from libraries/Index.php rename to libraries/classes/Index.php index c6c814aab0..6d4553ed37 100644 --- a/libraries/Index.php +++ b/libraries/classes/Index.php @@ -5,10 +5,13 @@ * * @package PhpMyAdmin */ -namespace PMA\libraries; +namespace PhpMyAdmin; -use PMA\libraries\URL; +use PhpMyAdmin\IndexColumn; +use PMA\libraries\Message; use PMA\libraries\Sanitize; +use PMA\libraries\URL; +use PMA\libraries\Util; /** * Index manipulation class diff --git a/libraries/IndexColumn.php b/libraries/classes/IndexColumn.php similarity index 99% rename from libraries/IndexColumn.php rename to libraries/classes/IndexColumn.php index 2ca024b9db..6590ff0d41 100644 --- a/libraries/IndexColumn.php +++ b/libraries/classes/IndexColumn.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin */ -namespace PMA\libraries; +namespace PhpMyAdmin; /** * Index column wrapper diff --git a/libraries/Language.php b/libraries/classes/Language.php similarity index 97% rename from libraries/Language.php rename to libraries/classes/Language.php index 8dd53ed6be..7faa6f403c 100644 --- a/libraries/Language.php +++ b/libraries/classes/Language.php @@ -1,14 +1,13 @@ setCookie('pma_lang', $GLOBALS['lang']); if (isset($GLOBALS['collation_connection'])) { @@ -612,7 +612,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { // get LoginCookieValidity from preferences cache // no generic solution for loading preferences from cache as some settings // need to be kept for processing in - // PMA\libraries\Config::loadUserPreferences() + // PhpMyAdmin\Config::loadUserPreferences() $cache_key = 'server_' . $GLOBALS['server']; if (isset($_SESSION['cache'][$cache_key]['userprefs']['LoginCookieValidity']) ) { diff --git a/libraries/config/ConfigFile.php b/libraries/config/ConfigFile.php index 26a2843800..44de1196d9 100644 --- a/libraries/config/ConfigFile.php +++ b/libraries/config/ConfigFile.php @@ -7,8 +7,8 @@ */ namespace PMA\libraries\config; -use PMA\libraries\Config; -use PMA\libraries\Core; +use PhpMyAdmin\Config; +use PhpMyAdmin\Core; /** * Config file management class. @@ -78,7 +78,7 @@ class ConfigFile * Constructor * * @param array $base_config base configuration read from - * {@link PMA\libraries\Config::$base_config}, + * {@link PhpMyAdmin\Config::$base_config}, * use only when not in PMA Setup */ public function __construct(array $base_config = null) diff --git a/libraries/config/PageSettings.php b/libraries/config/PageSettings.php index fa9cbd95cf..aec1353600 100644 --- a/libraries/config/PageSettings.php +++ b/libraries/config/PageSettings.php @@ -7,7 +7,7 @@ */ namespace PMA\libraries\config; -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Message; use PMA\libraries\Response; diff --git a/libraries/config/ServerConfigChecks.php b/libraries/config/ServerConfigChecks.php index f63f70c8e9..43bd9397ba 100644 --- a/libraries/config/ServerConfigChecks.php +++ b/libraries/config/ServerConfigChecks.php @@ -7,7 +7,7 @@ */ namespace PMA\libraries\config; -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\URL; use PMA\libraries\Util; diff --git a/libraries/config/Validator.php b/libraries/config/Validator.php index 8dab95684e..eb816f11f7 100644 --- a/libraries/config/Validator.php +++ b/libraries/config/Validator.php @@ -7,8 +7,8 @@ */ namespace PMA\libraries\config; -use PMA\libraries\Core; -use PMA\libraries\DatabaseInterface; +use PhpMyAdmin\Core; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\Util; /** @@ -49,7 +49,7 @@ class Validator // not in setup script: load additional validators for user // preferences we need original config values not overwritten - // by user preferences, creating a new PMA\libraries\Config instance is a + // by user preferences, creating a new PhpMyAdmin\Config instance is a // better idea than hacking into its code $uvs = $cf->getDbEntry('_userValidators', array()); foreach ($uvs as $field => $uv_list) { diff --git a/libraries/controllers/Controller.php b/libraries/controllers/Controller.php index cbb1835762..2a38876f6e 100644 --- a/libraries/controllers/Controller.php +++ b/libraries/controllers/Controller.php @@ -7,7 +7,7 @@ */ namespace PMA\libraries\controllers; -use PMA\libraries\DatabaseInterface; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\di\Container; use PMA\libraries\Response; diff --git a/libraries/controllers/database/DatabaseStructureController.php b/libraries/controllers/database/DatabaseStructureController.php index e2f1018694..0b23da08ae 100644 --- a/libraries/controllers/database/DatabaseStructureController.php +++ b/libraries/controllers/database/DatabaseStructureController.php @@ -11,8 +11,8 @@ namespace PMA\libraries\controllers\database; use PMA\libraries\config\PageSettings; use PMA\libraries\controllers\DatabaseController; -use PMA\libraries\Charsets; -use PMA\libraries\Core; +use PhpMyAdmin\Charsets; +use PhpMyAdmin\Core; use PMA\libraries\Message; use PMA\libraries\RecentFavoriteTable; use PMA\libraries\Response; diff --git a/libraries/controllers/server/ServerBinlogController.php b/libraries/controllers/server/ServerBinlogController.php index 74fd565b76..ec87fccaad 100644 --- a/libraries/controllers/server/ServerBinlogController.php +++ b/libraries/controllers/server/ServerBinlogController.php @@ -10,7 +10,7 @@ namespace PMA\libraries\controllers\server; use PMA\libraries\controllers\Controller; -use PMA\libraries\DatabaseInterface; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\Message; use PMA\libraries\Util; use PMA\libraries\Template; diff --git a/libraries/controllers/server/ServerCollationsController.php b/libraries/controllers/server/ServerCollationsController.php index 9a5a7517bf..b1ab0f0292 100644 --- a/libraries/controllers/server/ServerCollationsController.php +++ b/libraries/controllers/server/ServerCollationsController.php @@ -10,7 +10,7 @@ namespace PMA\libraries\controllers\server; use PMA\libraries\controllers\Controller; -use PMA\libraries\Charsets; +use PhpMyAdmin\Charsets; use PMA\libraries\Template; /** diff --git a/libraries/controllers/server/ServerDatabasesController.php b/libraries/controllers/server/ServerDatabasesController.php index 7efbe50e28..4f8cb1f1cd 100644 --- a/libraries/controllers/server/ServerDatabasesController.php +++ b/libraries/controllers/server/ServerDatabasesController.php @@ -10,7 +10,7 @@ namespace PMA\libraries\controllers\server; use PMA\libraries\controllers\Controller; -use PMA\libraries\Charsets; +use PhpMyAdmin\Charsets; use PMA\libraries\Message; use PMA\libraries\Response; use PMA\libraries\Template; @@ -336,7 +336,7 @@ class ServerDatabasesController extends Controller $column_order = array(); $column_order['DEFAULT_COLLATION_NAME'] = array( 'disp_name' => __('Collation'), - 'description_function' => array('\PMA\libraries\Charsets', 'getCollationDescr'), + 'description_function' => array(Charsets::class, 'getCollationDescr'), 'format' => 'string', 'footer' => $this->dbi->getServerCollation(), ); diff --git a/libraries/controllers/table/TableGisVisualizationController.php b/libraries/controllers/table/TableGisVisualizationController.php index d7c430d78a..b8971a16d8 100644 --- a/libraries/controllers/table/TableGisVisualizationController.php +++ b/libraries/controllers/table/TableGisVisualizationController.php @@ -10,7 +10,7 @@ namespace PMA\libraries\controllers\table; use PMA\libraries\controllers\TableController; -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Message; use PMA\libraries\Template; use PMA\libraries\gis\GISVisualization; diff --git a/libraries/controllers/table/TableIndexesController.php b/libraries/controllers/table/TableIndexesController.php index 0664c45b85..062cd74441 100644 --- a/libraries/controllers/table/TableIndexesController.php +++ b/libraries/controllers/table/TableIndexesController.php @@ -10,7 +10,7 @@ namespace PMA\libraries\controllers\table; use PMA\libraries\controllers\TableController; -use PMA\libraries\Index; +use PhpMyAdmin\Index; use PMA\libraries\Message; use PMA\libraries\Template; use PMA\libraries\Util; diff --git a/libraries/controllers/table/TableRelationController.php b/libraries/controllers/table/TableRelationController.php index 9ffe8e1d33..25cc9a5b7e 100644 --- a/libraries/controllers/table/TableRelationController.php +++ b/libraries/controllers/table/TableRelationController.php @@ -9,9 +9,9 @@ namespace PMA\libraries\controllers\table; use PMA\libraries\controllers\TableController; -use PMA\libraries\Core; -use PMA\libraries\DatabaseInterface; -use PMA\libraries\Index; +use PhpMyAdmin\Core; +use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Index; use PMA\libraries\Table; use PMA\libraries\Template; use PMA\libraries\Util; diff --git a/libraries/controllers/table/TableSearchController.php b/libraries/controllers/table/TableSearchController.php index 8db5f794e9..6ab0e6986a 100644 --- a/libraries/controllers/table/TableSearchController.php +++ b/libraries/controllers/table/TableSearchController.php @@ -9,7 +9,7 @@ namespace PMA\libraries\controllers\table; use PMA\libraries\controllers\TableController; -use PMA\libraries\DatabaseInterface; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\Sql; use PMA\libraries\Template; use PMA\libraries\Util; diff --git a/libraries/controllers/table/TableStructureController.php b/libraries/controllers/table/TableStructureController.php index d64cd26fb2..31cfb0759c 100644 --- a/libraries/controllers/table/TableStructureController.php +++ b/libraries/controllers/table/TableStructureController.php @@ -14,8 +14,8 @@ use PhpMyAdmin\SqlParser\Statements\CreateStatement; use PhpMyAdmin\SqlParser\Utils\Table as SqlTable; use PMA\libraries\config\PageSettings; use PMA\libraries\controllers\TableController; -use PMA\libraries\Core; -use PMA\libraries\Index; +use PhpMyAdmin\Core; +use PhpMyAdmin\Index; use PMA\libraries\Message; use PMA\libraries\Sql; use PMA\libraries\Table; diff --git a/libraries/create_addfield.lib.php b/libraries/create_addfield.lib.php index 45508e7f77..bf5a192f46 100644 --- a/libraries/create_addfield.lib.php +++ b/libraries/create_addfield.lib.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Table; use PMA\libraries\Util; @@ -176,7 +176,7 @@ function PMA_buildIndexStatements($index, $index_choice, $type = $index['Index_type']; if ($index['Index_choice'] != 'SPATIAL' && $index['Index_choice'] != 'FULLTEXT' - && in_array($type, PMA\libraries\Index::getIndexTypes()) + && in_array($type, PhpMyAdmin\Index::getIndexTypes()) ) { $sql_query .= ' USING ' . $type; } diff --git a/libraries/database_interface.inc.php b/libraries/database_interface.inc.php index 5d734fb8c7..c8ffdcff04 100644 --- a/libraries/database_interface.inc.php +++ b/libraries/database_interface.inc.php @@ -7,10 +7,10 @@ * @package PhpMyAdmin-DBI */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\dbi\DBIDummy; use PMA\libraries\di\Container; -use PMA\libraries\DatabaseInterface; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\dbi\DBIMysql; use PMA\libraries\dbi\DBIMysqli; @@ -42,7 +42,7 @@ if (defined('TESTSUITE')) { if (PHP_VERSION_ID < 70000) { $extension = 'mysql'; - if (! PMA\libraries\DatabaseInterface::checkDbExtension($extension)) { + if (! PhpMyAdmin\DatabaseInterface::checkDbExtension($extension)) { // warn about both extensions missing and exit Core::warnMissingExtension( 'mysqli', diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php index 0e6c73c4b1..74a9bc0254 100644 --- a/libraries/db_common.inc.php +++ b/libraries/db_common.inc.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Message; use PMA\libraries\Response; use PMA\libraries\URL; diff --git a/libraries/db_designer.lib.php b/libraries/db_designer.lib.php index 10d8095782..c07e827dcc 100644 --- a/libraries/db_designer.lib.php +++ b/libraries/db_designer.lib.php @@ -85,7 +85,7 @@ function PMA_getPageIdsAndNames($db) . " WHERE db_name = '" . $GLOBALS['dbi']->escapeString($db) . "'" . " ORDER BY `page_descr`"; $page_rs = PMA_queryAsControlUser( - $page_query, false, PMA\libraries\DatabaseInterface::QUERY_STORE + $page_query, false, PhpMyAdmin\DatabaseInterface::QUERY_STORE ); $result = array(); diff --git a/libraries/db_table_exists.inc.php b/libraries/db_table_exists.inc.php index 562a85350e..ebdfa3bbce 100644 --- a/libraries/db_table_exists.inc.php +++ b/libraries/db_table_exists.inc.php @@ -7,7 +7,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Message; use PMA\libraries\Response; use PMA\libraries\URL; @@ -67,7 +67,7 @@ if (empty($is_table) $_result = $GLOBALS['dbi']->tryQuery( 'SHOW TABLES LIKE \'' . $GLOBALS['dbi']->escapeString($table) . '\';', - null, PMA\libraries\DatabaseInterface::QUERY_STORE + null, PhpMyAdmin\DatabaseInterface::QUERY_STORE ); $is_table = @$GLOBALS['dbi']->numRows($_result); $GLOBALS['dbi']->freeResult($_result); @@ -91,7 +91,7 @@ if (empty($is_table) 'SELECT COUNT(*) FROM ' . PMA\libraries\Util::backquote($table) . ';', null, - PMA\libraries\DatabaseInterface::QUERY_STORE + PhpMyAdmin\DatabaseInterface::QUERY_STORE ); $is_table = ($_result && @$GLOBALS['dbi']->numRows($_result)); $GLOBALS['dbi']->freeResult($_result); diff --git a/libraries/dbi/DBIMysql.php b/libraries/dbi/DBIMysql.php index 1b1236b420..0dea65820d 100644 --- a/libraries/dbi/DBIMysql.php +++ b/libraries/dbi/DBIMysql.php @@ -8,7 +8,7 @@ */ namespace PMA\libraries\dbi; -use PMA\libraries\DatabaseInterface; +use PhpMyAdmin\DatabaseInterface; if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/dbi/DBIMysqli.php b/libraries/dbi/DBIMysqli.php index d2207be61c..4e0bd663a7 100644 --- a/libraries/dbi/DBIMysqli.php +++ b/libraries/dbi/DBIMysqli.php @@ -8,7 +8,7 @@ */ namespace PMA\libraries\dbi; -use PMA\libraries\DatabaseInterface; +use PhpMyAdmin\DatabaseInterface; if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index b1b1fb0f4a..c131777138 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -7,8 +7,8 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; -use PMA\libraries\Encoding; +use PhpMyAdmin\Core; +use PhpMyAdmin\Encoding; use PMA\libraries\Message; use PMA\libraries\plugins\ExportPlugin; use PMA\libraries\Response; diff --git a/libraries/display_git_revision.lib.php b/libraries/display_git_revision.lib.php index 17a671ae19..13c5f3d556 100644 --- a/libraries/display_git_revision.lib.php +++ b/libraries/display_git_revision.lib.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Response; /** diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index 82d036e642..24cab70352 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -9,9 +9,9 @@ * @package PhpMyAdmin */ -use PMA\libraries\Charsets; -use PMA\libraries\Core; -use PMA\libraries\Encoding; +use PhpMyAdmin\Charsets; +use PhpMyAdmin\Core; +use PhpMyAdmin\Encoding; use PMA\libraries\Message; use PMA\libraries\plugins\ImportPlugin; use PMA\libraries\URL; diff --git a/libraries/display_import_ajax.lib.php b/libraries/display_import_ajax.lib.php index 67887ae854..6465014fc2 100644 --- a/libraries/display_import_ajax.lib.php +++ b/libraries/display_import_ajax.lib.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; /** * Sets up some variables for upload progress diff --git a/libraries/engines/Pbxt.php b/libraries/engines/Pbxt.php index d3058e37ba..e7a033ed04 100644 --- a/libraries/engines/Pbxt.php +++ b/libraries/engines/Pbxt.php @@ -8,7 +8,7 @@ namespace PMA\libraries\engines; use PMA; -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\StorageEngine; /** diff --git a/libraries/error_report.lib.php b/libraries/error_report.lib.php index 807520b108..7aa58e0c40 100644 --- a/libraries/error_report.lib.php +++ b/libraries/error_report.lib.php @@ -92,7 +92,7 @@ function PMA_getReportData($exception_type = 'js') return array(); } foreach ($_SESSION['prev_errors'] as $errorObj) { - /* @var $errorObj PMA\libraries\Error */ + /* @var $errorObj PhpMyAdmin\Error */ if ($errorObj->getLine() && $errorObj->getType() && $errorObj->getNumber() != E_USER_WARNING diff --git a/libraries/export.lib.php b/libraries/export.lib.php index 5f8643ef33..667ec8b8f0 100644 --- a/libraries/export.lib.php +++ b/libraries/export.lib.php @@ -6,7 +6,7 @@ * * @package PhpMyAdmin */ -use PMA\libraries\Encoding; +use PhpMyAdmin\Encoding; use PMA\libraries\Message; use PMA\libraries\plugins\ExportPlugin; use PMA\libraries\Table; diff --git a/libraries/gis/GISVisualization.php b/libraries/gis/GISVisualization.php index c9be03c95a..37f668f580 100644 --- a/libraries/gis/GISVisualization.php +++ b/libraries/gis/GISVisualization.php @@ -8,7 +8,7 @@ namespace PMA\libraries\gis; -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Util; use \TCPDF; use PMA\libraries\Sanitize; diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 6e0c60cd6a..38327a4b53 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Import */ -use PMA\libraries\Encoding; +use PhpMyAdmin\Encoding; use PMA\libraries\Message; use PMA\libraries\Response; use PMA\libraries\Table; diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php index 07594fbe0b..9bbf4cd1b6 100644 --- a/libraries/insert_edit.lib.php +++ b/libraries/insert_edit.lib.php @@ -87,7 +87,7 @@ function PMA_analyzeWhereClauses( . PMA\libraries\Util::backquote($table) . ' WHERE ' . $where_clause . ';'; $result[$key_id] = $GLOBALS['dbi']->query( - $local_query, null, PMA\libraries\DatabaseInterface::QUERY_STORE + $local_query, null, PhpMyAdmin\DatabaseInterface::QUERY_STORE ); $rows[$key_id] = $GLOBALS['dbi']->fetchAssoc($result[$key_id]); @@ -167,7 +167,7 @@ function PMA_loadFirstRow($table, $db) 'SELECT * FROM ' . PMA\libraries\Util::backquote($db) . '.' . PMA\libraries\Util::backquote($table) . ' LIMIT 1;', null, - PMA\libraries\DatabaseInterface::QUERY_STORE + PhpMyAdmin\DatabaseInterface::QUERY_STORE ); $rows = array_fill(0, $GLOBALS['cfg']['InsertRows'], false); return array($result, $rows); @@ -2091,7 +2091,7 @@ function PMA_getDisplayValueForForeignTableColumn($where_comparison, . ' WHERE ' . PMA\libraries\Util::backquote($foreigner['foreign_field']) . $where_comparison; $dispresult = $GLOBALS['dbi']->tryQuery( - $dispsql, null, PMA\libraries\DatabaseInterface::QUERY_STORE + $dispsql, null, PhpMyAdmin\DatabaseInterface::QUERY_STORE ); if ($dispresult && $GLOBALS['dbi']->numRows($dispresult) > 0) { list($dispval) = $GLOBALS['dbi']->fetchRow($dispresult, 0); diff --git a/libraries/ip_allow_deny.lib.php b/libraries/ip_allow_deny.lib.php index 1613b44156..87ea8125b1 100644 --- a/libraries/ip_allow_deny.lib.php +++ b/libraries/ip_allow_deny.lib.php @@ -7,7 +7,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; require_once './libraries/hash.lib.php'; /** diff --git a/libraries/normalization.lib.php b/libraries/normalization.lib.php index beb7003b84..07acc84a88 100644 --- a/libraries/normalization.lib.php +++ b/libraries/normalization.lib.php @@ -181,7 +181,7 @@ function PMA_getHtmlContentsFor1NFStep2($db, $table) { $step = 2; $stepTxt = __('Have a primary key'); - $primary = PMA\libraries\Index::getPrimary($table, $db); + $primary = PhpMyAdmin\Index::getPrimary($table, $db); $hasPrimaryKey = "0"; $legendText = __('Step 1.') . $step . " " . $stepTxt; $extra = ''; @@ -288,7 +288,7 @@ function PMA_getHtmlContentsFor1NFStep3($db, $table) . ''; - $primary = PMA\libraries\Index::getPrimary($table, $db); + $primary = PhpMyAdmin\Index::getPrimary($table, $db); $primarycols = $primary->getColumns(); $pk = array(); foreach ($primarycols as $col) { @@ -315,7 +315,7 @@ function PMA_getHtmlContentsFor1NFStep3($db, $table) function PMA_getHtmlFor2NFstep1($db, $table) { $legendText = __('Step 2.') . "1 " . __('Find partial dependencies'); - $primary = PMA\libraries\Index::getPrimary($table, $db); + $primary = PhpMyAdmin\Index::getPrimary($table, $db); $primarycols = $primary->getColumns(); $pk = array(); $subText = ''; @@ -521,7 +521,7 @@ function PMA_getHtmlForNewTables3NF($dependencies, $tables, $db) if (count(array_unique($arrDependson)) == 1) { continue; } - $primary = PMA\libraries\Index::getPrimary($table, $db); + $primary = PhpMyAdmin\Index::getPrimary($table, $db); $primarycols = $primary->getColumns(); $pk = array(); foreach ($primarycols as $col) { @@ -735,7 +735,7 @@ function PMA_getHtmlFor3NFstep1($db, $tables) ); $cnt = 0; foreach ($tables as $table) { - $primary = PMA\libraries\Index::getPrimary($table, $db); + $primary = PhpMyAdmin\Index::getPrimary($table, $db); $primarycols = $primary->getColumns(); $selectTdForm = ""; $pk = array(); @@ -847,7 +847,7 @@ function PMA_findPartialDependencies($table, $db) . Util::backquote($table) . ' LIMIT 500) as dt;' ); $totalRows = $totalRowsRes[0]; - $primary = PMA\libraries\Index::getPrimary($table, $db); + $primary = PhpMyAdmin\Index::getPrimary($table, $db); $primarycols = $primary->getColumns(); $pk = array(); foreach ($primarycols as $col) { diff --git a/libraries/operations.lib.php b/libraries/operations.lib.php index c6bac87eef..ba6487e812 100644 --- a/libraries/operations.lib.php +++ b/libraries/operations.lib.php @@ -6,8 +6,8 @@ * @package PhpMyAdmin */ use PMA\libraries\engines\Innodb; -use PMA\libraries\Charsets; -use PMA\libraries\Core; +use PhpMyAdmin\Charsets; +use PhpMyAdmin\Core; use PMA\libraries\Message; use PMA\libraries\Partition; use PMA\libraries\plugins\export\ExportSql; diff --git a/libraries/plugins/AuthenticationPlugin.php b/libraries/plugins/AuthenticationPlugin.php index 63f4cd187c..37e5b6c9a1 100644 --- a/libraries/plugins/AuthenticationPlugin.php +++ b/libraries/plugins/AuthenticationPlugin.php @@ -7,7 +7,7 @@ */ namespace PMA\libraries\plugins; -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Sanitize; use PMA\libraries\URL; diff --git a/libraries/plugins/auth/AuthenticationCookie.php b/libraries/plugins/auth/AuthenticationCookie.php index 2856ab0108..f3775661c6 100644 --- a/libraries/plugins/auth/AuthenticationCookie.php +++ b/libraries/plugins/auth/AuthenticationCookie.php @@ -9,13 +9,13 @@ namespace PMA\libraries\plugins\auth; use phpseclib\Crypt; -use PMA\libraries\LanguageManager; +use PhpMyAdmin\LanguageManager; use PMA\libraries\Message; use PMA\libraries\plugins\AuthenticationPlugin; use PMA\libraries\Response; use PMA\libraries\Util; -use PMA\libraries\Config; -use PMA\libraries\Core; +use PhpMyAdmin\Config; +use PhpMyAdmin\Core; use ReCaptcha; use PMA\libraries\URL; diff --git a/libraries/plugins/auth/AuthenticationHttp.php b/libraries/plugins/auth/AuthenticationHttp.php index 4595f64194..8b4df70543 100644 --- a/libraries/plugins/auth/AuthenticationHttp.php +++ b/libraries/plugins/auth/AuthenticationHttp.php @@ -12,8 +12,8 @@ namespace PMA\libraries\plugins\auth; use PMA\libraries\plugins\AuthenticationPlugin; use PMA\libraries\Message; use PMA\libraries\Response; -use PMA\libraries\Config; -use PMA\libraries\Core; +use PhpMyAdmin\Config; +use PhpMyAdmin\Core; require_once './libraries/hash.lib.php'; diff --git a/libraries/plugins/auth/AuthenticationSignon.php b/libraries/plugins/auth/AuthenticationSignon.php index f1e1685ddf..7d5a4d2347 100644 --- a/libraries/plugins/auth/AuthenticationSignon.php +++ b/libraries/plugins/auth/AuthenticationSignon.php @@ -8,7 +8,7 @@ */ namespace PMA\libraries\plugins\auth; -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\plugins\AuthenticationPlugin; use PMA; diff --git a/libraries/plugins/export/ExportCsv.php b/libraries/plugins/export/ExportCsv.php index 5548365879..97a561b15f 100644 --- a/libraries/plugins/export/ExportCsv.php +++ b/libraries/plugins/export/ExportCsv.php @@ -9,6 +9,7 @@ namespace PMA\libraries\plugins\export; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\properties\options\items\BoolPropertyItem; use PMA\libraries\plugins\ExportPlugin; use PMA\libraries\properties\plugins\ExportPluginProperties; @@ -228,7 +229,7 @@ class ExportCsv extends ExportPlugin $result = $GLOBALS['dbi']->query( $sql_query, null, - PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED + DatabaseInterface::QUERY_UNBUFFERED ); $fields_cnt = $GLOBALS['dbi']->numFields($result); diff --git a/libraries/plugins/export/ExportHtmlword.php b/libraries/plugins/export/ExportHtmlword.php index 09057a1fb5..7c1fb3ba93 100644 --- a/libraries/plugins/export/ExportHtmlword.php +++ b/libraries/plugins/export/ExportHtmlword.php @@ -8,7 +8,7 @@ */ namespace PMA\libraries\plugins\export; -use PMA\libraries\DatabaseInterface; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\plugins\ExportPlugin; use PMA\libraries\properties\plugins\ExportPluginProperties; use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; diff --git a/libraries/plugins/export/ExportJson.php b/libraries/plugins/export/ExportJson.php index 5f582d5619..860e7c7ba8 100644 --- a/libraries/plugins/export/ExportJson.php +++ b/libraries/plugins/export/ExportJson.php @@ -8,6 +8,7 @@ */ namespace PMA\libraries\plugins\export; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\properties\options\items\BoolPropertyItem; use PMA\libraries\plugins\ExportPlugin; use PMA\libraries\properties\plugins\ExportPluginProperties; @@ -236,7 +237,7 @@ class ExportJson extends ExportPlugin $result = $GLOBALS['dbi']->query( $sql_query, null, - PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED + DatabaseInterface::QUERY_UNBUFFERED ); $columns_cnt = $GLOBALS['dbi']->numFields($result); diff --git a/libraries/plugins/export/ExportLatex.php b/libraries/plugins/export/ExportLatex.php index 678c234245..bfd0c29778 100644 --- a/libraries/plugins/export/ExportLatex.php +++ b/libraries/plugins/export/ExportLatex.php @@ -8,7 +8,7 @@ */ namespace PMA\libraries\plugins\export; -use PMA\libraries\DatabaseInterface; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\plugins\ExportPlugin; use PMA\libraries\properties\plugins\ExportPluginProperties; use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; diff --git a/libraries/plugins/export/ExportMediawiki.php b/libraries/plugins/export/ExportMediawiki.php index d2d9dfb731..892103b73d 100644 --- a/libraries/plugins/export/ExportMediawiki.php +++ b/libraries/plugins/export/ExportMediawiki.php @@ -8,6 +8,7 @@ */ namespace PMA\libraries\plugins\export; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\properties\options\items\BoolPropertyItem; use PMA\libraries\plugins\ExportPlugin; use PMA\libraries\properties\plugins\ExportPluginProperties; @@ -329,7 +330,7 @@ class ExportMediawiki extends ExportPlugin $result = $GLOBALS['dbi']->query( $sql_query, null, - PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED + DatabaseInterface::QUERY_UNBUFFERED ); $fields_cnt = $GLOBALS['dbi']->numFields($result); diff --git a/libraries/plugins/export/ExportOds.php b/libraries/plugins/export/ExportOds.php index 87fb42a6a5..9d1870be75 100644 --- a/libraries/plugins/export/ExportOds.php +++ b/libraries/plugins/export/ExportOds.php @@ -14,7 +14,7 @@ use PMA\libraries\properties\plugins\ExportPluginProperties; use PMA\libraries\properties\options\items\HiddenPropertyItem; use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; -use PMA\libraries\DatabaseInterface; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\properties\options\items\TextPropertyItem; use PMA\libraries\OpenDocument; diff --git a/libraries/plugins/export/ExportOdt.php b/libraries/plugins/export/ExportOdt.php index 9852219673..9ce688fa05 100644 --- a/libraries/plugins/export/ExportOdt.php +++ b/libraries/plugins/export/ExportOdt.php @@ -8,7 +8,7 @@ */ namespace PMA\libraries\plugins\export; -use PMA\libraries\DatabaseInterface; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\plugins\ExportPlugin; use PMA\libraries\properties\plugins\ExportPluginProperties; use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; diff --git a/libraries/plugins/export/ExportPhparray.php b/libraries/plugins/export/ExportPhparray.php index b48c214748..030b89c8cb 100644 --- a/libraries/plugins/export/ExportPhparray.php +++ b/libraries/plugins/export/ExportPhparray.php @@ -9,6 +9,7 @@ namespace PMA\libraries\plugins\export; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\plugins\ExportPlugin; use PMA\libraries\properties\plugins\ExportPluginProperties; use PMA\libraries\properties\options\items\HiddenPropertyItem; @@ -181,7 +182,7 @@ class ExportPhparray extends ExportPlugin $result = $GLOBALS['dbi']->query( $sql_query, null, - PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED + DatabaseInterface::QUERY_UNBUFFERED ); $columns_cnt = $GLOBALS['dbi']->numFields($result); diff --git a/libraries/plugins/export/ExportSql.php b/libraries/plugins/export/ExportSql.php index eafb399180..fad8a88e5e 100644 --- a/libraries/plugins/export/ExportSql.php +++ b/libraries/plugins/export/ExportSql.php @@ -13,8 +13,8 @@ use PhpMyAdmin\SqlParser\Context; use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Statements\SelectStatement; use PhpMyAdmin\SqlParser\Token; -use PMA\libraries\Charsets; -use PMA\libraries\DatabaseInterface; +use PhpMyAdmin\Charsets; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\plugins\ExportPlugin; use PMA\libraries\properties\plugins\ExportPluginProperties; use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; @@ -1386,7 +1386,7 @@ class ExportSql extends ExportPlugin $compat = 'NONE'; } - // need to use PMA\libraries\DatabaseInterface::QUERY_STORE + // need to use PhpMyAdmin\DatabaseInterface::QUERY_STORE // with $GLOBALS['dbi']->numRows() in mysqli $result = $GLOBALS['dbi']->query( 'SHOW TABLE STATUS FROM ' . Util::backquote($db) diff --git a/libraries/plugins/export/ExportTexytext.php b/libraries/plugins/export/ExportTexytext.php index f8e0bbf09a..f3b0c375ab 100644 --- a/libraries/plugins/export/ExportTexytext.php +++ b/libraries/plugins/export/ExportTexytext.php @@ -8,7 +8,7 @@ */ namespace PMA\libraries\plugins\export; -use PMA\libraries\DatabaseInterface; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\plugins\ExportPlugin; use PMA\libraries\properties\plugins\ExportPluginProperties; use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; diff --git a/libraries/plugins/export/ExportXml.php b/libraries/plugins/export/ExportXml.php index be8970988d..47613218b4 100644 --- a/libraries/plugins/export/ExportXml.php +++ b/libraries/plugins/export/ExportXml.php @@ -13,7 +13,7 @@ use PMA\libraries\properties\plugins\ExportPluginProperties; use PMA\libraries\properties\options\items\HiddenPropertyItem; use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; -use PMA\libraries\DatabaseInterface; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\plugins\ExportPlugin; use PMA\libraries\Util; diff --git a/libraries/plugins/export/ExportYaml.php b/libraries/plugins/export/ExportYaml.php index 6689b864a8..d0f2b3d96d 100644 --- a/libraries/plugins/export/ExportYaml.php +++ b/libraries/plugins/export/ExportYaml.php @@ -9,6 +9,7 @@ namespace PMA\libraries\plugins\export; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\plugins\ExportPlugin; use PMA\libraries\properties\plugins\ExportPluginProperties; use PMA\libraries\properties\options\items\HiddenPropertyItem; @@ -157,7 +158,7 @@ class ExportYaml extends ExportPlugin $result = $GLOBALS['dbi']->query( $sql_query, null, - PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED + DatabaseInterface::QUERY_UNBUFFERED ); $columns_cnt = $GLOBALS['dbi']->numFields($result); diff --git a/libraries/plugins/export/helpers/Pdf.php b/libraries/plugins/export/helpers/Pdf.php index 62410a54d9..3269891d02 100644 --- a/libraries/plugins/export/helpers/Pdf.php +++ b/libraries/plugins/export/helpers/Pdf.php @@ -8,7 +8,7 @@ */ namespace PMA\libraries\plugins\export\helpers; -use PMA\libraries\DatabaseInterface; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\PDF as PdfLib; use PMA\libraries\Transformations; use PMA\libraries\Util; diff --git a/libraries/plugins/import/ImportSql.php b/libraries/plugins/import/ImportSql.php index 07744277d6..726de09542 100644 --- a/libraries/plugins/import/ImportSql.php +++ b/libraries/plugins/import/ImportSql.php @@ -172,7 +172,7 @@ class ImportSql extends ImportPlugin /** * Handle compatibility options * - * @param PMA\libraries\DatabaseInterface $dbi Database interface + * @param PhpMyAdmin\DatabaseInterface $dbi Database interface * @param array $request Request array * * @return void diff --git a/libraries/plugins/schema/ExportRelationSchema.php b/libraries/plugins/schema/ExportRelationSchema.php index ae203b2b28..43fb5feb18 100644 --- a/libraries/plugins/schema/ExportRelationSchema.php +++ b/libraries/plugins/schema/ExportRelationSchema.php @@ -8,8 +8,8 @@ */ namespace PMA\libraries\plugins\schema; -use PMA; use PMA\libraries\URL; +use PMA\libraries\Util; /** * This class is inherited by all schema classes @@ -262,8 +262,8 @@ class ExportRelationSchema // Get the name of this page to use as filename if ($this->pageNumber != -1 && !$this->offline) { $_name_sql = 'SELECT page_descr FROM ' - . PMA\libraries\Util::backquote($GLOBALS['cfgRelation']['db']) . '.' - . PMA\libraries\Util::backquote($GLOBALS['cfgRelation']['pdf_pages']) + . Util::backquote($GLOBALS['cfgRelation']['db']) . '.' + . Util::backquote($GLOBALS['cfgRelation']['pdf_pages']) . ' WHERE page_nr = ' . $this->pageNumber; $_name_rs = PMA_queryAsControlUser($_name_sql); $_name_row = $GLOBALS['dbi']->fetchRow($_name_rs); diff --git a/libraries/plugins/schema/TableStats.php b/libraries/plugins/schema/TableStats.php index 69fea39655..66df3c2e52 100644 --- a/libraries/plugins/schema/TableStats.php +++ b/libraries/plugins/schema/TableStats.php @@ -7,7 +7,9 @@ */ namespace PMA\libraries\plugins\schema; -use PMA; +use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Index; +use PMA\libraries\Util; /** * Table preferences/statistics @@ -78,16 +80,16 @@ abstract class TableStats */ protected function validateTableAndLoadFields() { - $sql = 'DESCRIBE ' . PMA\libraries\Util::backquote($this->tableName); + $sql = 'DESCRIBE ' . Util::backquote($this->tableName); $result = $GLOBALS['dbi']->tryQuery( - $sql, null, PMA\libraries\DatabaseInterface::QUERY_STORE + $sql, null, DatabaseInterface::QUERY_STORE ); if (! $result || ! $GLOBALS['dbi']->numRows($result)) { $this->showMissingTableError(); } if ($this->showKeys) { - $indexes = PMA\libraries\Index::getFromTable($this->tableName, $this->db); + $indexes = Index::getFromTable($this->tableName, $this->db); $all_columns = array(); foreach ($indexes as $index) { $all_columns = array_merge( @@ -145,8 +147,8 @@ abstract class TableStats protected function loadPrimaryKey() { $result = $GLOBALS['dbi']->query( - 'SHOW INDEX FROM ' . PMA\libraries\Util::backquote($this->tableName) . ';', - null, PMA\libraries\DatabaseInterface::QUERY_STORE + 'SHOW INDEX FROM ' . Util::backquote($this->tableName) . ';', + null, DatabaseInterface::QUERY_STORE ); if ($GLOBALS['dbi']->numRows($result) > 0) { while ($row = $GLOBALS['dbi']->fetchAssoc($result)) { diff --git a/libraries/plugins/schema/dia/Dia.php b/libraries/plugins/schema/dia/Dia.php index 9bd93c6436..469d8f971d 100644 --- a/libraries/plugins/schema/dia/Dia.php +++ b/libraries/plugins/schema/dia/Dia.php @@ -8,7 +8,7 @@ namespace PMA\libraries\plugins\schema\dia; use PMA; -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Response; use XMLWriter; diff --git a/libraries/plugins/schema/eps/Eps.php b/libraries/plugins/schema/eps/Eps.php index 3cf4034906..ca05197ca5 100644 --- a/libraries/plugins/schema/eps/Eps.php +++ b/libraries/plugins/schema/eps/Eps.php @@ -7,7 +7,7 @@ */ namespace PMA\libraries\plugins\schema\eps; -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Response; /** diff --git a/libraries/plugins/schema/eps/TableStatsEps.php b/libraries/plugins/schema/eps/TableStatsEps.php index c53cb883dc..9d4a3c2a0c 100644 --- a/libraries/plugins/schema/eps/TableStatsEps.php +++ b/libraries/plugins/schema/eps/TableStatsEps.php @@ -7,6 +7,7 @@ */ namespace PMA\libraries\plugins\schema\eps; +use PhpMyAdmin\Font; use PMA; use PMA\libraries\plugins\schema\ExportRelationSchema; use PMA\libraries\plugins\schema\TableStats; @@ -108,10 +109,10 @@ class TableStatsEps extends TableStats foreach ($this->fields as $field) { $this->width = max( $this->width, - PMA\libraries\Font::getStringWidth($field, $font, $fontSize) + Font::getStringWidth($field, $font, $fontSize) ); } - $this->width += PMA\libraries\Font::getStringWidth( + $this->width += Font::getStringWidth( ' ', $font, $fontSize @@ -121,7 +122,7 @@ class TableStatsEps extends TableStats * table title is affected by the table width value */ while ($this->width - < PMA\libraries\Font::getStringWidth( + < Font::getStringWidth( $this->getTitle(), $font, $fontSize diff --git a/libraries/plugins/schema/svg/Svg.php b/libraries/plugins/schema/svg/Svg.php index 75ffe8b00c..897c897eac 100644 --- a/libraries/plugins/schema/svg/Svg.php +++ b/libraries/plugins/schema/svg/Svg.php @@ -8,7 +8,7 @@ namespace PMA\libraries\plugins\schema\svg; use PMA; -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Response; use XMLWriter; diff --git a/libraries/plugins/schema/svg/TableStatsSvg.php b/libraries/plugins/schema/svg/TableStatsSvg.php index 7675d5badc..4239fdb256 100644 --- a/libraries/plugins/schema/svg/TableStatsSvg.php +++ b/libraries/plugins/schema/svg/TableStatsSvg.php @@ -7,6 +7,7 @@ */ namespace PMA\libraries\plugins\schema\svg; +use PhpMyAdmin\Font; use PMA; use PMA\libraries\plugins\schema\ExportRelationSchema; use PMA\libraries\plugins\schema\TableStats; @@ -109,17 +110,17 @@ class TableStatsSvg extends TableStats foreach ($this->fields as $field) { $this->width = max( $this->width, - PMA\libraries\Font::getStringWidth($field, $font, $fontSize) + Font::getStringWidth($field, $font, $fontSize) ); } - $this->width += PMA\libraries\Font::getStringWidth(' ', $font, $fontSize); + $this->width += Font::getStringWidth(' ', $font, $fontSize); /* * it is unknown what value must be added, because * table title is affected by the table width value */ while ($this->width - < PMA\libraries\Font::getStringWidth($this->getTitle(), $font, $fontSize) + < Font::getStringWidth($this->getTitle(), $font, $fontSize) ) { $this->width += 7; } diff --git a/libraries/pmd_common.php b/libraries/pmd_common.php index 67f7ee7894..4af26bbcd3 100644 --- a/libraries/pmd_common.php +++ b/libraries/pmd_common.php @@ -92,7 +92,7 @@ function PMA_getColumnsInfo() true ), null, - PMA\libraries\DatabaseInterface::QUERY_STORE + PhpMyAdmin\DatabaseInterface::QUERY_STORE ); $tbl_name_i = $GLOBALS['PMD']['TABLE_NAME'][$i]; $j = 0; @@ -121,7 +121,7 @@ function PMA_getScriptContr() $alltab_rs = $GLOBALS['dbi']->query( 'SHOW TABLES FROM ' . PMA\libraries\Util::backquote($GLOBALS['db']), null, - PMA\libraries\DatabaseInterface::QUERY_STORE + PhpMyAdmin\DatabaseInterface::QUERY_STORE ); while ($val = @$GLOBALS['dbi']->fetchRow($alltab_rs)) { $row = PMA_getForeigners($GLOBALS['db'], $val[0], '', 'internal'); @@ -203,7 +203,7 @@ function PMA_getAllKeys($unique_only = false) foreach ($GLOBALS['PMD']['TABLE_NAME_SMALL'] as $I => $table) { $schema = $GLOBALS['PMD']['OWNER'][$I]; // for now, take into account only the first index segment - foreach (PMA\libraries\Index::getFromTable($table, $schema) as $index) { + foreach (PhpMyAdmin\Index::getFromTable($table, $schema) as $index) { if ($unique_only && ! $index->isUnique()) { continue; } @@ -268,7 +268,7 @@ function PMA_getTablePositions($pg) 'name', null, $GLOBALS['controllink'], - PMA\libraries\DatabaseInterface::QUERY_STORE + PhpMyAdmin\DatabaseInterface::QUERY_STORE ); return $tab_pos; } @@ -296,7 +296,7 @@ function PMA_getPageName($pg) null, null, $GLOBALS['controllink'], - PMA\libraries\DatabaseInterface::QUERY_STORE + PhpMyAdmin\DatabaseInterface::QUERY_STORE ); return count($page_name) ? $page_name[0] : null; } @@ -319,7 +319,7 @@ function PMA_deletePage($pg) . "." . PMA\libraries\Util::backquote($cfgRelation['table_coords']) . " WHERE " . PMA\libraries\Util::backquote('pdf_page_number') . " = " . intval($pg); $success = PMA_queryAsControlUser( - $query, true, PMA\libraries\DatabaseInterface::QUERY_STORE + $query, true, PhpMyAdmin\DatabaseInterface::QUERY_STORE ); if ($success) { @@ -327,7 +327,7 @@ function PMA_deletePage($pg) . "." . PMA\libraries\Util::backquote($cfgRelation['pdf_pages']) . " WHERE " . PMA\libraries\Util::backquote('page_nr') . " = " . intval($pg); $success = PMA_queryAsControlUser( - $query, true, PMA\libraries\DatabaseInterface::QUERY_STORE + $query, true, PhpMyAdmin\DatabaseInterface::QUERY_STORE ); } @@ -360,7 +360,7 @@ function PMA_getDefaultPage($db) null, null, $GLOBALS['controllink'], - PMA\libraries\DatabaseInterface::QUERY_STORE + PhpMyAdmin\DatabaseInterface::QUERY_STORE ); if (count($default_page_no)) { @@ -400,7 +400,7 @@ function PMA_getLoadingPage($db) null, null, $GLOBALS['controllink'], - PMA\libraries\DatabaseInterface::QUERY_STORE + PhpMyAdmin\DatabaseInterface::QUERY_STORE ); if (count($min_page_no[0])) { $page_no = $min_page_no[0]; @@ -458,7 +458,7 @@ function PMA_saveTablePositions($pg) $res = PMA_queryAsControlUser( $query, true, - PMA\libraries\DatabaseInterface::QUERY_STORE + PhpMyAdmin\DatabaseInterface::QUERY_STORE ); if (!$res) { @@ -483,7 +483,7 @@ function PMA_saveTablePositions($pg) . "'" . $GLOBALS['dbi']->escapeString($_REQUEST['t_y'][$key]) . "')"; $res = PMA_queryAsControlUser( - $query, true, PMA\libraries\DatabaseInterface::QUERY_STORE + $query, true, PhpMyAdmin\DatabaseInterface::QUERY_STORE ); } @@ -630,7 +630,7 @@ function PMA_addNewRelation($db, $T1, $F1, $T2, $F2, $on_delete, $on_update) . "'" . $GLOBALS['dbi']->escapeString($T1) . "', " . "'" . $GLOBALS['dbi']->escapeString($F1) . "')"; - if (PMA_queryAsControlUser($q, false, PMA\libraries\DatabaseInterface::QUERY_STORE) + if (PMA_queryAsControlUser($q, false, PhpMyAdmin\DatabaseInterface::QUERY_STORE) ) { return array(true, __('Internal relationship has been added.')); } @@ -702,7 +702,7 @@ function PMA_removeRelation($T1, $F1, $T2, $F2) $result = PMA_queryAsControlUser( $delete_query, false, - PMA\libraries\DatabaseInterface::QUERY_STORE + PhpMyAdmin\DatabaseInterface::QUERY_STORE ); if (!$result) { diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index fbdea1c003..732ef5b6b0 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Message; use PMA\libraries\Table; use PMA\libraries\RecentFavoriteTable; @@ -510,7 +510,7 @@ function PMA_checkRelationsParam() $GLOBALS['cfg']['Server']['pmadb'] ); $tab_rs = PMA_queryAsControlUser( - $tab_query, false, PMA\libraries\DatabaseInterface::QUERY_STORE + $tab_query, false, PhpMyAdmin\DatabaseInterface::QUERY_STORE ); if (! $tab_rs) { @@ -688,7 +688,7 @@ function PMA_tryUpgradeTransformations() ) . ' WHERE Field IN (\'' . implode('\', \'', $new_cols) . '\')'; $result = PMA_queryAsControlUser( - $query, false, PMA\libraries\DatabaseInterface::QUERY_STORE + $query, false, PhpMyAdmin\DatabaseInterface::QUERY_STORE ); if ($result) { $rows = $GLOBALS['dbi']->numRows($result); @@ -936,7 +936,7 @@ function PMA_getDbComment($db) AND table_name = '' AND column_name = '(db_comment)'"; $com_rs = PMA_queryAsControlUser( - $com_qry, true, PMA\libraries\DatabaseInterface::QUERY_STORE + $com_qry, true, PhpMyAdmin\DatabaseInterface::QUERY_STORE ); if ($com_rs && $GLOBALS['dbi']->numRows($com_rs) > 0) { @@ -970,7 +970,7 @@ function PMA_getDbComments() . " WHERE `column_name` = '(db_comment)'"; $com_rs = PMA_queryAsControlUser( - $com_qry, true, PMA\libraries\DatabaseInterface::QUERY_STORE + $com_qry, true, PhpMyAdmin\DatabaseInterface::QUERY_STORE ); if ($com_rs && $GLOBALS['dbi']->numRows($com_rs) > 0) { diff --git a/libraries/replication.inc.php b/libraries/replication.inc.php index cb93944849..76a9c7889d 100644 --- a/libraries/replication.inc.php +++ b/libraries/replication.inc.php @@ -6,8 +6,8 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; -use PMA\libraries\DatabaseInterface; +use PhpMyAdmin\Core; +use PhpMyAdmin\DatabaseInterface; if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php index 9ca7c34fdb..1810ef6844 100644 --- a/libraries/replication_gui.lib.php +++ b/libraries/replication_gui.lib.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Message; use PMA\libraries\Response; use PMA\libraries\URL; diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index 654371eede..2f38fbe693 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -5,8 +5,8 @@ * * @package PhpMyAdmin */ -use PMA\libraries\Charsets; -use PMA\libraries\Core; +use PhpMyAdmin\Charsets; +use PhpMyAdmin\Core; use PMA\libraries\Message; use PMA\libraries\Response; use PMA\libraries\Util; @@ -73,7 +73,7 @@ function PMA_RTN_main($type) /** * Display a warning for users with PHP's old "mysql" extension. */ - if (! PMA\libraries\DatabaseInterface::checkDbExtension('mysqli')) { + if (! PhpMyAdmin\DatabaseInterface::checkDbExtension('mysqli')) { trigger_error( __( 'You are using PHP\'s deprecated \'mysql\' extension, ' diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php index eb6a9f4e1d..2068e24f40 100644 --- a/libraries/server_privileges.lib.php +++ b/libraries/server_privileges.lib.php @@ -6,8 +6,8 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; -use PMA\libraries\DatabaseInterface; +use PhpMyAdmin\Core; +use PhpMyAdmin\DatabaseInterface; use PMA\libraries\Message; use PMA\libraries\Response; use PMA\libraries\Template; @@ -3709,7 +3709,7 @@ function PMA_getHtmlForInitials($array_initials) 'SELECT DISTINCT UPPER(LEFT(`User`,1)) FROM `user`' . ' ORDER BY UPPER(LEFT(`User`,1)) ASC', null, - PMA\libraries\DatabaseInterface::QUERY_STORE + PhpMyAdmin\DatabaseInterface::QUERY_STORE ); if ($initials) { while (list($tmp_initial) = $GLOBALS['dbi']->fetchRow($initials)) { @@ -4587,10 +4587,10 @@ function PMA_getHtmlForUserOverview($pmaThemeImage, $text_dir) $sql_query_all .= ' ;'; $res = $GLOBALS['dbi']->tryQuery( - $sql_query, null, PMA\libraries\DatabaseInterface::QUERY_STORE + $sql_query, null, PhpMyAdmin\DatabaseInterface::QUERY_STORE ); $res_all = $GLOBALS['dbi']->tryQuery( - $sql_query_all, null, PMA\libraries\DatabaseInterface::QUERY_STORE + $sql_query_all, null, PhpMyAdmin\DatabaseInterface::QUERY_STORE ); if (! $res) { @@ -4603,7 +4603,7 @@ function PMA_getHtmlForUserOverview($pmaThemeImage, $text_dir) $GLOBALS['dbi']->freeResult($res_all); $sql_query = 'SELECT * FROM `mysql`.`user`'; $res = $GLOBALS['dbi']->tryQuery( - $sql_query, null, PMA\libraries\DatabaseInterface::QUERY_STORE + $sql_query, null, PhpMyAdmin\DatabaseInterface::QUERY_STORE ); if (! $res) { @@ -4829,7 +4829,7 @@ function PMA_getTablePrivsQueriesForChangeOrCopyUser($user_host_condition, 'SELECT `Db`, `Table_name`, `Table_priv` FROM `mysql`.`tables_priv`' . $user_host_condition, $GLOBALS['userlink'], - PMA\libraries\DatabaseInterface::QUERY_STORE + PhpMyAdmin\DatabaseInterface::QUERY_STORE ); while ($row = $GLOBALS['dbi']->fetchAssoc($res)) { @@ -4846,7 +4846,7 @@ function PMA_getTablePrivsQueriesForChangeOrCopyUser($user_host_condition, . ' = \'' . $GLOBALS['dbi']->escapeString($row['Table_name']) . "'" . ';', null, - PMA\libraries\DatabaseInterface::QUERY_STORE + PhpMyAdmin\DatabaseInterface::QUERY_STORE ); $tmp_privs1 = PMA_extractPrivInfo($row); diff --git a/libraries/server_status_advisor.lib.php b/libraries/server_status_advisor.lib.php index 3f23c8f25a..0b27de674b 100644 --- a/libraries/server_status_advisor.lib.php +++ b/libraries/server_status_advisor.lib.php @@ -9,7 +9,7 @@ */ /** - * Returns html with PMA\libraries\Advisor + * Returns html with PhpMyAdmin\Advisor * * @return string */ @@ -50,7 +50,7 @@ function PMA_getHtmlForAdvisor() $output .= '

    '; $output .= ''; $output .= '
    '; - $advisor = new PMA\libraries\Advisor(); + $advisor = new PhpMyAdmin\Advisor(); $output .= htmlspecialchars( json_encode( $advisor->run() diff --git a/libraries/session.inc.php b/libraries/session.inc.php index b0addbcc11..cf32c779ce 100644 --- a/libraries/session.inc.php +++ b/libraries/session.inc.php @@ -9,7 +9,7 @@ * @see https://secure.php.net/session */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; if (! defined('PHPMYADMIN')) { exit; @@ -84,7 +84,7 @@ session_cache_limiter('private'); /** * Session failed function * - * @param array $errors PMA\libraries\ErrorHandler array + * @param array $errors PhpMyAdmin\ErrorHandler array * * @return void */ diff --git a/libraries/session.lib.php b/libraries/session.lib.php index 62b0820883..d784e27edb 100644 --- a/libraries/session.lib.php +++ b/libraries/session.lib.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Util; /** diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index 3f945879c1..9033e359e7 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -10,9 +10,9 @@ * @usedby tbl_tracking.php * @package PhpMyAdmin */ -use PMA\libraries\Encoding; +use PhpMyAdmin\Encoding; use PMA\libraries\URL; -use PMA\libraries\Bookmark; +use PhpMyAdmin\Bookmark; if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php index 57fefedacb..afc0fcd66a 100644 --- a/libraries/tbl_columns_definition_form.inc.php +++ b/libraries/tbl_columns_definition_form.inc.php @@ -90,7 +90,7 @@ $comments_map = PMA_getComments($db, $table); $move_columns = array(); if (isset($fields_meta)) { - /** @var PMA\libraries\DatabaseInterface $dbi */ + /** @var PhpMyAdmin\DatabaseInterface $dbi */ $dbi = \PMA\libraries\di\Container::getDefaultContainer()->get('dbi'); $move_columns = $dbi->getTable($db, $table)->getColumnsMeta(); } diff --git a/libraries/tbl_partition_definition.inc.php b/libraries/tbl_partition_definition.inc.php index 8e2ae09e5e..1ef4a9db6c 100644 --- a/libraries/tbl_partition_definition.inc.php +++ b/libraries/tbl_partition_definition.inc.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; if (!isset($partitionDetails)) { diff --git a/libraries/tracking.lib.php b/libraries/tracking.lib.php index d6e0522a34..f410e3dfb0 100644 --- a/libraries/tracking.lib.php +++ b/libraries/tracking.lib.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Message; use PMA\libraries\Response; use PMA\libraries\Tracker; diff --git a/libraries/twig/CharsetsExtension.php b/libraries/twig/CharsetsExtension.php index dfbcb09add..49d1ca58b1 100644 --- a/libraries/twig/CharsetsExtension.php +++ b/libraries/twig/CharsetsExtension.php @@ -27,7 +27,7 @@ class CharsetsExtension extends Twig_Extension return array( new Twig_SimpleFunction( 'Charsets_getCollationDescr', - 'PMA\libraries\Charsets::getCollationDescr' + 'PhpMyAdmin\Charsets::getCollationDescr' ), ); } diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php index f86bf7bdf7..3cbc5810f9 100644 --- a/libraries/user_preferences.lib.php +++ b/libraries/user_preferences.lib.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ use PMA\libraries\config\ConfigFile; -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Message; use PMA\libraries\URL; diff --git a/lint.php b/lint.php index 0f3cb21095..5bb3b3e324 100644 --- a/lint.php +++ b/lint.php @@ -6,8 +6,8 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; -use PMA\libraries\Linter; +use PhpMyAdmin\Core; +use PhpMyAdmin\Linter; use PMA\libraries\Response; $_GET['ajax_request'] = 'true'; diff --git a/logout.php b/logout.php index ff31a307a1..e715ed16e3 100644 --- a/logout.php +++ b/logout.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; require_once 'libraries/common.inc.php'; diff --git a/normalization.php b/normalization.php index 48cb46a165..f5d6f5bf45 100644 --- a/normalization.php +++ b/normalization.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\URL; use PMA\libraries\Response; diff --git a/prefs_forms.php b/prefs_forms.php index 5ee6be0da2..f4d866d9bc 100644 --- a/prefs_forms.php +++ b/prefs_forms.php @@ -7,7 +7,7 @@ */ use PMA\libraries\config\ConfigFile; use PMA\libraries\config\FormDisplay; -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Response; use PMA\libraries\URL; diff --git a/prefs_manage.php b/prefs_manage.php index 726392641e..c5e987a582 100644 --- a/prefs_manage.php +++ b/prefs_manage.php @@ -7,8 +7,8 @@ */ use PMA\libraries\config\ConfigFile; use PMA\libraries\config\FormDisplay; -use PMA\libraries\Core; -use PMA\libraries\File; +use PhpMyAdmin\Core; +use PhpMyAdmin\File; use PMA\libraries\Message; use PMA\libraries\Response; use PMA\libraries\Util; diff --git a/schema_export.php b/schema_export.php index 210facbea0..5ceff249ad 100644 --- a/schema_export.php +++ b/schema_export.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\plugins\SchemaPlugin; /** diff --git a/scripts/advisor2po b/scripts/advisor2po index fe0b34b0d2..128a5ecf50 100644 --- a/scripts/advisor2po +++ b/scripts/advisor2po @@ -15,7 +15,7 @@ function add_message($rules, $idx, $type) { global $messages, $locations; // Get message text if ($type == 'justification') { - $msgs = PMA\libraries\Advisor::splitJustification($rules['rules'][$idx]); + $msgs = PhpMyAdmin\Advisor::splitJustification($rules['rules'][$idx]); $msg = $msgs[0]; } else { $msg = $rules['rules'][$idx][$type]; @@ -43,7 +43,7 @@ function print_message($idx) { echo '#, php-format'; echo "\n"; } - echo 'msgid "' . addcslashes(PMA\libraries\Advisor::escapePercent($messages[$idx]), '"\\') . '"'; + echo 'msgid "' . addcslashes(PhpMyAdmin\Advisor::escapePercent($messages[$idx]), '"\\') . '"'; echo "\n"; echo 'msgstr ""'; echo "\n"; @@ -53,7 +53,7 @@ define('PHPMYADMIN', 1); require_once 'libraries/vendor_config.php'; require_once AUTOLOAD_FILE; -$rules = PMA\libraries\Advisor::parseRulesFile(); +$rules = PhpMyAdmin\Advisor::parseRulesFile(); foreach($rules['rules'] as $idx => $rule) { add_message($rules, $idx, 'name'); diff --git a/scripts/create-release.sh b/scripts/create-release.sh index 22c43baec0..69ce6189ba 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -131,7 +131,7 @@ if [ $do_ci -eq 0 -a -$do_daily -eq 0 ] ; then cat <set( 'PMA_VERSION', '$version' ); " - in doc/conf.py the line " version = '$version' " @@ -444,7 +444,7 @@ Todo now: based on documentation. 6. increment rc count or version in the repository : - - in $CONFIG_LIB PMA\libraries\Config::__constructor() the line + - in $CONFIG_LIB PhpMyAdmin\Config::__constructor() the line " \$this->set( 'PMA_VERSION', '2.7.1-dev' ); " - in Documentation.html (if it exists) the 2 lines " phpMyAdmin 2.2.2-rc1 - Documentation " diff --git a/server_privileges.php b/server_privileges.php index 170e923c45..e43f8c3df5 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Response; /** diff --git a/setup/config.php b/setup/config.php index b5a2d5c6d4..c41391dae7 100644 --- a/setup/config.php +++ b/setup/config.php @@ -7,7 +7,7 @@ */ use PMA\libraries\config\FormDisplay; use PMA\setup\lib\ConfigGenerator; -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\URL; use PMA\libraries\Response; diff --git a/setup/frames/config.inc.php b/setup/frames/config.inc.php index e7c3c3bb76..fc4de3bf35 100644 --- a/setup/frames/config.inc.php +++ b/setup/frames/config.inc.php @@ -7,7 +7,7 @@ */ use PMA\setup\lib\ConfigGenerator; -use PMA\libraries\Core; +use PhpMyAdmin\Core; if (!defined('PHPMYADMIN')) { exit; diff --git a/setup/frames/form.inc.php b/setup/frames/form.inc.php index 9d64f660dd..9cf80405f3 100644 --- a/setup/frames/form.inc.php +++ b/setup/frames/form.inc.php @@ -7,7 +7,7 @@ */ use PMA\libraries\config\FormDisplay; -use PMA\libraries\Core; +use PhpMyAdmin\Core; if (!defined('PHPMYADMIN')) { exit; diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php index 1405a4a17c..55fe3de9b0 100644 --- a/setup/frames/index.inc.php +++ b/setup/frames/index.inc.php @@ -9,8 +9,8 @@ use PMA\libraries\config\ConfigFile; use PMA\libraries\config\FormDisplay; use PMA\libraries\config\ServerConfigChecks; -use PMA\libraries\Core; -use PMA\libraries\LanguageManager; +use PhpMyAdmin\Core; +use PhpMyAdmin\LanguageManager; use PMA\libraries\URL; use PMA\libraries\Sanitize; diff --git a/setup/frames/servers.inc.php b/setup/frames/servers.inc.php index 1784525202..0a36674ea3 100644 --- a/setup/frames/servers.inc.php +++ b/setup/frames/servers.inc.php @@ -8,7 +8,7 @@ use PMA\libraries\config\ConfigFile; use PMA\libraries\config\FormDisplay; -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\URL; if (!defined('PHPMYADMIN')) { diff --git a/setup/index.php b/setup/index.php index 39ec3d8c64..84dd1429d1 100644 --- a/setup/index.php +++ b/setup/index.php @@ -7,7 +7,7 @@ * @license https://www.gnu.org/licenses/gpl.html GNU GPL 2.0 */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; /** * Core libraries. diff --git a/setup/lib/form_processing.lib.php b/setup/lib/form_processing.lib.php index b6f393e256..2316b4f371 100644 --- a/setup/lib/form_processing.lib.php +++ b/setup/lib/form_processing.lib.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin-Setup */ use PMA\libraries\config\FormDisplay; -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\URL; use PMA\libraries\Response; diff --git a/setup/validate.php b/setup/validate.php index 70df31a4cf..cbfe619992 100644 --- a/setup/validate.php +++ b/setup/validate.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin-Setup */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; /** * Core libraries. diff --git a/tbl_create.php b/tbl_create.php index 1beffcb3c7..d3f35da948 100644 --- a/tbl_create.php +++ b/tbl_create.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\Response; use PMA\libraries\Transformations; use PMA\libraries\URL; diff --git a/tbl_get_field.php b/tbl_get_field.php index 384eae91ef..7ab8936412 100644 --- a/tbl_get_field.php +++ b/tbl_get_field.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; /** * Common functions. diff --git a/tbl_indexes.php b/tbl_indexes.php index 467e6289fd..362c6416d0 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -9,7 +9,7 @@ namespace PMA; use PMA\libraries\controllers\table\TableIndexesController; -use PMA\libraries\Index; +use PhpMyAdmin\Index; use PMA\libraries\Response; require_once 'libraries/common.inc.php'; diff --git a/tbl_operations.php b/tbl_operations.php index a8e977fb83..1f3073f621 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -308,7 +308,7 @@ $hideOrderTable = false; // a user-defined clustered index (PRIMARY KEY or NOT NULL UNIQUE index). // InnoDB always orders table rows according to such an index if one is present. if ($tbl_storage_engine == 'INNODB') { - $indexes = PMA\libraries\Index::getFromTable($GLOBALS['table'], $GLOBALS['db']); + $indexes = PhpMyAdmin\Index::getFromTable($GLOBALS['table'], $GLOBALS['db']); foreach ($indexes as $name => $idx) { if ($name == 'PRIMARY') { $hideOrderTable = true; diff --git a/tbl_replace.php b/tbl_replace.php index e608c83fa5..84a6685f14 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -12,7 +12,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Core; +use PhpMyAdmin\Core; use PMA\libraries\plugins\IOTransformationsPlugin; use PMA\libraries\Response; use PMA\libraries\Table; @@ -206,7 +206,7 @@ foreach ($loop_array as $rownumber => $where_clause) { // Note: $key is an md5 of the fieldname. The actual fieldname is // available in $multi_edit_columns_name[$key] - $file_to_insert = new PMA\libraries\File(); + $file_to_insert = new PhpMyAdmin\File(); $file_to_insert->checkTblChangeForm($key, $rownumber); $possibly_uploaded_val = $file_to_insert->getContent(); diff --git a/templates/columns_definitions/column_attributes.phtml b/templates/columns_definitions/column_attributes.phtml index 97f8636346..dd3084c1f9 100644 --- a/templates/columns_definitions/column_attributes.phtml +++ b/templates/columns_definitions/column_attributes.phtml @@ -54,7 +54,7 @@ $ci_offset = -1; -   - - + diff --git a/templates/database/structure/show_create_row.phtml b/templates/database/structure/show_create_row.phtml index e73c7ad350..824e928a23 100644 --- a/templates/database/structure/show_create_row.phtml +++ b/templates/database/structure/show_create_row.phtml @@ -1,4 +1,4 @@ - +
    diff --git a/templates/database/structure/sortable_header.phtml b/templates/database/structure/sortable_header.phtml index f96c3e4560..48a5357abc 100644 --- a/templates/database/structure/sortable_header.phtml +++ b/templates/database/structure/sortable_header.phtml @@ -1,5 +1,5 @@ " maxlength="64" class="textfield" id="text_create_db" required placeholder="" /> - getServerCollation(), true); ?> + getServerCollation(), true); ?> diff --git a/templates/table/relation/foreign_key_row.phtml b/templates/table/relation/foreign_key_row.phtml index 8bcfea93e8..b743bf86a4 100644 --- a/templates/table/relation/foreign_key_row.phtml +++ b/templates/table/relation/foreign_key_row.phtml @@ -1,5 +1,5 @@ get('PMA_VERSION')); define('PMA_MAJOR_VERSION', $CFG->get('PMA_MAJOR_VERSION')); unset($CFG); /* Ensure default langauge is active */ -PMA\libraries\LanguageManager::getInstance()->getLanguage('en')->activate(); +PhpMyAdmin\LanguageManager::getInstance()->getLanguage('en')->activate(); // Set proxy information from env, if available $http_proxy = getenv('http_proxy'); diff --git a/test/classes/AdvisorTest.php b/test/classes/AdvisorTest.php index ccff7ca6ba..c6449d9dea 100644 --- a/test/classes/AdvisorTest.php +++ b/test/classes/AdvisorTest.php @@ -11,7 +11,7 @@ */ require_once 'test/PMATestCase.php'; -use PMA\libraries\Advisor; +use PhpMyAdmin\Advisor; use PMA\libraries\Theme; /** diff --git a/test/classes/BookmarkTest.php b/test/classes/BookmarkTest.php index 4d491b69d5..a27b656156 100644 --- a/test/classes/BookmarkTest.php +++ b/test/classes/BookmarkTest.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-test */ -use PMA\libraries\Bookmark; +use PhpMyAdmin\Bookmark; require_once 'libraries/database_interface.inc.php'; require_once 'libraries/relation.lib.php'; diff --git a/test/classes/CharsetsTest.php b/test/classes/CharsetsTest.php index b55a00468a..ea0036dfca 100644 --- a/test/classes/CharsetsTest.php +++ b/test/classes/CharsetsTest.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-test */ +use PhpMyAdmin\Charsets; + /** * Tests for MySQL Charsets * @@ -19,7 +21,7 @@ class CharsetsTest extends PHPUnit_Framework_TestCase } /** - * Test case for PMA\libraries\Charsets::getCollationDescr() + * Test case for getCollationDescr() * * @param string $collation Collation for which description is reqd * @param string $desc Expected Description @@ -32,7 +34,7 @@ class CharsetsTest extends PHPUnit_Framework_TestCase { $this->assertEquals( $desc, - PMA\libraries\Charsets::getCollationDescr($collation) + Charsets::getCollationDescr($collation) ); } @@ -137,14 +139,14 @@ class CharsetsTest extends PHPUnit_Framework_TestCase } /** - * Test for PMA\libraries\Charsets::getCollationDropdownBox + * Test for getCollationDropdownBox * * @return void * @test */ public function testGetCollationDropdownBox() { - $result = PMA\libraries\Charsets::getCollationDropdownBox(); + $result = Charsets::getCollationDropdownBox(); $this->assertContains('name="collation"', $result); $this->assertNotContains('id="', $result); @@ -159,14 +161,14 @@ class CharsetsTest extends PHPUnit_Framework_TestCase } /** - * Test for PMA\libraries\Charsets::getCharsetDropdownBox + * Test for getCharsetDropdownBox * * @return void * @test */ public function testGetCharsetDropdownBox() { - $result = PMA\libraries\Charsets::getCharsetDropdownBox( + $result = Charsets::getCharsetDropdownBox( null, "test_id", "latin1", false, true ); $this->assertContains('name="character_set"', $result); @@ -176,4 +178,3 @@ class CharsetsTest extends PHPUnit_Framework_TestCase $this->assertContains('selected="selected">latin1', $result); } } - diff --git a/test/classes/ConfigGeneratorTest.php b/test/classes/ConfigGeneratorTest.php index 59c42fe97a..a302e84cab 100644 --- a/test/classes/ConfigGeneratorTest.php +++ b/test/classes/ConfigGeneratorTest.php @@ -9,7 +9,7 @@ /* * Include to test */ -use PMA\libraries\Config; +use PhpMyAdmin\Config; use PMA\libraries\config\ConfigFile; use PMA\setup\lib\ConfigGenerator; diff --git a/test/classes/ConfigTest.php b/test/classes/ConfigTest.php index 1cb7a0f4a7..f6e6c74658 100644 --- a/test/classes/ConfigTest.php +++ b/test/classes/ConfigTest.php @@ -1,7 +1,7 @@ object = new PMA\libraries\Config; + $this->object = new PhpMyAdmin\Config; $GLOBALS['server'] = 0; $_SESSION['is_git_revision'] = true; - $GLOBALS['PMA_Config'] = new PMA\libraries\Config(CONFIG_FILE); + $GLOBALS['PMA_Config'] = new PhpMyAdmin\Config(CONFIG_FILE); $GLOBALS['cfg']['ProxyUrl'] = ''; //for testing file permissions - $this->permTestObj = new PMA\libraries\Config("./config.sample.inc.php"); + $this->permTestObj = new PhpMyAdmin\Config("./config.sample.inc.php"); } /** @@ -91,12 +91,12 @@ class ConfigTest extends PMATestCase { $this->assertContains( 'assertContains( '