diff options
160 files changed, 253 insertions, 249 deletions
@@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\Util; require_once 'libraries/common.inc.php'; diff --git a/browse_foreigners.php b/browse_foreigners.php index d1b39822a1..fee84276a2 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin */ -use PMA\libraries\Response; +use PhpMyAdmin\Response; require_once 'libraries/common.inc.php'; require_once 'libraries/browse_foreigners.lib.php'; diff --git a/changelog.php b/changelog.php index 46a16df325..da1b7a7629 100644 --- a/changelog.php +++ b/changelog.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin */ -use PMA\libraries\Response; +use PhpMyAdmin\Response; /** * Gets core libraries and defines some variables diff --git a/chk_rel.php b/chk_rel.php index 759e442d17..3ba2323429 100644 --- a/chk_rel.php +++ b/chk_rel.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin */ -use PMA\libraries\Response; +use PhpMyAdmin\Response; require_once 'libraries/common.inc.php'; diff --git a/db_central_columns.php b/db_central_columns.php index 30030387b1..19feb92033 100644 --- a/db_central_columns.php +++ b/db_central_columns.php @@ -9,7 +9,7 @@ use PhpMyAdmin\Core; use PMA\libraries\URL; -use PMA\libraries\Response; +use PhpMyAdmin\Response; /** * Gets some core libraries diff --git a/db_datadict.php b/db_datadict.php index cf3f66d6a1..3ca83dbb1c 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\Transformations; use PMA\libraries\URL; diff --git a/db_designer.php b/db_designer.php index 8dc35aa5de..17b7c92690 100644 --- a/db_designer.php +++ b/db_designer.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Designer */ -use PMA\libraries\Response; +use PhpMyAdmin\Response; require_once 'libraries/common.inc.php'; require_once 'libraries/pmd_common.php'; diff --git a/db_export.php b/db_export.php index 1235dcca5b..ad5cf43f35 100644 --- a/db_export.php +++ b/db_export.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ use PMA\libraries\config\PageSettings; -use PMA\libraries\Response; +use PhpMyAdmin\Response; /** * Gets some core libraries diff --git a/db_import.php b/db_import.php index 34bc300cc9..f9c1cf94d7 100644 --- a/db_import.php +++ b/db_import.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\config\PageSettings; require_once 'libraries/common.inc.php'; diff --git a/db_operations.php b/db_operations.php index fa257fe248..657827ffd8 100644 --- a/db_operations.php +++ b/db_operations.php @@ -11,7 +11,7 @@ * * @package PhpMyAdmin */ -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\plugins\export\ExportSql; /** @@ -177,7 +177,7 @@ if (strlen($GLOBALS['db']) > 0 /** * Database has been successfully renamed/moved. If in an Ajax request, - * generate the output with {@link PMA\libraries\Response} and exit + * generate the output with {@link PhpMyAdmin\Response} and exit */ if ($response->isAjax()) { $response->setRequestStatus($message->isSuccess()); diff --git a/db_qbe.php b/db_qbe.php index 06d82cb777..52071b3daf 100644 --- a/db_qbe.php +++ b/db_qbe.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\SavedSearches; use PMA\libraries\Sql; use PMA\libraries\URL; diff --git a/db_search.php b/db_search.php index 2ebf417223..d8ce462f81 100644 --- a/db_search.php +++ b/db_search.php @@ -13,7 +13,7 @@ */ require_once 'libraries/common.inc.php'; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PhpMyAdmin\DbSearch; $response = Response::getInstance(); diff --git a/db_sql.php b/db_sql.php index 208794bc6b..291b74f853 100644 --- a/db_sql.php +++ b/db_sql.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ use PMA\libraries\config\PageSettings; -use PMA\libraries\Response; +use PhpMyAdmin\Response; /** * diff --git a/db_sql_autocomplete.php b/db_sql_autocomplete.php index 1557da9ec3..0fe4ae6fbd 100644 --- a/db_sql_autocomplete.php +++ b/db_sql_autocomplete.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Response; +use PhpMyAdmin\Response; require_once 'libraries/common.inc.php'; if ($GLOBALS['cfg']['EnableAutocompleteForTablesAndColumns']) { diff --git a/db_sql_format.php b/db_sql_format.php index 4af11f83e4..dd3c2b86d9 100644 --- a/db_sql_format.php +++ b/db_sql_format.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin */ -use PMA\libraries\Response; +use PhpMyAdmin\Response; /** * Loading common files. Used to check for authorization, localization and to diff --git a/db_structure.php b/db_structure.php index cfcb01d404..ce406f8358 100644 --- a/db_structure.php +++ b/db_structure.php @@ -9,7 +9,7 @@ namespace PMA; use PMA\libraries\controllers\database\DatabaseStructureController; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\Util; require_once 'libraries/common.inc.php'; @@ -23,8 +23,8 @@ $container->alias( 'DatabaseStructureController', 'PMA\libraries\controllers\database\DatabaseStructureController' ); -$container->set('PMA\libraries\Response', Response::getInstance()); -$container->alias('response', 'PMA\libraries\Response'); +$container->set('PhpMyAdmin\Response', Response::getInstance()); +$container->alias('response', 'PhpMyAdmin\Response'); /* Define dependencies for the concerned controller */ $dependency_definitions = array( diff --git a/db_tracking.php b/db_tracking.php index 99869563c3..1b7d9bbc5b 100644 --- a/db_tracking.php +++ b/db_tracking.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin */ -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\Tracker; /** diff --git a/error_report.php b/error_report.php index d2e7305582..3176744bac 100644 --- a/error_report.php +++ b/error_report.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin */ -use PMA\libraries\Response; +use PhpMyAdmin\Response; require_once 'libraries/common.inc.php'; require_once 'libraries/error_report.lib.php'; require_once 'libraries/user_preferences.lib.php'; diff --git a/export.php b/export.php index 6001c4c753..a5940fcf73 100644 --- a/export.php +++ b/export.php @@ -17,7 +17,7 @@ use PMA\libraries\Sanitize; */ /** * If we are sending the export file (as opposed to just displaying it - * as text), we have to bypass the usual PMA\libraries\Response mechanism + * as text), we have to bypass the usual PhpMyAdmin\Response mechanism */ if (isset($_POST['output_format']) && $_POST['output_format'] == 'sendit') { define('PMA_BYPASS_GET_INSTANCE', 1); diff --git a/gis_data_editor.php b/gis_data_editor.php index a3ec478170..09a9a09eb3 100644 --- a/gis_data_editor.php +++ b/gis_data_editor.php @@ -9,7 +9,7 @@ use PhpMyAdmin\Core; use PMA\libraries\gis\GISFactory; use PMA\libraries\gis\GISVisualization; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\URL; /** diff --git a/import.php b/import.php index 0cf09ff002..d47f9adbc6 100644 --- a/import.php +++ b/import.php @@ -11,7 +11,7 @@ use PhpMyAdmin\Core; use PhpMyAdmin\Encoding; use PhpMyAdmin\File; use PMA\libraries\plugins\ImportPlugin; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\Sql; use PMA\libraries\URL; @@ -10,8 +10,8 @@ use PhpMyAdmin\Charsets; use PhpMyAdmin\Core; use PhpMyAdmin\LanguageManager; use PhpMyAdmin\Message; -use PMA\libraries\RecentFavoriteTable; -use PMA\libraries\Response; +use PhpMyAdmin\RecentFavoriteTable; +use PhpMyAdmin\Response; use PMA\libraries\Sanitize; use PMA\libraries\ThemeManager; use PMA\libraries\URL; diff --git a/js/get_image.js.php b/js/get_image.js.php index 5d8fc5480a..d2a6e83ce2 100644 --- a/js/get_image.js.php +++ b/js/get_image.js.php @@ -21,12 +21,12 @@ if (!defined('TESTSUITE')) { require_once './libraries/common.inc.php'; } -$buffer = PMA\libraries\OutputBuffering::getInstance(); +$buffer = PhpMyAdmin\OutputBuffering::getInstance(); $buffer->start(); if (!defined('TESTSUITE')) { register_shutdown_function( function () { - echo PMA\libraries\OutputBuffering::getInstance()->getContents(); + echo PhpMyAdmin\OutputBuffering::getInstance()->getContents(); } ); } diff --git a/js/get_scripts.js.php b/js/get_scripts.js.php index 1edbc143f7..7fb36f5d41 100644 --- a/js/get_scripts.js.php +++ b/js/get_scripts.js.php @@ -29,12 +29,12 @@ if (!defined('TESTSUITE')) { require_once './libraries/common.inc.php'; } -$buffer = PMA\libraries\OutputBuffering::getInstance(); +$buffer = PhpMyAdmin\OutputBuffering::getInstance(); $buffer->start(); if (!defined('TESTSUITE')) { register_shutdown_function( function () { - echo PMA\libraries\OutputBuffering::getInstance()->getContents(); + echo PhpMyAdmin\OutputBuffering::getInstance()->getContents(); } ); } diff --git a/js/messages.php b/js/messages.php index fdac14fb9d..dc9d64a9ad 100644 --- a/js/messages.php +++ b/js/messages.php @@ -29,12 +29,12 @@ if (!defined('TESTSUITE')) { use PMA\libraries\Sanitize; -$buffer = PMA\libraries\OutputBuffering::getInstance(); +$buffer = PhpMyAdmin\OutputBuffering::getInstance(); $buffer->start(); if (!defined('TESTSUITE')) { register_shutdown_function( function () { - echo PMA\libraries\OutputBuffering::getInstance()->getContents(); + echo PhpMyAdmin\OutputBuffering::getInstance()->getContents(); } ); } diff --git a/js/whitelist.php b/js/whitelist.php index b9ebf4eb77..366a948477 100644 --- a/js/whitelist.php +++ b/js/whitelist.php @@ -25,12 +25,12 @@ if (!defined('TESTSUITE')) { session_write_close(); } -$buffer = PMA\libraries\OutputBuffering::getInstance(); +$buffer = PhpMyAdmin\OutputBuffering::getInstance(); $buffer->start(); if (!defined('TESTSUITE')) { register_shutdown_function( function () { - echo PMA\libraries\OutputBuffering::getInstance()->getContents(); + echo PhpMyAdmin\OutputBuffering::getInstance()->getContents(); } ); } diff --git a/libraries/Sql.php b/libraries/Sql.php index 1c7004dce2..aa68d5e1c0 100644 --- a/libraries/Sql.php +++ b/libraries/Sql.php @@ -17,7 +17,7 @@ use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\DisplayResults; use PhpMyAdmin\Index; use PhpMyAdmin\Message; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\Table; use PMA\libraries\Transformations; use PMA\libraries\URL; diff --git a/libraries/classes/Bookmark.php b/libraries/classes/Bookmark.php index 565f37b5b0..ccb1aac599 100644 --- a/libraries/classes/Bookmark.php +++ b/libraries/classes/Bookmark.php @@ -7,8 +7,8 @@ */ namespace PhpMyAdmin; -use PMA\libraries\Util; use PhpMyAdmin\DatabaseInterface; +use PMA\libraries\Util; /** * Handles bookmarking SQL queries diff --git a/libraries/classes/Core.php b/libraries/classes/Core.php index 4f9a1d1f70..1f42732bcf 100644 --- a/libraries/classes/Core.php +++ b/libraries/classes/Core.php @@ -11,7 +11,7 @@ namespace PhpMyAdmin; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Message; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\Sanitize; use PMA\libraries\Template; use PMA\libraries\URL; diff --git a/libraries/classes/DbSearch.php b/libraries/classes/DbSearch.php index c8fdee8838..e1b70009e8 100644 --- a/libraries/classes/DbSearch.php +++ b/libraries/classes/DbSearch.php @@ -7,9 +7,9 @@ */ namespace PhpMyAdmin; +use PMA\libraries\Sanitize; use PMA\libraries\URL; use PMA\libraries\Util; -use PMA\libraries\Sanitize; /** * Class to handle database search diff --git a/libraries/classes/DisplayResults.php b/libraries/classes/DisplayResults.php index f23af65ea8..dc313264af 100644 --- a/libraries/classes/DisplayResults.php +++ b/libraries/classes/DisplayResults.php @@ -7,15 +7,15 @@ */ namespace PhpMyAdmin; -use PhpMyAdmin\SqlParser\Utils\Query; use PhpMyAdmin\Core; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Index; use PhpMyAdmin\Message; use PMA\libraries\plugins\transformations\Text_Plain_Link; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\Sanitize; use PMA\libraries\Sql; +use PhpMyAdmin\SqlParser\Utils\Query; use PMA\libraries\Table; use PMA\libraries\Template; use PMA\libraries\Transformations; diff --git a/libraries/classes/Encoding.php b/libraries/classes/Encoding.php index 2764729faf..fd14ff05a4 100644 --- a/libraries/classes/Encoding.php +++ b/libraries/classes/Encoding.php @@ -7,8 +7,8 @@ */ namespace PhpMyAdmin; -use PhpMyAdmin\Core; use PMA\libraries\config\ConfigFile; +use PhpMyAdmin\Core; /** * Encoding conversion helper class diff --git a/libraries/classes/ErrorHandler.php b/libraries/classes/ErrorHandler.php index 24633ff090..5507f07692 100644 --- a/libraries/classes/ErrorHandler.php +++ b/libraries/classes/ErrorHandler.php @@ -8,7 +8,7 @@ namespace PhpMyAdmin; use PhpMyAdmin\Error; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\URL; /** diff --git a/libraries/classes/Footer.php b/libraries/classes/Footer.php index 0d63e758f2..3b045b636b 100644 --- a/libraries/classes/Footer.php +++ b/libraries/classes/Footer.php @@ -10,7 +10,7 @@ namespace PhpMyAdmin; use PhpMyAdmin\Config; use PhpMyAdmin\Core; use PhpMyAdmin\Message; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\Sanitize; use PMA\libraries\Scripts; use PMA\libraries\URL; diff --git a/libraries/classes/Header.php b/libraries/classes/Header.php index 650b5609be..816ae7815e 100644 --- a/libraries/classes/Header.php +++ b/libraries/classes/Header.php @@ -13,7 +13,7 @@ use PhpMyAdmin\Core; use PhpMyAdmin\Menu; use PhpMyAdmin\Message; use PMA\libraries\navigation\Navigation; -use PMA\libraries\RecentFavoriteTable; +use PhpMyAdmin\RecentFavoriteTable; use PMA\libraries\Sanitize; use PMA\libraries\Scripts; use PMA\libraries\URL; diff --git a/libraries/OpenDocument.php b/libraries/classes/OpenDocument.php index fa8a729985..e47b46ec02 100644 --- a/libraries/OpenDocument.php +++ b/libraries/classes/OpenDocument.php @@ -5,8 +5,7 @@ * * @package PhpMyAdmin */ -namespace PMA\libraries; - +namespace PhpMyAdmin; use PMA\libraries\ZipFile; diff --git a/libraries/OutputBuffering.php b/libraries/classes/OutputBuffering.php index f232cf2b14..a38839b750 100644 --- a/libraries/OutputBuffering.php +++ b/libraries/classes/OutputBuffering.php @@ -4,7 +4,7 @@ * * @package PhpMyAdmin */ -namespace PMA\libraries; +namespace PhpMyAdmin; /** * Output buffering wrapper class @@ -88,7 +88,7 @@ class OutputBuffering header('X-ob_mode: ' . $this->_mode); } register_shutdown_function( - array('PMA\libraries\OutputBuffering', 'stop') + array(OutputBuffering::class, 'stop') ); $this->_on = true; } @@ -135,4 +135,3 @@ class OutputBuffering } } } - diff --git a/libraries/Partition.php b/libraries/classes/Partition.php index 141dcb7b33..6006cb3041 100644 --- a/libraries/Partition.php +++ b/libraries/classes/Partition.php @@ -5,7 +5,9 @@ * * @package PhpMyAdmin */ -namespace PMA\libraries; +namespace PhpMyAdmin; + +use PMA\libraries\SubPartition; /** * base Partition Class diff --git a/libraries/PDF.php b/libraries/classes/Pdf.php index 56cfd2b979..d0911a3ff9 100644 --- a/libraries/PDF.php +++ b/libraries/classes/Pdf.php @@ -5,9 +5,12 @@ * * @package PhpMyAdmin */ -namespace PMA\libraries; +namespace PhpMyAdmin; use PhpMyAdmin\Core; +use PhpMyAdmin\Message; +use PhpMyAdmin\Response; +use PMA\libraries\Util; use TCPDF; use TCPDF_FONTS; @@ -16,7 +19,7 @@ use TCPDF_FONTS; * * @package PhpMyAdmin */ -class PDF extends TCPDF +class Pdf extends TCPDF { var $footerset; var $Alias = array(); @@ -50,8 +53,8 @@ class PDF extends TCPDF $this->SetAuthor('phpMyAdmin ' . PMA_VERSION); $this->AddFont('DejaVuSans', '', 'dejavusans.php'); $this->AddFont('DejaVuSans', 'B', 'dejavusansb.php'); - $this->SetFont(PDF::PMA_PDF_FONT, '', 14); - $this->setFooterFont(array(PDF::PMA_PDF_FONT, '', 14)); + $this->SetFont(Pdf::PMA_PDF_FONT, '', 14); + $this->setFooterFont(array(Pdf::PMA_PDF_FONT, '', 14)); } /** @@ -65,7 +68,7 @@ class PDF extends TCPDF // Check if footer for this page already exists if (!isset($this->footerset[$this->page])) { $this->SetY(-15); - $this->SetFont(PDF::PMA_PDF_FONT, '', 14); + $this->SetFont(Pdf::PMA_PDF_FONT, '', 14); $this->Cell( 0, 6, __('Page number:') . ' ' diff --git a/libraries/RecentFavoriteTable.php b/libraries/classes/RecentFavoriteTable.php index c2f11ffddd..2bfa2c816c 100644 --- a/libraries/RecentFavoriteTable.php +++ b/libraries/classes/RecentFavoriteTable.php @@ -5,9 +5,11 @@ * * @package PhpMyAdmin */ -namespace PMA\libraries; +namespace PhpMyAdmin; +use PhpMyAdmin\Message; use PMA\libraries\URL; +use PMA\libraries\Util; /** * Handles the recently used and favorite tables. diff --git a/libraries/Response.php b/libraries/classes/Response.php index cd7ea5385a..b49b346e85 100644 --- a/libraries/Response.php +++ b/libraries/classes/Response.php @@ -5,11 +5,13 @@ * * @package PhpMyAdmin */ -namespace PMA\libraries; +namespace PhpMyAdmin; use PhpMyAdmin\Core; use PhpMyAdmin\Footer; use PhpMyAdmin\Header; +use PhpMyAdmin\Message; +use PhpMyAdmin\OutputBuffering; /** * Singleton class used to manage the rendering of pages in PMA diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 1ff477f358..dc4f18a19d 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -40,7 +40,7 @@ use PMA\libraries\plugins\AuthenticationPlugin; use PhpMyAdmin\DbList; use PMA\libraries\ThemeManager; use PMA\libraries\Tracker; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\TypesMySQL; use PMA\libraries\Util; use PhpMyAdmin\LanguageManager; diff --git a/libraries/config/PageSettings.php b/libraries/config/PageSettings.php index d4e3612c41..4c6ddf682b 100644 --- a/libraries/config/PageSettings.php +++ b/libraries/config/PageSettings.php @@ -9,7 +9,7 @@ namespace PMA\libraries\config; use PhpMyAdmin\Core; use PhpMyAdmin\Message; -use PMA\libraries\Response; +use PhpMyAdmin\Response; require_once 'libraries/user_preferences.lib.php'; require_once 'libraries/config/config_functions.lib.php'; diff --git a/libraries/controllers/Controller.php b/libraries/controllers/Controller.php index 2a38876f6e..43577b1369 100644 --- a/libraries/controllers/Controller.php +++ b/libraries/controllers/Controller.php @@ -9,7 +9,7 @@ namespace PMA\libraries\controllers; use PhpMyAdmin\DatabaseInterface; use PMA\libraries\di\Container; -use PMA\libraries\Response; +use PhpMyAdmin\Response; require_once 'libraries/database_interface.inc.php'; diff --git a/libraries/controllers/database/DatabaseStructureController.php b/libraries/controllers/database/DatabaseStructureController.php index b80acfb4c9..0769533d9a 100644 --- a/libraries/controllers/database/DatabaseStructureController.php +++ b/libraries/controllers/database/DatabaseStructureController.php @@ -14,8 +14,8 @@ use PMA\libraries\controllers\DatabaseController; use PhpMyAdmin\Charsets; use PhpMyAdmin\Core; use PhpMyAdmin\Message; -use PMA\libraries\RecentFavoriteTable; -use PMA\libraries\Response; +use PhpMyAdmin\RecentFavoriteTable; +use PhpMyAdmin\Response; use PMA\libraries\Template; use PMA\libraries\Tracker; use PMA\libraries\Util; diff --git a/libraries/controllers/server/ServerDatabasesController.php b/libraries/controllers/server/ServerDatabasesController.php index e6a45c1cde..5af28aa417 100644 --- a/libraries/controllers/server/ServerDatabasesController.php +++ b/libraries/controllers/server/ServerDatabasesController.php @@ -12,7 +12,7 @@ namespace PMA\libraries\controllers\server; use PMA\libraries\controllers\Controller; use PhpMyAdmin\Charsets; use PhpMyAdmin\Message; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\Template; use PMA\libraries\Util; use PMA\libraries\URL; diff --git a/libraries/controllers/server/ServerVariablesController.php b/libraries/controllers/server/ServerVariablesController.php index a9c24cb230..4dc714c150 100644 --- a/libraries/controllers/server/ServerVariablesController.php +++ b/libraries/controllers/server/ServerVariablesController.php @@ -11,7 +11,7 @@ namespace PMA\libraries\controllers\server; use PMA\libraries\controllers\Controller; use PhpMyAdmin\Message; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\Template; use PMA\libraries\Util; use PMA\libraries\URL; diff --git a/libraries/controllers/table/TableChartController.php b/libraries/controllers/table/TableChartController.php index 7024dfa730..4084f69cdd 100644 --- a/libraries/controllers/table/TableChartController.php +++ b/libraries/controllers/table/TableChartController.php @@ -11,7 +11,7 @@ namespace PMA\libraries\controllers\table; use PMA\libraries\controllers\TableController; use PhpMyAdmin\Message; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\Template; use PMA\libraries\Util; use PMA\libraries\Table; diff --git a/libraries/controllers/table/TableIndexesController.php b/libraries/controllers/table/TableIndexesController.php index f4a1ae6aba..2d93866378 100644 --- a/libraries/controllers/table/TableIndexesController.php +++ b/libraries/controllers/table/TableIndexesController.php @@ -14,7 +14,7 @@ use PhpMyAdmin\Index; use PhpMyAdmin\Message; use PMA\libraries\Template; use PMA\libraries\Util; -use PMA\libraries\Response; +use PhpMyAdmin\Response; /** diff --git a/libraries/controllers/table/TableStructureController.php b/libraries/controllers/table/TableStructureController.php index 3cfa16872c..f93ee83b3d 100644 --- a/libraries/controllers/table/TableStructureController.php +++ b/libraries/controllers/table/TableStructureController.php @@ -1465,7 +1465,7 @@ class TableStructureController extends TableController break; case 'change': $this->displayHtmlForColumnChange($selected, $action); - // execution stops here but PMA\libraries\Response correctly finishes + // execution stops here but PhpMyAdmin\Response correctly finishes // the rendering exit; case 'browse': diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php index 494e09c949..0526c53ed8 100644 --- a/libraries/db_common.inc.php +++ b/libraries/db_common.inc.php @@ -8,7 +8,7 @@ use PhpMyAdmin\Core; use PhpMyAdmin\Message; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\URL; use PMA\libraries\Util; diff --git a/libraries/db_table_exists.inc.php b/libraries/db_table_exists.inc.php index 867de382f5..bf4f235d19 100644 --- a/libraries/db_table_exists.inc.php +++ b/libraries/db_table_exists.inc.php @@ -9,7 +9,7 @@ use PhpMyAdmin\Core; use PhpMyAdmin\Message; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\URL; if (! defined('PHPMYADMIN')) { diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index 045ca9aa11..356a1bdfe7 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -11,7 +11,7 @@ use PhpMyAdmin\Core; use PhpMyAdmin\Encoding; use PhpMyAdmin\Message; use PMA\libraries\plugins\ExportPlugin; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\Table; use PMA\libraries\Template; use PMA\libraries\URL; diff --git a/libraries/display_git_revision.lib.php b/libraries/display_git_revision.lib.php index 13c5f3d556..eca8b55895 100644 --- a/libraries/display_git_revision.lib.php +++ b/libraries/display_git_revision.lib.php @@ -7,7 +7,7 @@ */ use PhpMyAdmin\Core; -use PMA\libraries\Response; +use PhpMyAdmin\Response; /** * Prints details about the current Git commit revision diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 56f330203c..ee87f84783 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -7,7 +7,7 @@ */ use PhpMyAdmin\Encoding; use PhpMyAdmin\Message; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\Table; use PMA\libraries\Util; use PMA\libraries\URL; diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php index f6cacf4b15..794ffc5358 100644 --- a/libraries/insert_edit.lib.php +++ b/libraries/insert_edit.lib.php @@ -7,7 +7,7 @@ */ use PhpMyAdmin\Message; use PMA\libraries\plugins\TransformationsPlugin; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\Sanitize; use PMA\libraries\Transformations; use PMA\libraries\URL; diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index bfa1ad66de..10aeb2a2c8 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -7,7 +7,7 @@ */ use PhpMyAdmin\Message; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\Sql; if (! defined('PHPMYADMIN')) { diff --git a/libraries/navigation/Navigation.php b/libraries/navigation/Navigation.php index 07f2e15fcb..1d0a7b773c 100644 --- a/libraries/navigation/Navigation.php +++ b/libraries/navigation/Navigation.php @@ -10,7 +10,7 @@ namespace PMA\libraries\navigation; use PMA\libraries\config\PageSettings; use PhpMyAdmin\Message; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\Util; use PMA\libraries\URL; diff --git a/libraries/navigation/NavigationTree.php b/libraries/navigation/NavigationTree.php index c1b23d5bfd..9d11da5500 100644 --- a/libraries/navigation/NavigationTree.php +++ b/libraries/navigation/NavigationTree.php @@ -12,8 +12,8 @@ use PMA\libraries\navigation\nodes\NodeDatabase; use PMA\libraries\navigation\nodes\NodeTable; use PMA\libraries\navigation\nodes\NodeTableContainer; use PMA\libraries\navigation\nodes\NodeViewContainer; -use PMA\libraries\RecentFavoriteTable; -use PMA\libraries\Response; +use PhpMyAdmin\RecentFavoriteTable; +use PhpMyAdmin\Response; use PMA\libraries\Util; use PMA\libraries\URL; diff --git a/libraries/operations.lib.php b/libraries/operations.lib.php index 2e69caa130..bcd33b51a4 100644 --- a/libraries/operations.lib.php +++ b/libraries/operations.lib.php @@ -9,9 +9,9 @@ use PMA\libraries\engines\Innodb; use PhpMyAdmin\Charsets; use PhpMyAdmin\Core; use PhpMyAdmin\Message; -use PMA\libraries\Partition; +use PhpMyAdmin\Partition; use PMA\libraries\plugins\export\ExportSql; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\StorageEngine; use PMA\libraries\Table; use PMA\libraries\Util; diff --git a/libraries/parse_analyze.lib.php b/libraries/parse_analyze.lib.php index 8efeac9645..b45f3a6334 100644 --- a/libraries/parse_analyze.lib.php +++ b/libraries/parse_analyze.lib.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin */ -use PMA\libraries\Response; +use PhpMyAdmin\Response; if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/plugins/auth/AuthenticationConfig.php b/libraries/plugins/auth/AuthenticationConfig.php index 67c30ab0b0..0462032e24 100644 --- a/libraries/plugins/auth/AuthenticationConfig.php +++ b/libraries/plugins/auth/AuthenticationConfig.php @@ -10,7 +10,7 @@ namespace PMA\libraries\plugins\auth; use PMA\libraries\plugins\AuthenticationPlugin; use PMA; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\URL; /** diff --git a/libraries/plugins/auth/AuthenticationCookie.php b/libraries/plugins/auth/AuthenticationCookie.php index 9099628f72..1d7db7d756 100644 --- a/libraries/plugins/auth/AuthenticationCookie.php +++ b/libraries/plugins/auth/AuthenticationCookie.php @@ -12,7 +12,7 @@ use phpseclib\Crypt; use PhpMyAdmin\LanguageManager; use PhpMyAdmin\Message; use PMA\libraries\plugins\AuthenticationPlugin; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\Util; use PhpMyAdmin\Config; use PhpMyAdmin\Core; diff --git a/libraries/plugins/auth/AuthenticationHttp.php b/libraries/plugins/auth/AuthenticationHttp.php index 071634ecd4..2be5e3db43 100644 --- a/libraries/plugins/auth/AuthenticationHttp.php +++ b/libraries/plugins/auth/AuthenticationHttp.php @@ -11,7 +11,7 @@ namespace PMA\libraries\plugins\auth; use PMA\libraries\plugins\AuthenticationPlugin; use PhpMyAdmin\Message; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PhpMyAdmin\Config; use PhpMyAdmin\Core; diff --git a/libraries/plugins/export/ExportOds.php b/libraries/plugins/export/ExportOds.php index 9d1870be75..d8bbdf541b 100644 --- a/libraries/plugins/export/ExportOds.php +++ b/libraries/plugins/export/ExportOds.php @@ -16,7 +16,7 @@ use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; use PhpMyAdmin\DatabaseInterface; use PMA\libraries\properties\options\items\TextPropertyItem; -use PMA\libraries\OpenDocument; +use PhpMyAdmin\OpenDocument; $GLOBALS['ods_buffer'] = ''; diff --git a/libraries/plugins/export/ExportOdt.php b/libraries/plugins/export/ExportOdt.php index 9ce688fa05..70686cbce1 100644 --- a/libraries/plugins/export/ExportOdt.php +++ b/libraries/plugins/export/ExportOdt.php @@ -16,7 +16,7 @@ use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; use PMA\libraries\properties\options\items\BoolPropertyItem; use PMA\libraries\properties\options\items\RadioPropertyItem; use PMA\libraries\properties\options\items\TextPropertyItem; -use PMA\libraries\OpenDocument; +use PhpMyAdmin\OpenDocument; use PMA\libraries\Transformations; use PMA\libraries\Util; diff --git a/libraries/plugins/export/helpers/Pdf.php b/libraries/plugins/export/helpers/Pdf.php index 3269891d02..edf89ee62d 100644 --- a/libraries/plugins/export/helpers/Pdf.php +++ b/libraries/plugins/export/helpers/Pdf.php @@ -9,7 +9,7 @@ namespace PMA\libraries\plugins\export\helpers; use PhpMyAdmin\DatabaseInterface; -use PMA\libraries\PDF as PdfLib; +use PhpMyAdmin\Pdf as PdfLib; use PMA\libraries\Transformations; use PMA\libraries\Util; use TCPDF_STATIC; diff --git a/libraries/plugins/schema/dia/Dia.php b/libraries/plugins/schema/dia/Dia.php index 469d8f971d..caedee371b 100644 --- a/libraries/plugins/schema/dia/Dia.php +++ b/libraries/plugins/schema/dia/Dia.php @@ -9,7 +9,7 @@ namespace PMA\libraries\plugins\schema\dia; use PMA; use PhpMyAdmin\Core; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use XMLWriter; /** diff --git a/libraries/plugins/schema/eps/Eps.php b/libraries/plugins/schema/eps/Eps.php index ca05197ca5..cab392f7fa 100644 --- a/libraries/plugins/schema/eps/Eps.php +++ b/libraries/plugins/schema/eps/Eps.php @@ -8,7 +8,7 @@ namespace PMA\libraries\plugins\schema\eps; use PhpMyAdmin\Core; -use PMA\libraries\Response; +use PhpMyAdmin\Response; /** * This Class is EPS Library and diff --git a/libraries/plugins/schema/pdf/Pdf.php b/libraries/plugins/schema/pdf/Pdf.php index de8c6af912..5be822653b 100644 --- a/libraries/plugins/schema/pdf/Pdf.php +++ b/libraries/plugins/schema/pdf/Pdf.php @@ -7,7 +7,7 @@ */ namespace PMA\libraries\plugins\schema\pdf; -use PMA\libraries\PDF as PDF_lib; +use PhpMyAdmin\Pdf as PdfLib; use PMA\libraries\Util; /** @@ -33,7 +33,7 @@ if (getcwd() == dirname(__FILE__)) { * @package PhpMyAdmin * @see TCPDF */ -class Pdf extends PDF_lib +class Pdf extends PdfLib { /** * Defines properties @@ -47,7 +47,7 @@ class Pdf extends PDF_lib var $Outlines = array(); var $def_outlines; var $widths; - private $_ff = PDF_lib::PMA_PDF_FONT; + private $_ff = PdfLib::PMA_PDF_FONT; private $_offline; private $_pageNumber; private $_withDoc; diff --git a/libraries/plugins/schema/pdf/PdfRelationSchema.php b/libraries/plugins/schema/pdf/PdfRelationSchema.php index 780249741c..6cd797750b 100644 --- a/libraries/plugins/schema/pdf/PdfRelationSchema.php +++ b/libraries/plugins/schema/pdf/PdfRelationSchema.php @@ -7,7 +7,7 @@ */ namespace PMA\libraries\plugins\schema\pdf; -use PMA\libraries\PDF as PDF_lib; +use PhpMyAdmin\Pdf as PdfLib; use PMA\libraries\plugins\schema\ExportRelationSchema; use PMA\libraries\Transformations; use PMA\libraries\Util; @@ -52,7 +52,7 @@ class PdfRelationSchema extends ExportRelationSchema * @var TableStatsPdf[] */ private $_tables = array(); - private $_ff = PDF_lib::PMA_PDF_FONT; + private $_ff = PdfLib::PMA_PDF_FONT; private $_xMax = 0; private $_yMax = 0; private $_scale; diff --git a/libraries/plugins/schema/pdf/TableStatsPdf.php b/libraries/plugins/schema/pdf/TableStatsPdf.php index f8349c79fe..eace8163ce 100644 --- a/libraries/plugins/schema/pdf/TableStatsPdf.php +++ b/libraries/plugins/schema/pdf/TableStatsPdf.php @@ -9,7 +9,7 @@ namespace PMA\libraries\plugins\schema\pdf; use PMA\libraries\plugins\schema\ExportRelationSchema; use PMA\libraries\plugins\schema\TableStats; -use PMA\libraries\PDF as PDF_lib; +use PhpMyAdmin\Pdf as PdfLib; /** * Table preferences/statistics @@ -28,7 +28,7 @@ class TableStatsPdf extends TableStats */ public $nb_fiels; public $height; - private $_ff = PDF_lib::PMA_PDF_FONT; + private $_ff = PdfLib::PMA_PDF_FONT; /** * The "PMA\libraries\plugins\schema\pdf\TableStatsPdf" constructor @@ -229,4 +229,3 @@ class TableStatsPdf extends TableStats } } } - diff --git a/libraries/plugins/schema/svg/Svg.php b/libraries/plugins/schema/svg/Svg.php index 897c897eac..692f602040 100644 --- a/libraries/plugins/schema/svg/Svg.php +++ b/libraries/plugins/schema/svg/Svg.php @@ -9,7 +9,7 @@ namespace PMA\libraries\plugins\schema\svg; use PMA; use PhpMyAdmin\Core; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use XMLWriter; /** diff --git a/libraries/plugins/transformations/output/Text_Plain_Json.php b/libraries/plugins/transformations/output/Text_Plain_Json.php index 80b77d8fc3..800d764968 100644 --- a/libraries/plugins/transformations/output/Text_Plain_Json.php +++ b/libraries/plugins/transformations/output/Text_Plain_Json.php @@ -10,7 +10,7 @@ namespace PMA\libraries\plugins\transformations\output; use PMA; use PMA\libraries\plugins\TransformationsPlugin; -use PMA\libraries\Response; +use PhpMyAdmin\Response; /** * Handles the json transformation for text plain diff --git a/libraries/plugins/transformations/output/Text_Plain_Sql.php b/libraries/plugins/transformations/output/Text_Plain_Sql.php index d06f03ecfd..130da2dc8f 100644 --- a/libraries/plugins/transformations/output/Text_Plain_Sql.php +++ b/libraries/plugins/transformations/output/Text_Plain_Sql.php @@ -8,7 +8,7 @@ */ namespace PMA\libraries\plugins\transformations\output; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\plugins\transformations\abs\SQLTransformationsPlugin; /** diff --git a/libraries/plugins/transformations/output/Text_Plain_Xml.php b/libraries/plugins/transformations/output/Text_Plain_Xml.php index 0fec961529..e1316a2aee 100644 --- a/libraries/plugins/transformations/output/Text_Plain_Xml.php +++ b/libraries/plugins/transformations/output/Text_Plain_Xml.php @@ -10,7 +10,7 @@ namespace PMA\libraries\plugins\transformations\output; use PMA; use PMA\libraries\plugins\TransformationsPlugin; -use PMA\libraries\Response; +use PhpMyAdmin\Response; /** * Handles the XML transformation for text plain diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 00a42e7d87..0904c4fdaa 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -9,7 +9,7 @@ use PhpMyAdmin\Core; use PhpMyAdmin\Message; use PMA\libraries\Table; -use PMA\libraries\RecentFavoriteTable; +use PhpMyAdmin\RecentFavoriteTable; use PMA\libraries\URL; /** diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php index 6fd6660b62..0484f5bb96 100644 --- a/libraries/replication_gui.lib.php +++ b/libraries/replication_gui.lib.php @@ -8,7 +8,7 @@ use PhpMyAdmin\Core; use PhpMyAdmin\Message; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\URL; /** diff --git a/libraries/rte/rte_events.lib.php b/libraries/rte/rte_events.lib.php index c203cce1e0..4b34376bcd 100644 --- a/libraries/rte/rte_events.lib.php +++ b/libraries/rte/rte_events.lib.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin */ -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\URL; if (! defined('PHPMYADMIN')) { diff --git a/libraries/rte/rte_export.lib.php b/libraries/rte/rte_export.lib.php index 2353183369..9c37c838de 100644 --- a/libraries/rte/rte_export.lib.php +++ b/libraries/rte/rte_export.lib.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ use PhpMyAdmin\Message; -use PMA\libraries\Response; +use PhpMyAdmin\Response; if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/rte/rte_general.lib.php b/libraries/rte/rte_general.lib.php index a0246972ae..80c2fca54a 100644 --- a/libraries/rte/rte_general.lib.php +++ b/libraries/rte/rte_general.lib.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ use PhpMyAdmin\Message; -use PMA\libraries\Response; +use PhpMyAdmin\Response; if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/rte/rte_list.lib.php b/libraries/rte/rte_list.lib.php index 30a01e58be..92c22f2976 100644 --- a/libraries/rte/rte_list.lib.php +++ b/libraries/rte/rte_list.lib.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin */ -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\URL; use PMA\libraries\Template; use PhpMyAdmin\SqlParser\Statements\CreateStatement; diff --git a/libraries/rte/rte_main.inc.php b/libraries/rte/rte_main.inc.php index 0e11f0a9c2..7ac8e3ca4f 100644 --- a/libraries/rte/rte_main.inc.php +++ b/libraries/rte/rte_main.inc.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ use PMA\libraries\URL; -use PMA\libraries\Response; +use PhpMyAdmin\Response; if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index c0bf981ea9..b2bab9bba3 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -8,7 +8,7 @@ use PhpMyAdmin\Charsets; use PhpMyAdmin\Core; use PhpMyAdmin\Message; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\Util; use PMA\libraries\URL; use PhpMyAdmin\SqlParser\Statements\CreateStatement; diff --git a/libraries/rte/rte_triggers.lib.php b/libraries/rte/rte_triggers.lib.php index f6d1481f69..165be114fd 100644 --- a/libraries/rte/rte_triggers.lib.php +++ b/libraries/rte/rte_triggers.lib.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin */ -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\URL; if (! defined('PHPMYADMIN')) { diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php index 0f54b0c44a..f2e467dfb7 100644 --- a/libraries/server_privileges.lib.php +++ b/libraries/server_privileges.lib.php @@ -9,7 +9,7 @@ use PhpMyAdmin\Core; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Message; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\Template; use PMA\libraries\Util; use PMA\libraries\URL; diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php index afc0fcd66a..ad74d8f3ab 100644 --- a/libraries/tbl_columns_definition_form.inc.php +++ b/libraries/tbl_columns_definition_form.inc.php @@ -6,7 +6,7 @@ * * @package PhpMyAdmin */ -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\Table; use PMA\libraries\Transformations; use PMA\Util; diff --git a/libraries/tracking.lib.php b/libraries/tracking.lib.php index 01e812e2c2..4a75c487a1 100644 --- a/libraries/tracking.lib.php +++ b/libraries/tracking.lib.php @@ -8,7 +8,7 @@ use PhpMyAdmin\Core; use PhpMyAdmin\Message; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\Tracker; use PMA\libraries\URL; use PMA\libraries\Sanitize; diff --git a/license.php b/license.php index fc0ec7eec0..c3d30e09eb 100644 --- a/license.php +++ b/license.php @@ -8,7 +8,7 @@ * * @package PhpMyAdmin */ -use PMA\libraries\Response; +use PhpMyAdmin\Response; /** * Gets core libraries and defines some variables @@ -8,7 +8,7 @@ use PhpMyAdmin\Core; use PhpMyAdmin\Linter; -use PMA\libraries\Response; +use PhpMyAdmin\Response; $_GET['ajax_request'] = 'true'; diff --git a/navigation.php b/navigation.php index a6a1e78944..eb9828ebad 100644 --- a/navigation.php +++ b/navigation.php @@ -7,7 +7,7 @@ */ // Include common functionalities -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\config\PageSettings; use PMA\libraries\navigation\Navigation; diff --git a/normalization.php b/normalization.php index f5d6f5bf45..49d6257a15 100644 --- a/normalization.php +++ b/normalization.php @@ -8,7 +8,7 @@ use PhpMyAdmin\Core; use PMA\libraries\URL; -use PMA\libraries\Response; +use PhpMyAdmin\Response; /** * diff --git a/phpinfo.php b/phpinfo.php index 0daa5f9f65..2a3a98587d 100644 --- a/phpinfo.php +++ b/phpinfo.php @@ -10,7 +10,7 @@ * Gets core libraries and defines some variables */ require_once 'libraries/common.inc.php'; -$response = PMA\libraries\Response::getInstance(); +$response = PhpMyAdmin\Response::getInstance(); $response->disable(); $response->getHeader()->sendHttpHeaders(); diff --git a/phpmyadmin.css.php b/phpmyadmin.css.php index cfbd656c7c..1ea63f2d72 100644 --- a/phpmyadmin.css.php +++ b/phpmyadmin.css.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin */ -use PMA\libraries\OutputBuffering; +use PhpMyAdmin\OutputBuffering; use PMA\libraries\ThemeManager; /** diff --git a/prefs_forms.php b/prefs_forms.php index f4d866d9bc..e639533223 100644 --- a/prefs_forms.php +++ b/prefs_forms.php @@ -8,7 +8,7 @@ use PMA\libraries\config\ConfigFile; use PMA\libraries\config\FormDisplay; use PhpMyAdmin\Core; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\URL; /** diff --git a/prefs_manage.php b/prefs_manage.php index 6f55482671..83d6960ccf 100644 --- a/prefs_manage.php +++ b/prefs_manage.php @@ -10,7 +10,7 @@ use PMA\libraries\config\FormDisplay; use PhpMyAdmin\Core; use PhpMyAdmin\File; use PhpMyAdmin\Message; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\Util; use PMA\libraries\URL; use PMA\libraries\Sanitize; diff --git a/server_binlog.php b/server_binlog.php index 811e4bc806..7610efbd88 100644 --- a/server_binlog.php +++ b/server_binlog.php @@ -10,7 +10,7 @@ namespace PMA; use PMA\libraries\controllers\server\ServerCollationsController; -use PMA\libraries\Response; +use PhpMyAdmin\Response; require_once 'libraries/common.inc.php'; @@ -22,8 +22,8 @@ $container->alias( 'ServerBinlogController', 'PMA\libraries\controllers\server\ServerBinlogController' ); -$container->set('PMA\libraries\Response', Response::getInstance()); -$container->alias('response', 'PMA\libraries\Response'); +$container->set('PhpMyAdmin\Response', Response::getInstance()); +$container->alias('response', 'PhpMyAdmin\Response'); /** @var ServerBinlogController $controller */ $controller = $container->get( diff --git a/server_collations.php b/server_collations.php index adbd9536a4..e7ea99c1b7 100644 --- a/server_collations.php +++ b/server_collations.php @@ -10,7 +10,7 @@ namespace PMA; use PMA\libraries\controllers\server\ServerCollationsController; -use PMA\libraries\Response; +use PhpMyAdmin\Response; require_once 'libraries/common.inc.php'; @@ -22,8 +22,8 @@ $container->alias( 'ServerCollationsController', 'PMA\libraries\controllers\server\ServerCollationsController' ); -$container->set('PMA\libraries\Response', Response::getInstance()); -$container->alias('response', 'PMA\libraries\Response'); +$container->set('PhpMyAdmin\Response', Response::getInstance()); +$container->alias('response', 'PhpMyAdmin\Response'); /** @var ServerCollationsController $controller */ $controller = $container->get( diff --git a/server_databases.php b/server_databases.php index 9dcd589ee3..30b231da9e 100644 --- a/server_databases.php +++ b/server_databases.php @@ -10,7 +10,7 @@ namespace PMA; use PMA\libraries\controllers\server\ServerDatabasesController; -use PMA\libraries\Response; +use PhpMyAdmin\Response; require_once 'libraries/common.inc.php'; @@ -22,8 +22,8 @@ $container->alias( 'ServerDatabasesController', 'PMA\libraries\controllers\server\ServerDatabasesController' ); -$container->set('PMA\libraries\Response', Response::getInstance()); -$container->alias('response', 'PMA\libraries\Response'); +$container->set('PhpMyAdmin\Response', Response::getInstance()); +$container->alias('response', 'PhpMyAdmin\Response'); /** @var ServerDatabasesController $controller */ $controller = $container->get( diff --git a/server_engines.php b/server_engines.php index f935279a4e..aec3a47ba6 100644 --- a/server_engines.php +++ b/server_engines.php @@ -10,7 +10,7 @@ namespace PMA; use PMA\libraries\controllers\server\ServerEnginesController; -use PMA\libraries\Response; +use PhpMyAdmin\Response; require_once 'libraries/common.inc.php'; @@ -22,8 +22,8 @@ $container->alias( 'ServerEnginesController', 'PMA\libraries\controllers\server\ServerEnginesController' ); -$container->set('PMA\libraries\Response', Response::getInstance()); -$container->alias('response', 'PMA\libraries\Response'); +$container->set('PhpMyAdmin\Response', Response::getInstance()); +$container->alias('response', 'PhpMyAdmin\Response'); /** @var ServerEnginesController $controller */ $controller = $container->get( diff --git a/server_export.php b/server_export.php index 13337b4998..0e19f30fda 100644 --- a/server_export.php +++ b/server_export.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ use PMA\libraries\config\PageSettings; -use PMA\libraries\Response; +use PhpMyAdmin\Response; /** * Does the common work diff --git a/server_import.php b/server_import.php index 78fe23dbda..307c9f2ea1 100644 --- a/server_import.php +++ b/server_import.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ use PMA\libraries\config\PageSettings; -use PMA\libraries\Response; +use PhpMyAdmin\Response; /** * diff --git a/server_plugins.php b/server_plugins.php index 4392eed835..05d1e90bbe 100644 --- a/server_plugins.php +++ b/server_plugins.php @@ -10,7 +10,7 @@ namespace PMA; use PMA\libraries\controllers\server\ServerPluginsController; -use PMA\libraries\Response; +use PhpMyAdmin\Response; require_once 'libraries/common.inc.php'; @@ -22,8 +22,8 @@ $container->alias( 'ServerPluginsController', 'PMA\libraries\controllers\server\ServerPluginsController' ); -$container->set('PMA\libraries\Response', Response::getInstance()); -$container->alias('response', 'PMA\libraries\Response'); +$container->set('PhpMyAdmin\Response', Response::getInstance()); +$container->alias('response', 'PhpMyAdmin\Response'); /** @var ServerPluginsController $controller */ $controller = $container->get( diff --git a/server_privileges.php b/server_privileges.php index 40a147da97..04d204eee5 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -7,7 +7,7 @@ */ use PhpMyAdmin\Core; -use PMA\libraries\Response; +use PhpMyAdmin\Response; /** * include common file diff --git a/server_replication.php b/server_replication.php index 8c33327ddc..f7e8ed3f91 100644 --- a/server_replication.php +++ b/server_replication.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin */ -use PMA\libraries\Response; +use PhpMyAdmin\Response; /** * include files diff --git a/server_sql.php b/server_sql.php index 2bf16a0f61..0221eb7d8e 100644 --- a/server_sql.php +++ b/server_sql.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ use PMA\libraries\config\PageSettings; -use PMA\libraries\Response; +use PhpMyAdmin\Response; /** * diff --git a/server_status.php b/server_status.php index d3dba9f6e5..837f2c4f59 100644 --- a/server_status.php +++ b/server_status.php @@ -7,7 +7,7 @@ */ use PhpMyAdmin\Message; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\ServerStatusData; require_once 'libraries/common.inc.php'; diff --git a/server_status_advisor.php b/server_status_advisor.php index 0996d293b3..5956ae861b 100644 --- a/server_status_advisor.php +++ b/server_status_advisor.php @@ -7,7 +7,7 @@ */ use PhpMyAdmin\Message; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\ServerStatusData; require_once 'libraries/common.inc.php'; diff --git a/server_status_monitor.php b/server_status_monitor.php index 6a32d1d3e5..314c079939 100644 --- a/server_status_monitor.php +++ b/server_status_monitor.php @@ -7,7 +7,7 @@ */ use PMA\libraries\ServerStatusData; -use PMA\libraries\Response; +use PhpMyAdmin\Response; require_once 'libraries/common.inc.php'; require_once 'libraries/server_common.inc.php'; diff --git a/server_status_processes.php b/server_status_processes.php index 9945e42e85..33535a78c9 100644 --- a/server_status_processes.php +++ b/server_status_processes.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\ServerStatusData; require_once 'libraries/common.inc.php'; diff --git a/server_status_queries.php b/server_status_queries.php index 80f9b984a0..3f7d5afe41 100644 --- a/server_status_queries.php +++ b/server_status_queries.php @@ -7,7 +7,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PhpMyAdmin\Message; use PMA\libraries\ServerStatusData; diff --git a/server_status_variables.php b/server_status_variables.php index f7c08b34b6..eb246a0fa2 100644 --- a/server_status_variables.php +++ b/server_status_variables.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PhpMyAdmin\Message; use PMA\libraries\ServerStatusData; diff --git a/server_user_groups.php b/server_user_groups.php index 227e61556b..ac80fad3f8 100644 --- a/server_user_groups.php +++ b/server_user_groups.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin */ -use PMA\libraries\Response; +use PhpMyAdmin\Response; require_once 'libraries/common.inc.php'; require_once 'libraries/server_users.lib.php'; diff --git a/server_variables.php b/server_variables.php index a5c35ff605..dd2cfeb97e 100644 --- a/server_variables.php +++ b/server_variables.php @@ -10,7 +10,7 @@ namespace PMA; use PMA\libraries\controllers\server\ServerVariablesController; -use PMA\libraries\Response; +use PhpMyAdmin\Response; require_once 'libraries/common.inc.php'; @@ -22,8 +22,8 @@ $container->alias( 'ServerVariablesController', 'PMA\libraries\controllers\server\ServerVariablesController' ); -$container->set('PMA\libraries\Response', Response::getInstance()); -$container->alias('response', 'PMA\libraries\Response'); +$container->set('PhpMyAdmin\Response', Response::getInstance()); +$container->alias('response', 'PhpMyAdmin\Response'); /** @var ServerVariablesController $controller */ $controller = $container->get( diff --git a/setup/config.php b/setup/config.php index c41391dae7..08eb718d83 100644 --- a/setup/config.php +++ b/setup/config.php @@ -9,7 +9,7 @@ use PMA\libraries\config\FormDisplay; use PMA\setup\lib\ConfigGenerator; use PhpMyAdmin\Core; use PMA\libraries\URL; -use PMA\libraries\Response; +use PhpMyAdmin\Response; /** * Core libraries. diff --git a/setup/lib/form_processing.lib.php b/setup/lib/form_processing.lib.php index 2316b4f371..11fd8a63ca 100644 --- a/setup/lib/form_processing.lib.php +++ b/setup/lib/form_processing.lib.php @@ -8,7 +8,7 @@ use PMA\libraries\config\FormDisplay; use PhpMyAdmin\Core; use PMA\libraries\URL; -use PMA\libraries\Response; +use PhpMyAdmin\Response; /** * Processes forms registered in $form_display, handles error correction @@ -8,7 +8,7 @@ * @package PhpMyAdmin */ use PMA\libraries\config\PageSettings; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\Sql; use PMA\libraries\URL; use PMA\libraries\Util; diff --git a/tbl_addfield.php b/tbl_addfield.php index 3fbe6d4fad..195f916ca2 100644 --- a/tbl_addfield.php +++ b/tbl_addfield.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\Transformations; use PMA\libraries\URL; diff --git a/tbl_change.php b/tbl_change.php index 20d7b5eb64..713b778c8b 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ use PMA\libraries\config\PageSettings; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\Util; use PMA\libraries\URL; diff --git a/tbl_chart.php b/tbl_chart.php index 1de35d8a2d..24c5928755 100644 --- a/tbl_chart.php +++ b/tbl_chart.php @@ -9,7 +9,7 @@ namespace PMA; use PMA\libraries\controllers\table\TableChartController; -use PMA\libraries\Response; +use PhpMyAdmin\Response; require_once 'libraries/common.inc.php'; @@ -18,8 +18,8 @@ $container->factory('PMA\libraries\controllers\table\TableChartController'); $container->alias( 'TableChartController', 'PMA\libraries\controllers\table\TableChartController' ); -$container->set('PMA\libraries\Response', Response::getInstance()); -$container->alias('response', 'PMA\libraries\Response'); +$container->set('PhpMyAdmin\Response', Response::getInstance()); +$container->alias('response', 'PhpMyAdmin\Response'); /* Define dependencies for the concerned controller */ $dependency_definitions = array( diff --git a/tbl_create.php b/tbl_create.php index d3f35da948..7eb5c46f7a 100644 --- a/tbl_create.php +++ b/tbl_create.php @@ -7,7 +7,7 @@ */ use PhpMyAdmin\Core; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\Transformations; use PMA\libraries\URL; diff --git a/tbl_export.php b/tbl_export.php index 16fbfdf94d..88ac7cf65a 100644 --- a/tbl_export.php +++ b/tbl_export.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ use PMA\libraries\config\PageSettings; -use PMA\libraries\Response; +use PhpMyAdmin\Response; /** * diff --git a/tbl_find_replace.php b/tbl_find_replace.php index b656a4d20f..c099092661 100644 --- a/tbl_find_replace.php +++ b/tbl_find_replace.php @@ -7,7 +7,7 @@ * * @package PhpMyAdmin */ -use PMA\libraries\Response; +use PhpMyAdmin\Response; /** * Gets some core libraries @@ -20,8 +20,8 @@ $container->factory('PMA\libraries\controllers\table\TableSearchController'); $container->alias( 'TableSearchController', 'PMA\libraries\controllers\table\TableSearchController' ); -$container->set('PMA\libraries\Response', Response::getInstance()); -$container->alias('response', 'PMA\libraries\Response'); +$container->set('PhpMyAdmin\Response', Response::getInstance()); +$container->alias('response', 'PhpMyAdmin\Response'); $dependency_definitions = array( 'searchType' => 'replace', diff --git a/tbl_get_field.php b/tbl_get_field.php index 7ab8936412..e9cbd40397 100644 --- a/tbl_get_field.php +++ b/tbl_get_field.php @@ -11,7 +11,7 @@ use PhpMyAdmin\Core; /** * Common functions. */ -// we don't want the usual PMA\libraries\Response-generated HTML above the column's +// we don't want the usual PhpMyAdmin\Response-generated HTML above the column's // data define('PMA_BYPASS_GET_INSTANCE', 1); require_once 'libraries/common.inc.php'; diff --git a/tbl_gis_visualization.php b/tbl_gis_visualization.php index 72feb468e6..81d586d475 100644 --- a/tbl_gis_visualization.php +++ b/tbl_gis_visualization.php @@ -9,7 +9,7 @@ namespace PMA; use PMA\libraries\controllers\table\TableGisVisualizationController; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\Util; require_once 'libraries/common.inc.php'; @@ -22,8 +22,8 @@ $container->alias( 'TableGisVisualizationController', 'PMA\libraries\controllers\table\TableGisVisualizationController' ); -$container->set('PMA\libraries\Response', Response::getInstance()); -$container->alias('response', 'PMA\libraries\Response'); +$container->set('PhpMyAdmin\Response', Response::getInstance()); +$container->alias('response', 'PhpMyAdmin\Response'); /* Define dependencies for the concerned controller */ $dependency_definitions = array( diff --git a/tbl_import.php b/tbl_import.php index 71f78bbeeb..9c54647898 100644 --- a/tbl_import.php +++ b/tbl_import.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ use PMA\libraries\config\PageSettings; -use PMA\libraries\Response; +use PhpMyAdmin\Response; /** * diff --git a/tbl_indexes.php b/tbl_indexes.php index 362c6416d0..bded425bb6 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -10,7 +10,7 @@ namespace PMA; use PMA\libraries\controllers\table\TableIndexesController; use PhpMyAdmin\Index; -use PMA\libraries\Response; +use PhpMyAdmin\Response; require_once 'libraries/common.inc.php'; @@ -20,8 +20,8 @@ $container->alias( 'TableIndexesController', 'PMA\libraries\controllers\table\TableIndexesController' ); -$container->set('PMA\libraries\Response', Response::getInstance()); -$container->alias('response', 'PMA\libraries\Response'); +$container->set('PhpMyAdmin\Response', Response::getInstance()); +$container->alias('response', 'PhpMyAdmin\Response'); /* Define dependencies for the concerned controller */ $db = $container->get('db'); diff --git a/tbl_operations.php b/tbl_operations.php index 78777cfcd3..fa00b55353 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -5,9 +5,9 @@ * * @package PhpMyAdmin */ -use PMA\libraries\Partition; +use PhpMyAdmin\Partition; use PMA\libraries\Table; -use PMA\libraries\Response; +use PhpMyAdmin\Response; /** * diff --git a/tbl_recent_favorite.php b/tbl_recent_favorite.php index ba292a4afc..494b2d41ce 100644 --- a/tbl_recent_favorite.php +++ b/tbl_recent_favorite.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\RecentFavoriteTable; +use PhpMyAdmin\RecentFavoriteTable; require_once 'libraries/common.inc.php'; diff --git a/tbl_relation.php b/tbl_relation.php index f2f1a3bdac..30af137bbb 100644 --- a/tbl_relation.php +++ b/tbl_relation.php @@ -20,7 +20,7 @@ namespace PMA; use PMA\libraries\controllers\table\TableRelationController; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\Table; use PMA\libraries\Util; @@ -32,8 +32,8 @@ $container->alias( 'TableRelationController', 'PMA\libraries\controllers\table\TableRelationController' ); -$container->set('PMA\libraries\Response', Response::getInstance()); -$container->alias('response', 'PMA\libraries\Response'); +$container->set('PhpMyAdmin\Response', Response::getInstance()); +$container->alias('response', 'PhpMyAdmin\Response'); /* Define dependencies for the concerned controller */ $db = $container->get('db'); diff --git a/tbl_replace.php b/tbl_replace.php index 26268de961..705b4ccf90 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -14,7 +14,7 @@ use PhpMyAdmin\Core; use PMA\libraries\plugins\IOTransformationsPlugin; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\Table; use PMA\libraries\Transformations; diff --git a/tbl_row_action.php b/tbl_row_action.php index 773a5ca9a4..63c3016258 100644 --- a/tbl_row_action.php +++ b/tbl_row_action.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\Sql; use PMA\libraries\URL; diff --git a/tbl_select.php b/tbl_select.php index a077b80da6..4a5d8625da 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -8,7 +8,7 @@ * * @package PhpMyAdmin */ -use PMA\libraries\Response; +use PhpMyAdmin\Response; /** * Gets some core libraries @@ -23,8 +23,8 @@ $container->factory('PMA\libraries\controllers\table\TableSearchController'); $container->alias( 'TableSearchController', 'PMA\libraries\controllers\table\TableSearchController' ); -$container->set('PMA\libraries\Response', Response::getInstance()); -$container->alias('response', 'PMA\libraries\Response'); +$container->set('PhpMyAdmin\Response', Response::getInstance()); +$container->alias('response', 'PhpMyAdmin\Response'); /* Define dependencies for the concerned controller */ $dependency_definitions = array( diff --git a/tbl_sql.php b/tbl_sql.php index 2c79cef581..1fc7593819 100644 --- a/tbl_sql.php +++ b/tbl_sql.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ use PMA\libraries\config\PageSettings; -use PMA\libraries\Response; +use PhpMyAdmin\Response; /** * diff --git a/tbl_structure.php b/tbl_structure.php index c11b9c7ae4..b74392cd42 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -11,7 +11,7 @@ namespace PMA; use PMA\libraries\controllers\table\TableStructureController; use PMA\libraries\controllers\Table; -use PMA\libraries\Response; +use PhpMyAdmin\Response; require_once 'libraries/common.inc.php'; require_once 'libraries/config/messages.inc.php'; @@ -24,8 +24,8 @@ $container->alias( 'TableStructureController', 'PMA\libraries\controllers\table\TableStructureController' ); -$container->set('PMA\libraries\Response', Response::getInstance()); -$container->alias('response', 'PMA\libraries\Response'); +$container->set('PhpMyAdmin\Response', Response::getInstance()); +$container->alias('response', 'PhpMyAdmin\Response'); global $db, $table, $db_is_system_schema, $tbl_is_view, $tbl_storage_engine, $table_info_num_rows, $tbl_collation, $showtable; diff --git a/tbl_tracking.php b/tbl_tracking.php index 1ff756ef9f..df4f551c44 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -8,7 +8,7 @@ // Run common work use PMA\libraries\Tracker; -use PMA\libraries\Response; +use PhpMyAdmin\Response; require_once './libraries/common.inc.php'; diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php index b529a9380d..0af453e262 100644 --- a/tbl_zoom_select.php +++ b/tbl_zoom_select.php @@ -7,7 +7,7 @@ * * @package PhpMyAdmin */ -use PMA\libraries\Response; +use PhpMyAdmin\Response; /** * Gets some core libraries @@ -20,8 +20,8 @@ $container->factory('PMA\libraries\controllers\table\TableSearchController'); $container->alias( 'TableSearchController', 'PMA\libraries\controllers\table\TableSearchController' ); -$container->set('PMA\libraries\Response', Response::getInstance()); -$container->alias('response', 'PMA\libraries\Response'); +$container->set('PhpMyAdmin\Response', Response::getInstance()); +$container->alias('response', 'PhpMyAdmin\Response'); /* Define dependencies for the concerned controller */ $dependency_definitions = array( diff --git a/templates/columns_definitions/column_definitions_form.phtml b/templates/columns_definitions/column_definitions_form.phtml index 07ed3c51b0..bc88f06ad4 100644 --- a/templates/columns_definitions/column_definitions_form.phtml +++ b/templates/columns_definitions/column_definitions_form.phtml @@ -1,5 +1,5 @@ <?php -use PMA\libraries\Partition; +use PhpMyAdmin\Partition; use PMA\libraries\StorageEngine; use PMA\libraries\URL; diff --git a/templates/table/structure/display_structure.phtml b/templates/table/structure/display_structure.phtml index ebcedb8ec9..264692ffd5 100644 --- a/templates/table/structure/display_structure.phtml +++ b/templates/table/structure/display_structure.phtml @@ -1,6 +1,6 @@ <?php use PhpMyAdmin\Index; -use PMA\libraries\Partition; +use PhpMyAdmin\Partition; use PMA\libraries\Template; use PMA\libraries\Tracker; use PMA\libraries\Util; diff --git a/test/PMATestCase.php b/test/PMATestCase.php index d69813b704..7c199baa43 100644 --- a/test/PMATestCase.php +++ b/test/PMATestCase.php @@ -29,9 +29,9 @@ class PMATestCase extends PHPUnit_Framework_TestCase */ public function mockResponse() { - $this->restoreInstance = PMA\libraries\Response::getInstance(); + $this->restoreInstance = PhpMyAdmin\Response::getInstance(); - $mockResponse = $this->getMockBuilder('PMA\libraries\Response') + $mockResponse = $this->getMockBuilder('PhpMyAdmin\Response') ->disableOriginalConstructor() ->setMethods(array( 'header', 'headersSent', 'disable', 'isAjax', @@ -72,7 +72,7 @@ class PMATestCase extends PHPUnit_Framework_TestCase } } - $this->attrInstance = new ReflectionProperty('PMA\libraries\Response', '_instance'); + $this->attrInstance = new ReflectionProperty('PhpMyAdmin\Response', '_instance'); $this->attrInstance->setAccessible(true); $this->attrInstance->setValue($mockResponse); diff --git a/test/classes/PDFTest.php b/test/classes/PDFTest.php index 930e7620e0..0aa3535ca1 100644 --- a/test/classes/PDFTest.php +++ b/test/classes/PDFTest.php @@ -1,24 +1,22 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * tests for PDF class + * tests for Pdf class * * @package PhpMyAdmin-test */ -/* - * Include to test. - */ -use PMA\libraries\PDF; +use PhpMyAdmin\Config; +use PhpMyAdmin\Pdf; require_once 'test/PMATestCase.php'; /** - * tests for PDF class + * tests for Pdf class * * @package PhpMyAdmin-test */ -class PDFTest extends PMATestCase +class PdfTest extends PMATestCase { /** * SetUp for test cases @@ -27,49 +25,49 @@ class PDFTest extends PMATestCase */ public function setup() { - $GLOBALS['PMA_Config'] = new PhpMyAdmin\Config(); + $GLOBALS['PMA_Config'] = new Config(); $GLOBALS['PMA_Config']->enableBc(); } /** - * Test for PDF::getPDFData + * Test for Pdf::getPDFData * * @group large * @return void */ public function testBasic() { - $arr = new PDF(); + $arr = new Pdf(); $this->assertContains('PDF', $arr->getPDFData()); } /** - * Test for PDF::getPDFData + * Test for Pdf::getPDFData * * @group large * @return void */ public function testAlias() { - $arr = new PDF(); + $arr = new Pdf(); $arr->setAlias('{00}', '32'); $this->assertContains('PDF', $arr->getPDFData()); } /** - * Test for PDF::getPDFData + * Test for Pdf::getPDFData * * @group large * @return void */ public function testDocument() { - $pdf = new PDF(); + $pdf = new Pdf(); $pdf->SetTitle('Title'); $pdf->Open(); $pdf->SetAutoPageBreak('auto'); $pdf->Addpage(); - $pdf->SetFont(PDF::PMA_PDF_FONT, 'B', 14); + $pdf->SetFont(Pdf::PMA_PDF_FONT, 'B', 14); $pdf->Cell(0, 6, 'Cell', 'B', 1, 'C'); $pdf->Ln(); $pdf->Addpage(); diff --git a/test/classes/controllers/DatabaseStructureControllerTest.php b/test/classes/controllers/DatabaseStructureControllerTest.php index c9cc85f59b..3d2ad43825 100644 --- a/test/classes/controllers/DatabaseStructureControllerTest.php +++ b/test/classes/controllers/DatabaseStructureControllerTest.php @@ -79,8 +79,8 @@ class DatabaseStructureControllerTest extends PMATestCase $container->set('table', 'table'); $container->set('dbi', $GLOBALS['dbi']); $this->_response = new \PMA\Test\Stubs\Response(); - $container->set('PMA\libraries\Response', $this->_response); - $container->alias('response', 'PMA\libraries\Response'); + $container->set('PhpMyAdmin\Response', $this->_response); + $container->alias('response', 'PhpMyAdmin\Response'); } /** @@ -96,8 +96,8 @@ class DatabaseStructureControllerTest extends PMATestCase $container->set('table', 'table'); $container->set('dbi', $GLOBALS['dbi']); $response = new \PMA\Test\Stubs\Response(); - $container->set('PMA\libraries\Response', $response); - $container->alias('response', 'PMA\libraries\Response'); + $container->set('PhpMyAdmin\Response', $response); + $container->alias('response', 'PhpMyAdmin\Response'); $class = new ReflectionClass('PMA\libraries\controllers\database\DatabaseStructureController'); $method = $class->getMethod('getValuesForInnodbTable'); @@ -323,7 +323,7 @@ class DatabaseStructureControllerTest extends PMATestCase */ public function testSynchronizeFavoriteTables() { - $fav_instance = $this->getMockBuilder('PMA\libraries\RecentFavoriteTable') + $fav_instance = $this->getMockBuilder('PhpMyAdmin\RecentFavoriteTable') ->disableOriginalConstructor() ->getMock(); $fav_instance->expects($this->at(1))->method('getTables') diff --git a/test/classes/controllers/ServerDatabasesControllerTest.php b/test/classes/controllers/ServerDatabasesControllerTest.php index c6d78fcaca..b35abcc48a 100644 --- a/test/classes/controllers/ServerDatabasesControllerTest.php +++ b/test/classes/controllers/ServerDatabasesControllerTest.php @@ -51,8 +51,8 @@ class ServerDatabasesControllerTest extends PMATestCase $container = Container::getDefaultContainer(); $container->set('dbi', $GLOBALS['dbi']); $this->response = new \PMA\Test\Stubs\Response(); - $container->set('PMA\libraries\Response', $this->response); - $container->alias('response', 'PMA\libraries\Response'); + $container->set('PhpMyAdmin\Response', $this->response); + $container->alias('response', 'PhpMyAdmin\Response'); } /** diff --git a/test/classes/controllers/ServerVariablesControllerTest.php b/test/classes/controllers/ServerVariablesControllerTest.php index 571e9de4fe..ee948757b8 100644 --- a/test/classes/controllers/ServerVariablesControllerTest.php +++ b/test/classes/controllers/ServerVariablesControllerTest.php @@ -91,8 +91,8 @@ class ServerVariablesControllerTest extends PMATestCase $container = Container::getDefaultContainer(); $container->set('dbi', $GLOBALS['dbi']); $this->_response = new \PMA\Test\Stubs\Response(); - $container->set('PMA\libraries\Response', $this->_response); - $container->alias('response', 'PMA\libraries\Response'); + $container->set('PhpMyAdmin\Response', $this->_response); + $container->alias('response', 'PhpMyAdmin\Response'); } /** diff --git a/test/classes/controllers/TableIndexesControllerTest.php b/test/classes/controllers/TableIndexesControllerTest.php index 7106a5c944..34cdf19728 100644 --- a/test/classes/controllers/TableIndexesControllerTest.php +++ b/test/classes/controllers/TableIndexesControllerTest.php @@ -10,7 +10,7 @@ use PMA\libraries\controllers\table\TableIndexesController; use PMA\libraries\di\Container; use PMA\libraries\Theme; use PMA\libraries\URL; -use PMA\libraries\Response; +use PhpMyAdmin\Response; /* * Include to test. @@ -100,8 +100,8 @@ class TableIndexesControllerTest extends PMATestCase $container->set('table', 'table'); $container->set('dbi', $GLOBALS['dbi']); $response = new \PMA\Test\Stubs\Response(); - $container->set('PMA\libraries\Response', $response); - $container->alias('response', 'PMA\libraries\Response'); + $container->set('PhpMyAdmin\Response', $response); + $container->alias('response', 'PhpMyAdmin\Response'); $ctrl = new TableIndexesController(null); @@ -152,8 +152,8 @@ class TableIndexesControllerTest extends PMATestCase $container->set('table', 'table'); $container->set('dbi', $GLOBALS['dbi']); $response = new \PMA\Test\Stubs\Response(); - $container->set('PMA\libraries\Response', $response); - $container->alias('response', 'PMA\libraries\Response'); + $container->set('PhpMyAdmin\Response', $response); + $container->alias('response', 'PhpMyAdmin\Response'); $index = new PhpMyAdmin\Index(); $ctrl = new TableIndexesController($index); diff --git a/test/classes/controllers/TableRelationControllerTest.php b/test/classes/controllers/TableRelationControllerTest.php index c77259cfb2..312b0cc004 100644 --- a/test/classes/controllers/TableRelationControllerTest.php +++ b/test/classes/controllers/TableRelationControllerTest.php @@ -56,8 +56,8 @@ class TableRelationControllerTest extends PMATestCase $container->set('table', 'table'); $container->set('dbi', $GLOBALS['dbi']); $this->_response = new \PMA\Test\Stubs\Response(); - $container->set('PMA\libraries\Response', $this->_response); - $container->alias('response', 'PMA\libraries\Response'); + $container->set('PhpMyAdmin\Response', $this->_response); + $container->alias('response', 'PhpMyAdmin\Response'); } /** diff --git a/test/classes/controllers/TableStructureControllerTest.php b/test/classes/controllers/TableStructureControllerTest.php index d7b233c606..0978b84673 100644 --- a/test/classes/controllers/TableStructureControllerTest.php +++ b/test/classes/controllers/TableStructureControllerTest.php @@ -68,8 +68,8 @@ class TableStructureControllerTest extends PMATestCase $container->set('table', 'table'); $container->set('dbi', $GLOBALS['dbi']); $this->_response = new \PMA\Test\Stubs\Response(); - $container->set('PMA\libraries\Response', $this->_response); - $container->alias('response', 'PMA\libraries\Response'); + $container->set('PhpMyAdmin\Response', $this->_response); + $container->alias('response', 'PhpMyAdmin\Response'); } /** diff --git a/test/libraries/PMA_insert_edit_test.php b/test/libraries/PMA_insert_edit_test.php index 8b2740356e..244ef47944 100644 --- a/test/libraries/PMA_insert_edit_test.php +++ b/test/libraries/PMA_insert_edit_test.php @@ -197,13 +197,13 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase // case 2 $GLOBALS['cfg']['ShowSQL'] = false; - $responseMock = $this->getMockBuilder('PMA\libraries\Response') + $responseMock = $this->getMockBuilder('PhpMyAdmin\Response') ->disableOriginalConstructor() ->setMethods(array('addHtml')) ->getMock(); - $restoreInstance = PMA\libraries\Response::getInstance(); - $response = new ReflectionProperty('PMA\libraries\Response', '_instance'); + $restoreInstance = PhpMyAdmin\Response::getInstance(); + $response = new ReflectionProperty('PhpMyAdmin\Response', '_instance'); $response->setAccessible(true); $response->setValue($responseMock); @@ -1852,7 +1852,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase ->method('getScripts') ->will($this->returnValue($scriptsMock)); - $responseMock = $this->getMockBuilder('PMA\libraries\Response') + $responseMock = $this->getMockBuilder('PhpMyAdmin\Response') ->disableOriginalConstructor() ->setMethods(array('getHeader')) ->getMock(); @@ -1861,8 +1861,8 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase ->method('getHeader') ->will($this->returnValue($headerMock)); - $restoreInstance = PMA\libraries\Response::getInstance(); - $response = new ReflectionProperty('PMA\libraries\Response', '_instance'); + $restoreInstance = PhpMyAdmin\Response::getInstance(); + $response = new ReflectionProperty('PhpMyAdmin\Response', '_instance'); $response->setAccessible(true); $response->setValue($responseMock); @@ -2713,13 +2713,13 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase $GLOBALS['cfg']['ShowSQL'] = false; $_REQUEST['default_action'] = 'insert'; - $responseMock = $this->getMockBuilder('PMA\libraries\Response') + $responseMock = $this->getMockBuilder('PhpMyAdmin\Response') ->disableOriginalConstructor() ->setMethods(array('addHtml')) ->getMock(); - $restoreInstance = PMA\libraries\Response::getInstance(); - $response = new ReflectionProperty('PMA\libraries\Response', '_instance'); + $restoreInstance = PhpMyAdmin\Response::getInstance(); + $response = new ReflectionProperty('PhpMyAdmin\Response', '_instance'); $response->setAccessible(true); $response->setValue($responseMock); diff --git a/test/libraries/rte/PMA_EVN_getEditorForm_test.php b/test/libraries/rte/PMA_EVN_getEditorForm_test.php index 558c2a727f..342eb4449d 100644 --- a/test/libraries/rte/PMA_EVN_getEditorForm_test.php +++ b/test/libraries/rte/PMA_EVN_getEditorForm_test.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-test */ -use PMA\libraries\Response; +use PhpMyAdmin\Response; /* * Include to test. diff --git a/test/libraries/rte/PMA_RTN_getEditorForm_test.php b/test/libraries/rte/PMA_RTN_getEditorForm_test.php index 6f3a3a7357..aed87d8166 100644 --- a/test/libraries/rte/PMA_RTN_getEditorForm_test.php +++ b/test/libraries/rte/PMA_RTN_getEditorForm_test.php @@ -8,7 +8,7 @@ use PMA\libraries\Theme; use PMA\libraries\TypesMySQL; -use PMA\libraries\Response; +use PhpMyAdmin\Response; $GLOBALS['server'] = 0; diff --git a/test/libraries/rte/PMA_RTN_getExecuteForm_test.php b/test/libraries/rte/PMA_RTN_getExecuteForm_test.php index dcf3a1001e..aa23f222bf 100644 --- a/test/libraries/rte/PMA_RTN_getExecuteForm_test.php +++ b/test/libraries/rte/PMA_RTN_getExecuteForm_test.php @@ -7,7 +7,7 @@ */ use PMA\libraries\TypesMySQL; -use PMA\libraries\Response; +use PhpMyAdmin\Response; $GLOBALS['server'] = 0; diff --git a/test/libraries/rte/PMA_TRI_getEditorForm_test.php b/test/libraries/rte/PMA_TRI_getEditorForm_test.php index 83ab323f30..0bd300f7e5 100644 --- a/test/libraries/rte/PMA_TRI_getEditorForm_test.php +++ b/test/libraries/rte/PMA_TRI_getEditorForm_test.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-test */ -use PMA\libraries\Response; +use PhpMyAdmin\Response; require_once 'libraries/database_interface.inc.php'; diff --git a/themes.php b/themes.php index 729644cf5a..59ba44f78f 100644 --- a/themes.php +++ b/themes.php @@ -8,7 +8,7 @@ use PhpMyAdmin\Core; use PMA\libraries\ThemeManager; -use PMA\libraries\Response; +use PhpMyAdmin\Response; /** * get some globals diff --git a/transformation_overview.php b/transformation_overview.php index e2c5bc32b8..b436abd304 100644 --- a/transformation_overview.php +++ b/transformation_overview.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\Transformations; /** diff --git a/transformation_wrapper.php b/transformation_wrapper.php index e41f4a5b67..50e7841032 100644 --- a/transformation_wrapper.php +++ b/transformation_wrapper.php @@ -7,7 +7,7 @@ */ use PhpMyAdmin\Core; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\Transformations; /** @@ -8,7 +8,7 @@ use PhpMyAdmin\Core; use PMA\libraries\Sanitize; -use PMA\libraries\Response; +use PhpMyAdmin\Response; /** * Gets core libraries and defines some variables diff --git a/user_password.php b/user_password.php index 71311c6d19..306c16d32a 100644 --- a/user_password.php +++ b/user_password.php @@ -9,7 +9,7 @@ use PhpMyAdmin\Core; use PMA\libraries\URL; -use PMA\libraries\Response; +use PhpMyAdmin\Response; /** * Gets some core libraries diff --git a/version_check.php b/version_check.php index de055ba269..a238040a84 100644 --- a/version_check.php +++ b/version_check.php @@ -8,7 +8,7 @@ use PhpMyAdmin\Core; use PMA\libraries\VersionInformation; -use PMA\libraries\Response; +use PhpMyAdmin\Response; $_GET['ajax_request'] = 'true'; diff --git a/view_create.php b/view_create.php index cc250797db..9432b664fd 100644 --- a/view_create.php +++ b/view_create.php @@ -10,7 +10,7 @@ use PhpMyAdmin\Core; use PMA\libraries\URL; -use PMA\libraries\Response; +use PhpMyAdmin\Response; require_once './libraries/common.inc.php'; diff --git a/view_operations.php b/view_operations.php index 94dbdde161..a030e3e4ea 100644 --- a/view_operations.php +++ b/view_operations.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ use PMA\libraries\Table; -use PMA\libraries\Response; +use PhpMyAdmin\Response; use PMA\libraries\URL; /** |