Merge remote-tracking branch 'origin/master'

ajax.php

@@ -6,7 +6,7 @@
  * @package PhpMyAdmin
  */
 
-use PMA\libraries\Response;
+use PhpMyAdmin\Response;
 use PMA\libraries\Util;
 require_once 'libraries/common.inc.php';
 

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

changelog.php

@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-use PMA\libraries\Response;
+use PhpMyAdmin\Response;
 
 /**
  * Gets core libraries and defines some variables

chk_rel.php

@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-use PMA\libraries\Response;
+use PhpMyAdmin\Response;
 
 require_once 'libraries/common.inc.php';
 

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

db_datadict.php

@@ -6,7 +6,7 @@
  * @package PhpMyAdmin
  */
 
-use PMA\libraries\Response;
+use PhpMyAdmin\Response;
 use PMA\libraries\Transformations;
 use PMA\libraries\URL;
 

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

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

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

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

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;

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

db_sql.php

@@ -6,7 +6,7 @@
  * @package PhpMyAdmin
  */
 use PMA\libraries\config\PageSettings;
-use PMA\libraries\Response;
+use PhpMyAdmin\Response;
 
 /**
  *

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']) {

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

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(

db_tracking.php

@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-use PMA\libraries\Response;
+use PhpMyAdmin\Response;
 use PMA\libraries\Tracker;
 
 /**

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

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

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

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;
 

index.php

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

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

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

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

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

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;

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

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;

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

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;

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

libraries/classes/ErrorHandler.php

@@ -8,7 +8,7 @@
 namespace PhpMyAdmin;
 
 use PhpMyAdmin\Error;
-use PMA\libraries\Response;
+use PhpMyAdmin\Response;
 use PMA\libraries\URL;
 
 /**

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;

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;

libraries/classes/OpenDocument.php

@@ -5,8 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries;
-
+namespace PhpMyAdmin;
 
 use PMA\libraries\ZipFile;
 

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

libraries/classes/Partition.php

@@ -5,7 +5,9 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries;
+namespace PhpMyAdmin;
+
+use PMA\libraries\SubPartition;
 
 /**
  * base Partition Class

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:') . ' '

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.

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

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;

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

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

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;

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;

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;

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;

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

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':

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;
 

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')) {

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;

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

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;

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;

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')) {

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;
 

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;
 

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;

libraries/parse_analyze.lib.php

@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-use PMA\libraries\Response;
+use PhpMyAdmin\Response;
 
 if (! defined('PHPMYADMIN')) {
     exit;

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

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;

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;
 

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'] = '';
 

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;
 

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;

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

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

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;

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;

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

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

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

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

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

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

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

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')) {

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;

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;

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;

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;

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;

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')) {

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;

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;

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;

license.php

@@ -8,7 +8,7 @@
  *
  * @package PhpMyAdmin
  */
-use PMA\libraries\Response;
+use PhpMyAdmin\Response;
 
 /**
  * Gets core libraries and defines some variables

lint.php

@@ -8,7 +8,7 @@
 
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Linter;
-use PMA\libraries\Response;
+use PhpMyAdmin\Response;
 
 $_GET['ajax_request'] = 'true';
 

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;
 

normalization.php

@@ -8,7 +8,7 @@
 
 use PhpMyAdmin\Core;
 use PMA\libraries\URL;
-use PMA\libraries\Response;
+use PhpMyAdmin\Response;
 
 /**
  *

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

phpmyadmin.css.php

@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-use PMA\libraries\OutputBuffering;
+use PhpMyAdmin\OutputBuffering;
 use PMA\libraries\ThemeManager;
 
 /**

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

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;

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(

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(

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(

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(