Simplify Response object handling

- always use use and short name
- avoid calling getInstance() several times in one script

Signed-off-by: Michal Čihař <michal@cihar.com>

80 files changed, 188 insertions, 141 deletions

diff --git a/browse_foreigners.php b/browse_foreigners.php
index 68a50a16bb..8bfd85d6f1 100644
--- a/browse_foreigners.php
+++ b/browse_foreigners.php
@@ -5,6 +5,7 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\Response;
 
 require_once 'libraries/common.inc.php';
 require_once 'libraries/transformations.lib.php';
@@ -26,7 +27,7 @@ foreach ($request_params as $one_request_param) {
 
 PMA\libraries\Util::checkParameters(array('db', 'table', 'field'));
 
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 $response->getFooter()->setMinimal();
 $header = $response->getHeader();
 $header->disableMenuAndConsole();
diff --git a/changelog.php b/changelog.php
index 45f28496bd..27f232a55e 100644
--- a/changelog.php
+++ b/changelog.php
@@ -5,13 +5,14 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\Response;
 
 /**
  * Gets core libraries and defines some variables
  */
 require 'libraries/common.inc.php';
 
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 $response->disable();
 $response->getHeader()->sendHttpHeaders();
 
diff --git a/chk_rel.php b/chk_rel.php
index b2cd63012d..759e442d17 100644
--- a/chk_rel.php
+++ b/chk_rel.php
@@ -5,6 +5,7 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\Response;
 
 require_once 'libraries/common.inc.php';
 
@@ -26,7 +27,7 @@ if (isset($_REQUEST['fix_pmadb'])) {
     PMA_fixPMATables($cfgRelation['db']);
 }
 
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 $response->addHTML(
     PMA_getRelationsParamDiagnostic($cfgRelation)
 );
diff --git a/db_central_columns.php b/db_central_columns.php
index 41d58e707a..c14d094c26 100644
--- a/db_central_columns.php
+++ b/db_central_columns.php
@@ -7,6 +7,7 @@
  * @package PhpMyAdmin
  */
 use PMA\libraries\URL;
+use PMA\libraries\Response;
 
 /**
  * Gets some core libraries
@@ -57,7 +58,7 @@ if (isset($_POST['add_column'])) {
     $selected_col[] = $_POST['column-select'];
     $tmp_msg = PMA_syncUniqueColumns($selected_col, false, $selected_tbl);
 }
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 $header = $response->getHeader();
 $scripts = $header->getScripts();
 $scripts->addFile('jquery/jquery.uitablefilter.js');
diff --git a/db_datadict.php b/db_datadict.php
index 4586895bef..544709acce 100644
--- a/db_datadict.php
+++ b/db_datadict.php
@@ -6,6 +6,7 @@
  * @package PhpMyAdmin
  */
 use PMA\libraries\URL;
+use PMA\libraries\Response;
 
 /**
  * Gets the variables sent or posted to this script, then displays headers
@@ -27,7 +28,7 @@ if (! isset($selected_tbl)) {
     ) = PMA\libraries\Util::getDbInfo($db, isset($sub_part) ? $sub_part : '');
 }
 
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 $header   = $response->getHeader();
 $header->enablePrintView();
 
diff --git a/db_designer.php b/db_designer.php
index 9720a097c2..94395e8821 100644
--- a/db_designer.php
+++ b/db_designer.php
@@ -5,12 +5,13 @@
  *
  * @package PhpMyAdmin-Designer
  */
+use PMA\libraries\Response;
 
 require_once 'libraries/common.inc.php';
 require_once 'libraries/pmd_common.php';
 require_once 'libraries/db_designer.lib.php';
 
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 
 if (isset($_REQUEST['dialog'])) {
 
@@ -113,7 +114,7 @@ if (isset($_GET['db'])) {
     $params['db'] = $_GET['db'];
 }
 
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 $response->getFooter()->setMinimal();
 $header   = $response->getHeader();
 $header->setBodyId('pmd_body');
diff --git a/db_import.php b/db_import.php
index 251a6b0cc1..34bc300cc9 100644
--- a/db_import.php
+++ b/db_import.php
@@ -6,6 +6,7 @@
  * @package PhpMyAdmin
  */
 
+use PMA\libraries\Response;
 use PMA\libraries\config\PageSettings;
 
 require_once 'libraries/common.inc.php';
@@ -14,7 +15,7 @@ require_once 'libraries/config/page_settings.forms.php';
 
 PageSettings::showGroup('Import');
 
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 $header   = $response->getHeader();
 $scripts  = $header->getScripts();
 $scripts->addFile('import.js');
@@ -37,7 +38,7 @@ list(
 ) = PMA\libraries\Util::getDbInfo($db, isset($sub_part) ? $sub_part : '');
 
 require 'libraries/display_import.lib.php';
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 $response->addHTML(
     PMA_getImportDisplay(
         'database', $db, $table, $max_upload_size
diff --git a/db_operations.php b/db_operations.php
index 253c1eaca0..9f884f0474 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -11,6 +11,7 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\Response;
 use PMA\libraries\plugins\export\ExportSql;
 
 /**
@@ -26,7 +27,7 @@ require_once 'libraries/check_user_privileges.lib.php';
 require_once 'libraries/operations.lib.php';
 
 // add a javascript file for jQuery functions to handle Ajax actions
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 $header = $response->getHeader();
 $scripts = $header->getScripts();
 $scripts->addFile('db_operations.js');
@@ -174,7 +175,6 @@ 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
      */
-    $response = PMA\libraries\Response::getInstance();
     if ($response->isAjax()) {
         $response->setRequestStatus($message->isSuccess());
         $response->addJSON('message', $message);
diff --git a/db_qbe.php b/db_qbe.php
index 929cdc1786..e96d336e6a 100644
--- a/db_qbe.php
+++ b/db_qbe.php
@@ -7,6 +7,7 @@
  */
 use PMA\libraries\SavedSearches;
 use PMA\libraries\URL;
+use PMA\libraries\Response;
 
 /**
  * requirements
@@ -14,7 +15,7 @@ use PMA\libraries\URL;
 require_once 'libraries/common.inc.php';
 require_once 'libraries/sql.lib.php';
 
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 
 // Gets the relation settings
 $cfgRelation = PMA_getRelationsParam();
diff --git a/db_search.php b/db_search.php
index 0b442a5cab..9eb639bde2 100644
--- a/db_search.php
+++ b/db_search.php
@@ -13,9 +13,10 @@
  */
 require_once 'libraries/common.inc.php';
 
+use PMA\libraries\Response;
 use PMA\libraries\DbSearch;
 
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 $header   = $response->getHeader();
 $scripts  = $header->getScripts();
 $scripts->addFile('db_search.js');
diff --git a/db_sql.php b/db_sql.php
index c1daf09373..f235254e76 100644
--- a/db_sql.php
+++ b/db_sql.php
@@ -6,6 +6,7 @@
  * @package PhpMyAdmin
  */
 use PMA\libraries\config\PageSettings;
+use PMA\libraries\Response;
 
 /**
  *
@@ -19,7 +20,7 @@ PageSettings::showGroup('Sql_queries');
 /**
  * Runs common work
  */
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 $header   = $response->getHeader();
 $scripts  = $header->getScripts();
 $scripts->addFile('makegrid.js');
diff --git a/db_sql_autocomplete.php b/db_sql_autocomplete.php
index b760e2322b..1557da9ec3 100644
--- a/db_sql_autocomplete.php
+++ b/db_sql_autocomplete.php
@@ -6,6 +6,7 @@
  * @package PhpMyAdmin
  */
 
+use PMA\libraries\Response;
 require_once 'libraries/common.inc.php';
 
 if ($GLOBALS['cfg']['EnableAutocompleteForTablesAndColumns']) {
@@ -22,5 +23,5 @@ if ($GLOBALS['cfg']['EnableAutocompleteForTablesAndColumns']) {
 } else {
     $sql_autocomplete = true;
 }
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 $response->addJSON("tables", json_encode($sql_autocomplete));
diff --git a/db_sql_format.php b/db_sql_format.php
index c89ace5f81..46c535cf09 100644
--- a/db_sql_format.php
+++ b/db_sql_format.php
@@ -5,6 +5,7 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\Response;
 
 /**
  * Loading common files. Used to check for authorization, localization and to
@@ -16,5 +17,5 @@ $query = !empty($_POST['sql']) ? $_POST['sql'] : '';
 
 $query = SqlParser\Utils\Formatter::format($query);
 
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 $response->addJSON("sql", $query);
diff --git a/db_tracking.php b/db_tracking.php
index c8f78379dd..3eb3eeab3d 100644
--- a/db_tracking.php
+++ b/db_tracking.php
@@ -5,6 +5,7 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\Response;
 use PMA\libraries\Tracker;
 
 /**
@@ -16,7 +17,7 @@ require_once './libraries/tracking.lib.php';
 require_once 'libraries/display_create_table.lib.php';
 
 //Get some js files needed for Ajax requests
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 $header   = $response->getHeader();
 $scripts  = $header->getScripts();
 $scripts->addFile('jquery/jquery.tablesorter.js');
diff --git a/error_report.php b/error_report.php
index eb77022ce3..a984bf938b 100644
--- a/error_report.php
+++ b/error_report.php
@@ -5,6 +5,7 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\Response;
 require_once 'libraries/common.inc.php';
 require_once 'libraries/error_report.lib.php';
 require_once 'libraries/user_preferences.lib.php';
@@ -15,7 +16,7 @@ if (!isset($_REQUEST['exception_type'])
     die('Oops, something went wrong!!');
 }
 
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 
 if (isset($_REQUEST['send_error_report'])
     && ($_REQUEST['send_error_report'] == true
@@ -35,7 +36,6 @@ if (isset($_REQUEST['send_error_report'])
         ) {
             $_SESSION['error_subm_count'] = 0;
             $_SESSION['prev_errors'] = '';
-             $response = PMA\libraries\Response::getInstance();
             $response->addJSON('_stopErrorReportLoop', '1');
         } else {
             $_SESSION['prev_error_subm_time'] = time();
diff --git a/gis_data_editor.php b/gis_data_editor.php
index 129d6bdff9..0697bd7a28 100644
--- a/gis_data_editor.php
+++ b/gis_data_editor.php
@@ -5,6 +5,7 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\Response;
 use PMA\libraries\gis\GISFactory;
 use PMA\libraries\gis\GISVisualization;
 use PMA\libraries\URL;
@@ -101,7 +102,7 @@ if (isset($_REQUEST['generate']) && $_REQUEST['generate'] == true) {
         'visualization' => $visualization,
         'openLayers'    => $open_layers,
     );
-    $response = PMA\libraries\Response::getInstance();
+    $response = Response::getInstance();
     $response->addJSON($extra_data);
     exit;
 }
@@ -427,5 +428,5 @@ echo '</div>';
 echo '</div>';
 echo '</form>';
 
-PMA\libraries\Response::getInstance()->addJSON('gis_editor', ob_get_contents());
+Response::getInstance()->addJSON('gis_editor', ob_get_contents());
 ob_end_clean();
diff --git a/import.php b/import.php
index 630f4ff663..42d967dd90 100644
--- a/import.php
+++ b/import.php
@@ -5,6 +5,7 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\Response;
 use PMA\libraries\Encoding;
 use PMA\libraries\plugins\ImportPlugin;
 use PMA\libraries\File;
@@ -36,9 +37,10 @@ if (isset($_REQUEST['simulate_dml'])) {
     exit;
 }
 
+$response = Response::getInstance();
+
 // If it's a refresh console bookmarks request
 if (isset($_REQUEST['console_bookmark_refresh'])) {
-    $response = PMA\libraries\Response::getInstance();
     $response->addJSON(
         'console_message_bookmark', PMA\libraries\Console::getBookmarkContent()
     );
@@ -46,7 +48,6 @@ if (isset($_REQUEST['console_bookmark_refresh'])) {
 }
 // If it's a console bookmark add request
 if (isset($_REQUEST['console_bookmark_add'])) {
-    $response = PMA\libraries\Response::getInstance();
     if (isset($_REQUEST['label']) && isset($_REQUEST['db'])
         && isset($_REQUEST['bookmark_query']) && isset($_REQUEST['shared'])
     ) {
@@ -203,7 +204,6 @@ if ($_POST == array() && $_GET == array()) {
     $_SESSION['Import_message']['message'] = $message->getDisplay();
     $_SESSION['Import_message']['go_back_url'] = $GLOBALS['goto'];
 
-    $response = PMA\libraries\Response::getInstance();
     $response->setRequestStatus(false);
     $response->addJSON('message', $message);
 
@@ -212,7 +212,6 @@ if ($_POST == array() && $_GET == array()) {
 
 // Add console message id to response output
 if (isset($_POST['console_message_id'])) {
-    $response = PMA\libraries\Response::getInstance();
     $response->addJSON('console_message_id', $_POST['console_message_id']);
 }
 
@@ -335,7 +334,6 @@ $bookmark_created = false;
 // Bookmark Support: get a query back from bookmark if required
 if (! empty($_REQUEST['id_bookmark'])) {
     $id_bookmark = (int)$_REQUEST['id_bookmark'];
-    $response = PMA\libraries\Response::getInstance();
     switch ($_REQUEST['action_bookmark']) {
     case 0: // bookmarked query that have to be run
         $bookmark = Bookmark::get(
@@ -393,7 +391,6 @@ if (! empty($_REQUEST['id_bookmark'])) {
                 $message = PMA\libraries\Message::success(
                     __('The bookmark has been deleted.')
                 );
-                $response = PMA\libraries\Response::getInstance();
                 $response->setRequestStatus($message->isSuccess());
                 $response->addJSON('message', $message);
                 $response->addJSON('action_bookmark', $_REQUEST['action_bookmark']);
@@ -746,7 +743,6 @@ if ($go_sql) {
         );
     }
 
-    $response = PMA\libraries\Response::getInstance();
     $response->addJSON('ajax_reload', $ajax_reload);
     $response->addHTML($html_output);
     exit();
@@ -762,7 +758,6 @@ if ($go_sql) {
         );
     }
 
-    $response = PMA\libraries\Response::getInstance();
     $response->setRequestStatus(true);
     $response->addJSON('message', PMA\libraries\Message::success($msg));
     $response->addJSON(
@@ -770,7 +765,6 @@ if ($go_sql) {
         PMA\libraries\Util::getMessage($msg, $sql_query, 'success')
     );
 } else if ($result == false) {
-    $response = PMA\libraries\Response::getInstance();
     $response->setRequestStatus(false);
     $response->addJSON('message', PMA\libraries\Message::error($msg));
 } else {
diff --git a/index.php b/index.php
index abe673bf17..2d9bb25e38 100644
--- a/index.php
+++ b/index.php
@@ -5,6 +5,7 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\Response;
 use PMA\libraries\RecentFavoriteTable;
 use PMA\libraries\URL;
 use PMA\libraries\Sanitize;
@@ -79,7 +80,7 @@ if (! empty($_REQUEST['db'])) {
     exit;
 }
 
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 /**
  * Check if it is an ajax request to reload the recent tables list.
  */
diff --git a/libraries/controllers/database/DatabaseStructureController.php b/libraries/controllers/database/DatabaseStructureController.php
index a83ea640e8..408e438d9c 100644
--- a/libraries/controllers/database/DatabaseStructureController.php
+++ b/libraries/controllers/database/DatabaseStructureController.php
@@ -14,6 +14,7 @@ use PMA\libraries\controllers\DatabaseController;
 use PMA\libraries\Charsets;
 use PMA\libraries\Message;
 use PMA\libraries\RecentFavoriteTable;
+use PMA\libraries\Response;
 use PMA\libraries\Template;
 use PMA\libraries\Tracker;
 use PMA\libraries\Util;
@@ -108,7 +109,7 @@ class DatabaseStructureController extends DatabaseController
      */
     public function indexAction()
     {
-        $response = PMA\libraries\Response::getInstance();
+        $response = Response::getInstance();
 
         // Add/Remove favorite tables using Ajax request.
         if ($response->isAjax() && !empty($_REQUEST['favorite_table'])) {
diff --git a/libraries/controllers/server/ServerDatabasesController.php b/libraries/controllers/server/ServerDatabasesController.php
index d1f9093257..4d0ef9eb6e 100644
--- a/libraries/controllers/server/ServerDatabasesController.php
+++ b/libraries/controllers/server/ServerDatabasesController.php
@@ -12,6 +12,7 @@ namespace PMA\libraries\controllers\server;
 use PMA\libraries\controllers\Controller;
 use PMA\libraries\Charsets;
 use PMA\libraries\Message;
+use PMA\libraries\Response;
 use PMA\libraries\Template;
 use PMA\libraries\Util;
 use PMA\libraries\URL;
@@ -57,7 +58,7 @@ class ServerDatabasesController extends Controller
     {
         include_once 'libraries/check_user_privileges.lib.php';
 
-        $response = PMA\libraries\Response::getInstance();
+        $response = Response::getInstance();
 
         if (isset($_REQUEST['drop_selected_dbs'])
             && $response->isAjax()
diff --git a/libraries/core.lib.php b/libraries/core.lib.php
index e7c38e8ee0..a52d3ca775 100644
--- a/libraries/core.lib.php
+++ b/libraries/core.lib.php
@@ -8,6 +8,7 @@
  * @package PhpMyAdmin
  */
 use PMA\libraries\Message;
+use PMA\libraries\Response;
 use PMA\libraries\URL;
 use PMA\libraries\Sanitize;
 
@@ -223,7 +224,7 @@ function PMA_fatalError(
         $error_message = vsprintf($error_message, $message_args);
     }
 
-        $response = PMA\libraries\Response::getInstance();
+    $response = Response::getInstance();
     if ($response->isAjax()) {
         $response->setRequestStatus(false);
         $response->addJSON('message', PMA\libraries\Message::error($error_message));
@@ -481,7 +482,7 @@ function PMA_getenv($var_name)
 function PMA_sendHeaderLocation($uri, $use_refresh = false)
 {
     if ($GLOBALS['PMA_Config']->get('PMA_IS_IIS') && mb_strlen($uri) > 600) {
-        PMA\libraries\Response::getInstance()->disable();
+        Response::getInstance()->disable();
 
         echo PMA\libraries\Template::get('header_location')
             ->render(array('uri' => $uri));
@@ -497,7 +498,7 @@ function PMA_sendHeaderLocation($uri, $use_refresh = false)
         $uri = $GLOBALS['PMA_Config']->getRootPath() . substr($uri, 2);
     }
 
-    $response = PMA\libraries\Response::getInstance();
+    $response = Response::getInstance();
 
     session_write_close();
     if ($response->headersSent()) {
@@ -809,7 +810,7 @@ function PMA_previewSQL($query_data)
         $retval .= PMA\libraries\Util::formatSql($query_data);
     }
     $retval .= '</div>';
-    $response = PMA\libraries\Response::getInstance();
+    $response = Response::getInstance();
     $response->addJSON('sql_data', $retval);
     exit;
 }
diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php
index cc93b4c363..5f9364d1a3 100644
--- a/libraries/db_common.inc.php
+++ b/libraries/db_common.inc.php
@@ -19,6 +19,7 @@ PMA\libraries\Util::checkParameters(array('db'));
 global $cfg;
 global $db;
 
+$response = Response::getInstance();
 $is_show_stats = $cfg['ShowStats'];
 
 $db_is_system_schema = $GLOBALS['dbi']->isSystemSchema($db);
@@ -58,7 +59,7 @@ if (! isset($is_db) || ! $is_db) {
         . URL::getCommonRaw(array())
         . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1';
     if (strlen($db) === 0 || ! $is_db) {
-        $response = PMA\libraries\Response::getInstance();
+        $response = Response::getInstance();
         if ($response->isAjax()) {
             $response->setRequestStatus(false);
             $response->addJSON(
@@ -92,7 +93,6 @@ if (isset($_REQUEST['submitcollation'])
      * db charset change action on db_operations.php.  If this causes a bug on
      * other pages, we might have to move this to a different location.
      */
-    $response = PMA\libraries\Response::getInstance();
     if ($response->isAjax()) {
         $response->setRequestStatus($message->isSuccess());
         $response->addJSON('message', $message);
diff --git a/libraries/db_table_exists.inc.php b/libraries/db_table_exists.inc.php
index 3aee7b5772..b4fc51021d 100644
--- a/libraries/db_table_exists.inc.php
+++ b/libraries/db_table_exists.inc.php
@@ -7,6 +7,7 @@
  * @package PhpMyAdmin
  */
 use PMA\libraries\Message;
+use PMA\libraries\Response;
 use PMA\libraries\URL;
 
 if (! defined('PHPMYADMIN')) {
@@ -23,7 +24,7 @@ if (empty($is_db)) {
     if (! $is_db) {
         // not a valid db name -> back to the welcome page
         if (! defined('IS_TRANSFORMATION_WRAPPER')) {
-            $response = PMA\libraries\Response::getInstance();
+            $response = Response::getInstance();
             if ($response->isAjax()) {
                 $response->setRequestStatus(false);
                 $response->addJSON(
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index 321eadb614..bc80a65078 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -9,6 +9,7 @@
 use PMA\libraries\Encoding;
 use PMA\libraries\Message;
 use PMA\libraries\plugins\ExportPlugin;
+use PMA\libraries\Response;
 use PMA\libraries\Table;
 use PMA\libraries\URL;
 
@@ -1150,7 +1151,7 @@ function PMA_handleExportTemplateActions($cfgRelation)
 
     $result = PMA_queryAsControlUser($query, false);
 
-    $response = PMA\libraries\Response::getInstance();
+    $response = Response::getInstance();
     if (! $result) {
         $error = $GLOBALS['dbi']->getError($GLOBALS['controllink']);
         $response->setRequestStatus(false);
diff --git a/libraries/display_git_revision.lib.php b/libraries/display_git_revision.lib.php
index 38506c8889..a57022b0cc 100644
--- a/libraries/display_git_revision.lib.php
+++ b/libraries/display_git_revision.lib.php
@@ -5,6 +5,7 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\Response;
 
 /**
 * Prints details about the current Git commit revision
@@ -14,7 +15,7 @@
 function PMA_printGitRevision()
 {
     if (! $GLOBALS['PMA_Config']->get('PMA_VERSION_GIT')) {
-        $response = PMA\libraries\Response::getInstance();
+        $response = Response::getInstance();
         $response->setRequestStatus(false);
         return;
     }
diff --git a/libraries/import.lib.php b/libraries/import.lib.php
index db1c86c5b7..906eed315e 100644
--- a/libraries/import.lib.php
+++ b/libraries/import.lib.php
@@ -7,6 +7,7 @@
  */
 use PMA\libraries\Encoding;
 use PMA\libraries\Message;
+use PMA\libraries\Response;
 use PMA\libraries\Table;
 use PMA\libraries\Util;
 use PMA\libraries\URL;
@@ -1320,7 +1321,7 @@ function PMA_stopImport( Message $error_message )
     $msg = $error_message->getDisplay();
     $_SESSION['Import_message']['message'] = $msg;
 
-    $response = PMA\libraries\Response::getInstance();
+    $response = Response::getInstance();
     $response->setRequestStatus(false);
     $response->addJSON('message', PMA\libraries\Message::error($msg));
 
@@ -1334,7 +1335,7 @@ function PMA_stopImport( Message $error_message )
  */
 function PMA_handleSimulateDMLRequest()
 {
-    $response = PMA\libraries\Response::getInstance();
+    $response = Response::getInstance();
     $error = false;
     $error_msg = __('Only single-table UPDATE and DELETE queries can be simulated.');
     $sql_delimiter = $_REQUEST['sql_delimiter'];
@@ -1581,7 +1582,7 @@ function PMA_handleRollbackRequest($sql_query)
 
     if ($error) {
         unset($_REQUEST['rollback_query']);
-        $response = PMA\libraries\Response::getInstance();
+        $response = Response::getInstance();
         $message = Message::rawError($error);
         $response->addJSON('message', $message);
         exit;
diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php
index fdd10f528f..2eb7d31830 100644
--- a/libraries/insert_edit.lib.php
+++ b/libraries/insert_edit.lib.php
@@ -7,6 +7,7 @@
  */
 use PMA\libraries\Message;
 use PMA\libraries\plugins\TransformationsPlugin;
+use PMA\libraries\Response;
 use PMA\libraries\URL;
 use PMA\libraries\Sanitize;
 
@@ -119,7 +120,7 @@ function PMA_showEmptyResultMessageOrSetUniqueCondition($rows, $key_id,
     // No row returned
     if (! $rows[$key_id]) {
         unset($rows[$key_id], $where_clause_array[$key_id]);
-        PMA\libraries\Response::getInstance()->addHtml(
+        Response::getInstance()->addHtml(
             PMA\libraries\Util::getMessage(
                 __('MySQL returned an empty result set (i.e. zero rows).'),
                 $local_query
@@ -1853,7 +1854,7 @@ function PMA_isInsertRow()
         && $_REQUEST['insert_rows'] != $GLOBALS['cfg']['InsertRows']
     ) {
         $GLOBALS['cfg']['InsertRows'] = $_REQUEST['insert_rows'];
-        $response = PMA\libraries\Response::getInstance();
+        $response = Response::getInstance();
         $header = $response->getHeader();
         $scripts = $header->getScripts();
         $scripts->addFile('tbl_change.js');
diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php
index 42b0f5e76e..ff8a402fe4 100644
--- a/libraries/mult_submits.inc.php
+++ b/libraries/mult_submits.inc.php
@@ -39,6 +39,7 @@ foreach ($request_params as $one_request_param) {
         $GLOBALS[$one_request_param] = $_REQUEST[$one_request_param];
     }
 }
+$response = Response::getInstance();
 
 global $db, $table,  $clause_is_unique, $from_prefix, $goto,
        $mult_btn, $original_sql_query, $query_type, $reload,
@@ -98,7 +99,6 @@ if (! empty($submit_mult)
                 isset($original_sql_query)? $original_sql_query : null,
                 isset($original_url_query)? $original_url_query : null
             );
-            $response = PMA\libraries\Response::getInstance();
             $response->disable();
             $response->addHTML(
                 PMA_getHtmlForCopyMultipleTables($action, $_url_params)
@@ -115,7 +115,6 @@ if (! empty($submit_mult)
                     )
                 );
             // Send response to client.
-            $response = PMA\libraries\Response::getInstance();
             $response->addJSON('message', $show_create);
             exit;
         case 'sync_unique_columns_central_list':
@@ -195,7 +194,6 @@ if (!empty($submit_mult) && !empty($what)) {
         isset($original_url_query)? $original_url_query : null
     );
 
-    $response = PMA\libraries\Response::getInstance();
 
     if ($what == 'replace_prefix_tbl' || $what == 'copy_tbl_change_prefix') {
         $response->disable();
diff --git a/libraries/navigation/NavigationTree.php b/libraries/navigation/NavigationTree.php
index bd55f6f9e8..032efdeedc 100644
--- a/libraries/navigation/NavigationTree.php
+++ b/libraries/navigation/NavigationTree.php
@@ -1031,7 +1031,7 @@ class NavigationTree
         if ($node->hasSiblings()
             || $node->realParent() === false
         ) {
-            $response = PMA\libraries\Response::getInstance();
+            $response = Response::getInstance();
             if ($node->type == Node::CONTAINER
                 && count($node->children) == 0
                 && ! $response->isAjax()
diff --git a/libraries/plugins/auth/AuthenticationConfig.php b/libraries/plugins/auth/AuthenticationConfig.php
index f80747f15b..67c30ab0b0 100644
--- a/libraries/plugins/auth/AuthenticationConfig.php
+++ b/libraries/plugins/auth/AuthenticationConfig.php
@@ -10,6 +10,7 @@ namespace PMA\libraries\plugins\auth;
 
 use PMA\libraries\plugins\AuthenticationPlugin;
 use PMA;
+use PMA\libraries\Response;
 use PMA\libraries\URL;
 
 /**
@@ -26,7 +27,7 @@ class AuthenticationConfig extends AuthenticationPlugin
      */
     public function auth()
     {
-        $response = PMA\libraries\Response::getInstance();
+        $response = Response::getInstance();
         if ($response->isAjax()) {
             $response->setRequestStatus(false);
             // reload_flag removes the token parameter from the URL and reloads
@@ -80,7 +81,7 @@ class AuthenticationConfig extends AuthenticationPlugin
         }
 
         /* HTML header */
-        $response = PMA\libraries\Response::getInstance();
+        $response = Response::getInstance();
         $response->getFooter()
             ->setMinimal();
         $header = $response->getHeader();
diff --git a/libraries/plugins/schema/dia/Dia.php b/libraries/plugins/schema/dia/Dia.php
index 9af573539c..2a6d689837 100644
--- a/libraries/plugins/schema/dia/Dia.php
+++ b/libraries/plugins/schema/dia/Dia.php
@@ -8,6 +8,7 @@
 namespace PMA\libraries\plugins\schema\dia;
 
 use PMA;
+use PMA\libraries\Response;
 use XMLWriter;
 
 /**
@@ -176,8 +177,7 @@ class Dia extends XMLWriter
             ob_end_clean();
         }
         $output = $this->flush();
-        PMA\libraries\Response::getInstance()
-            ->disable();
+        Response::getInstance()->disable();
         PMA_downloadHeader(
             $fileName,
             'application/x-dia-diagram',
diff --git a/libraries/plugins/schema/svg/Svg.php b/libraries/plugins/schema/svg/Svg.php
index f03202f8bd..d37add7402 100644
--- a/libraries/plugins/schema/svg/Svg.php
+++ b/libraries/plugins/schema/svg/Svg.php
@@ -8,6 +8,7 @@
 namespace PMA\libraries\plugins\schema\svg;
 
 use PMA;
+use PMA\libraries\Response;
 use XMLWriter;
 
 /**
@@ -188,8 +189,7 @@ class Svg extends XMLWriter
     {
         //ob_get_clean();
         $output = $this->flush();
-        PMA\libraries\Response::getInstance()
-            ->disable();
+        Response::getInstance()->disable();
         PMA_downloadHeader(
             $fileName,
             'image/svg+xml',
diff --git a/libraries/plugins/transformations/output/Text_Plain_Json.php b/libraries/plugins/transformations/output/Text_Plain_Json.php
index 2e4c4c6629..3217177bb0 100644
--- a/libraries/plugins/transformations/output/Text_Plain_Json.php
+++ b/libraries/plugins/transformations/output/Text_Plain_Json.php
@@ -26,7 +26,7 @@ class Text_Plain_Json extends TransformationsPlugin
     public function __construct()
     {
         if (!empty($GLOBALS['cfg']['CodemirrorEnable'])) {
-            $response = PMA\libraries\Response::getInstance();
+            $response = Response::getInstance();
             $scripts = $response->getHeader()
                 ->getScripts();
             $scripts->addFile('codemirror/lib/codemirror.js');
diff --git a/libraries/plugins/transformations/output/Text_Plain_Xml.php b/libraries/plugins/transformations/output/Text_Plain_Xml.php
index c670271444..82356fcd04 100644
--- a/libraries/plugins/transformations/output/Text_Plain_Xml.php
+++ b/libraries/plugins/transformations/output/Text_Plain_Xml.php
@@ -26,7 +26,7 @@ class Text_Plain_Xml extends TransformationsPlugin
     public function __construct()
     {
         if (!empty($GLOBALS['cfg']['CodemirrorEnable'])) {
-            $response = PMA\libraries\Response::getInstance();
+            $response = Response::getInstance();
             $scripts = $response->getHeader()
                 ->getScripts();
             $scripts->addFile('codemirror/lib/codemirror.js');
diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php
index 6e4ba60c87..1a7da89886 100644
--- a/libraries/replication_gui.lib.php
+++ b/libraries/replication_gui.lib.php
@@ -6,6 +6,7 @@
  * @package PhpMyAdmin
  */
 use PMA\libraries\Message;
+use PMA\libraries\Response;
 use PMA\libraries\URL;
 
 /**
@@ -928,7 +929,7 @@ function PMA_handleControlRequest()
         }
 
         if ($refresh) {
-            $response = PMA\libraries\Response::getInstance();
+            $response = Response::getInstance();
             if ($response->isAjax()) {
                 $response->setRequestStatus($result);
                 $response->addJSON(
diff --git a/libraries/rte/rte_events.lib.php b/libraries/rte/rte_events.lib.php
index c37b88734b..619e783cc1 100644
--- a/libraries/rte/rte_events.lib.php
+++ b/libraries/rte/rte_events.lib.php
@@ -180,7 +180,7 @@ function PMA_EVN_handleEditor()
         }
 
         $output = PMA\libraries\Util::getMessage($message, $sql_query);
-        $response = PMA\libraries\Response::getInstance();
+        $response = Response::getInstance();
         if ($response->isAjax()) {
             if ($message->isSuccess()) {
                 $events = $GLOBALS['dbi']->getEvents($db, $_REQUEST['item_name']);
@@ -339,7 +339,7 @@ function PMA_EVN_getEditorForm($mode, $operation, $item)
 
     $modeToUpper = mb_strtoupper($mode);
 
-    $response = PMA\libraries\Response::getInstance();
+    $response = Response::getInstance();
 
     // Escape special characters
     $need_escape = array(
diff --git a/libraries/rte/rte_export.lib.php b/libraries/rte/rte_export.lib.php
index 37ed78d93b..38820131c2 100644
--- a/libraries/rte/rte_export.lib.php
+++ b/libraries/rte/rte_export.lib.php
@@ -24,7 +24,7 @@ function PMA_RTE_handleExport($export_data)
 {
     global $db;
 
-    $response = PMA\libraries\Response::getInstance();
+    $response = Response::getInstance();
 
     $item_name = htmlspecialchars(PMA\libraries\Util::backquote($_GET['item_name']));
     if ($export_data !== false) {
diff --git a/libraries/rte/rte_general.lib.php b/libraries/rte/rte_general.lib.php
index 7f910e6aeb..08d5096580 100644
--- a/libraries/rte/rte_general.lib.php
+++ b/libraries/rte/rte_general.lib.php
@@ -55,7 +55,7 @@ function checkResult($result, $error, $createStatement, $errors)
  */
 function PMA_RTE_sendEditor($type, $mode, $item, $title, $db, $operation = null)
 {
-    $response = PMA\libraries\Response::getInstance();
+    $response = Response::getInstance();
     if ($item !== false) {
         // Show form
         if ($type == 'TRI') {
diff --git a/libraries/rte/rte_list.lib.php b/libraries/rte/rte_list.lib.php
index 56f5b159a5..7fb8186b30 100644
--- a/libraries/rte/rte_list.lib.php
+++ b/libraries/rte/rte_list.lib.php
@@ -6,6 +6,7 @@
  * @package PhpMyAdmin
  */
 use SqlParser\Statements\CreateStatement;
+use PMA\libraries\Response;
 use PMA\libraries\URL;
 use PMA\libraries\Template;
 
@@ -119,7 +120,7 @@ function PMA_RTE_getList($type, $items)
     $retval .= "        </tr>\n";
     $retval .= "        <!-- TABLE DATA -->\n";
     $count = 0;
-    $response = PMA\libraries\Response::getInstance();
+    $response = Response::getInstance();
     foreach ($items as $item) {
         if ($response->isAjax() && empty($_REQUEST['ajax_page_request'])) {
             $rowclass = 'ajaxInsert hide';
diff --git a/libraries/rte/rte_main.inc.php b/libraries/rte/rte_main.inc.php
index 67c4728423..0e11f0a9c2 100644
--- a/libraries/rte/rte_main.inc.php
+++ b/libraries/rte/rte_main.inc.php
@@ -6,6 +6,7 @@
  * @package PhpMyAdmin
  */
 use PMA\libraries\URL;
+use PMA\libraries\Response;
 
 if (! defined('PHPMYADMIN')) {
     exit;
@@ -21,7 +22,7 @@ require_once './libraries/rte/rte_export.lib.php';
 require_once './libraries/rte/rte_list.lib.php';
 require_once './libraries/rte/rte_footer.lib.php';
 
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 
 if (! $response->isAjax()) {
     /**
diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php
index f597e11b2c..45eecaee07 100644
--- a/libraries/rte/rte_routines.lib.php
+++ b/libraries/rte/rte_routines.lib.php
@@ -96,7 +96,7 @@ function PMA_RTN_handleEditor()
     global $_GET, $_POST, $_REQUEST, $GLOBALS, $db, $errors;
 
     $errors = PMA_RTN_handleRequestCreateOrEdit($errors, $db);
-    $response = PMA\libraries\Response::getInstance();
+    $response = Response::getInstance();
 
     /**
      * Display a form used to add/edit a routine, if necessary
@@ -282,7 +282,7 @@ function PMA_RTN_handleRequestCreateOrEdit($errors, $db)
     }
 
     $output = PMA\libraries\Util::getMessage($message, $sql_query);
-    $response = PMA\libraries\Response::getInstance();
+    $response = Response::getInstance();
     if (!$response->isAjax()) {
         return $errors;
     }
@@ -808,7 +808,7 @@ function PMA_RTN_getEditorForm($mode, $operation, $routine)
 {
     global $db, $errors, $param_sqldataaccess, $param_opts_num;
 
-    $response = PMA\libraries\Response::getInstance();
+    $response = Response::getInstance();
 
     // Escape special characters
     $need_escape = array(
@@ -1306,7 +1306,7 @@ function PMA_RTN_handleExecute()
 {
     global $_GET, $_POST, $_REQUEST, $GLOBALS, $db;
 
-    $response = PMA\libraries\Response::getInstance();
+    $response = Response::getInstance();
 
     /**
      * Handle all user requests other than the default of listing routines
@@ -1576,7 +1576,7 @@ function PMA_RTN_getExecuteForm($routine)
 {
     global $db, $cfg;
 
-    $response = PMA\libraries\Response::getInstance();
+    $response = Response::getInstance();
 
     // Escape special characters
     $routine['item_name'] = htmlentities($routine['item_name'], ENT_QUOTES);
diff --git a/libraries/rte/rte_triggers.lib.php b/libraries/rte/rte_triggers.lib.php
index 3038e80752..f97beed22f 100644
--- a/libraries/rte/rte_triggers.lib.php
+++ b/libraries/rte/rte_triggers.lib.php
@@ -156,7 +156,7 @@ function PMA_TRI_handleEditor()
         }
 
         $output = PMA\libraries\Util::getMessage($message, $sql_query);
-        $response = PMA\libraries\Response::getInstance();
+        $response = Response::getInstance();
         if ($response->isAjax()) {
             if ($message->isSuccess()) {
                 $items = $GLOBALS['dbi']->getTriggers($db, $table, '');
@@ -294,7 +294,7 @@ function PMA_TRI_getEditorForm($mode, $item)
     global $db, $table, $event_manipulations, $action_timings;
 
     $modeToUpper = mb_strtoupper($mode);
-    $response = PMA\libraries\Response::getInstance();
+    $response = Response::getInstance();
 
     // Escape special characters
     $need_escape = array(
diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index d744a48b89..e412bf6502 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -7,6 +7,7 @@
  */
 use PMA\libraries\DatabaseInterface;
 use PMA\libraries\Message;
+use PMA\libraries\Response;
 use PMA\libraries\Template;
 use PMA\libraries\Util;
 use PMA\libraries\URL;
@@ -24,7 +25,7 @@ function PMA_getHtmlForUserGroupDialog($username, $is_menuswork)
     $html = '';
     if (! empty($_REQUEST['edit_user_group_dialog']) && $is_menuswork) {
         $dialog = PMA_getHtmlToChooseUserGroup($username);
-        $response = PMA\libraries\Response::getInstance();
+        $response = Response::getInstance();
         if ($response->isAjax()) {
             $response->addJSON('message', $dialog);
             exit;
@@ -2371,7 +2372,7 @@ function PMA_getHtmlForSpecificDbPrivileges($db)
         $html_output .= PMA_getHtmlForViewUsersError();
     }
 
-    $response = PMA\libraries\Response::getInstance();
+    $response = Response::getInstance();
     if ($response->isAjax() == true
         && empty($_REQUEST['ajax_page_request'])
     ) {
@@ -3908,7 +3909,7 @@ function PMA_getDataForChangeOrCopyUser()
             'SELECT * FROM `mysql`.`user` ' . $user_host_condition
         );
         if (! $row) {
-            $response = PMA\libraries\Response::getInstance();
+            $response = Response::getInstance();
             $response->addHTML(
                 Message::notice(__('No user found.'))->getDisplay()
             );
@@ -4657,7 +4658,7 @@ function PMA_getHtmlForUserOverview($pmaThemeImage, $text_dir)
             $html_output .= PMA_getAddUserHtmlFieldset();
         } // end if (display overview)
 
-        $response = PMA\libraries\Response::getInstance();
+        $response = Response::getInstance();
         if (! $response->isAjax()
             || ! empty($_REQUEST['ajax_page_request'])
         ) {
diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php
index 7a069cc7d0..9715cbfede 100644
--- a/libraries/sql.lib.php
+++ b/libraries/sql.lib.php
@@ -729,7 +729,7 @@ function PMA_setColumnProperty($pmatable, $request_index)
         $_REQUEST['table_create_time']
     );
     if (gettype($retval) != 'boolean') {
-        $response = PMA\libraries\Response::getInstance();
+        $response = Response::getInstance();
         $response->setRequestStatus(false);
         $response->addJSON('message', $retval->getString());
         exit;
@@ -761,7 +761,7 @@ function PMA_setColumnOrderOrVisibility($table, $db)
         $retval = PMA_setColumnProperty($pmatable, 'col_visib');
     }
 
-    $response = PMA\libraries\Response::getInstance();
+    $response = Response::getInstance();
     $response->setRequestStatus($retval == true);
     exit;
 }
@@ -844,7 +844,7 @@ function PMA_getRelationalValues($db, $table)
     $dropdown = PMA_getHtmlForRelationalColumnDropdown(
         $db, $table, $column, $curr_value
     );
-    $response = PMA\libraries\Response::getInstance();
+    $response = Response::getInstance();
     $response->addJSON('dropdown', $dropdown);
     exit;
 }
@@ -862,7 +862,7 @@ function PMA_getEnumOrSetValues($db, $table, $columnType)
 {
     $column = $_REQUEST['column'];
     $curr_value = $_REQUEST['curr_value'];
-    $response = PMA\libraries\Response::getInstance();
+    $response = Response::getInstance();
     if ($columnType == "enum") {
         $dropdown = PMA_getHtmlForEnumColumnDropdown(
             $db, $table, $column, $curr_value
@@ -956,7 +956,7 @@ function PMA_handleQueryExecuteError($is_gotofile, $error, $full_sql_query)
 {
     if ($is_gotofile) {
         $message = PMA\libraries\Message::rawError($error);
-        $response = PMA\libraries\Response::getInstance();
+        $response = Response::getInstance();
         $response->setRequestStatus(false);
         $response->addJSON('message', $message);
     } else {
@@ -1202,7 +1202,7 @@ function PMA_countQueryResults(
 function PMA_executeTheQuery($analyzed_sql_results, $full_sql_query, $is_gotofile,
     $db, $table, $find_real_end, $sql_query_for_bookmark, $extra_data
 ) {
-    $response = PMA\libraries\Response::getInstance();
+    $response = Response::getInstance();
     $response->getHeader()->getMenu()->setTable($table);
 
     // Only if we ask to see the php code
@@ -1453,7 +1453,7 @@ function PMA_getQueryResponseForNoResultsReturned($analyzed_sql_results, $db,
             }
         }
 
-        $response = PMA\libraries\Response::getInstance();
+        $response = Response::getInstance();
         $response->addJSON(isset($extra_data) ? $extra_data : array());
 
         if (!empty($analyzed_sql_results['is_select']) &&
@@ -1511,7 +1511,7 @@ function PMA_sendResponseForGridEdit($result)
     if (stristr($field_flags, PMA\libraries\DisplayResults::BINARY_FIELD)) {
         $row[0] = bin2hex($row[0]);
     }
-    $response = PMA\libraries\Response::getInstance();
+    $response = Response::getInstance();
     $response->addJSON('value', $row[0]);
     exit;
 }
@@ -1852,7 +1852,7 @@ function PMA_getQueryResponseForResultsReturned($result, $analyzed_sql_results,
     $showtable = isset($showtable) ? $showtable : null;
     $url_query = isset($url_query) ? $url_query : null;
 
-    $response = PMA\libraries\Response::getInstance();
+    $response = Response::getInstance();
     $header   = $response->getHeader();
     $scripts  = $header->getScripts();
 
@@ -2079,7 +2079,7 @@ function PMA_executeQueryAndSendQueryResponse($analyzed_sql_results,
         $complete_query // complete_query
     );
 
-    $response = PMA\libraries\Response::getInstance();
+    $response = Response::getInstance();
     $response->addHTML($html_output);
 }
 
diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php
index e1232c05af..4286a1a889 100644
--- a/libraries/tbl_columns_definition_form.inc.php
+++ b/libraries/tbl_columns_definition_form.inc.php
@@ -6,6 +6,7 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\Response;
 use PMA\libraries\Table;
 use PMA\Util;
 
@@ -402,7 +403,7 @@ $html = PMA\libraries\Template::get('columns_definitions/column_definitions_form
 
 unset($form_params);
 
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 $response->getHeader()->getScripts()->addFiles(
     array(
         'jquery/jquery.uitablefilter.js',
diff --git a/libraries/tracking.lib.php b/libraries/tracking.lib.php
index 0fc5654f79..0615c09e82 100644
--- a/libraries/tracking.lib.php
+++ b/libraries/tracking.lib.php
@@ -1173,7 +1173,7 @@ function PMA_exportAsFileDownload($entries)
         $dump .= $entry['statement'];
     }
     $filename = 'log_' . $table . '.sql';
-    PMA\libraries\Response::getInstance()->disable();
+    Response::getInstance()->disable();
     PMA_downloadHeader(
         $filename,
         'text/x-sql',
diff --git a/license.php b/license.php
index 210b23ab57..fc0ec7eec0 100644
--- a/license.php
+++ b/license.php
@@ -8,13 +8,14 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\Response;
 
 /**
  * Gets core libraries and defines some variables
  */
 require 'libraries/common.inc.php';
 
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 $response->disable();
 
 /**
diff --git a/lint.php b/lint.php
index 25ee88b132..0507118a0b 100644
--- a/lint.php
+++ b/lint.php
@@ -6,6 +6,7 @@
  * @package PhpMyAdmin
  */
 use PMA\libraries\Linter;
+use PMA\libraries\Response;
 
 $_GET['ajax_request'] = 'true';
 
@@ -29,7 +30,7 @@ require_once 'libraries/common.inc.php';
 $sql_query = !empty($_POST['sql_query']) ? $_POST['sql_query'] : '';
 
 // Disabling standard response.
-PMA\libraries\Response::getInstance()->disable();
+Response::getInstance()->disable();
 
 PMA_headerJSON();
 
diff --git a/navigation.php b/navigation.php
index fd36d1b39b..af103bf2a7 100644
--- a/navigation.php
+++ b/navigation.php
@@ -7,13 +7,14 @@
  */
 
 // Include common functionalities
+use PMA\libraries\Response;
 use PMA\libraries\config\PageSettings;
 use PMA\libraries\navigation\Navigation;
 
 require_once './libraries/common.inc.php';
 
 // Also initialises the collapsible tree class
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 $navigation = new Navigation();
 if (! $response->isAjax()) {
     $response->addHTML(
diff --git a/normalization.php b/normalization.php
index 4c5dbf615b..b1087bfdc2 100644
--- a/normalization.php
+++ b/normalization.php
@@ -6,6 +6,7 @@
  * @package PhpMyAdmin
  */
 use PMA\libraries\URL;
+use PMA\libraries\Response;
 
 /**
  *
@@ -56,17 +57,18 @@ if (isset($_REQUEST['getNewTables2NF'])) {
     exit;
 }
 
+$response = Response::getInstance();
+
 if (isset($_REQUEST['getNewTables3NF'])) {
     $dependencies = json_decode($_REQUEST['pd']);
     $tables = json_decode($_REQUEST['tables']);
     $newTables = PMA_getHtmlForNewTables3NF($dependencies, $tables, $db);
-    PMA\libraries\Response::getInstance()->disable();
+    $response->disable();
     PMA_headerJSON();
     echo json_encode($newTables);
     exit;
 }
 
-$response = PMA\libraries\Response::getInstance();
 $header = $response->getHeader();
 $scripts = $header->getScripts();
 $scripts->addFile('normalization.js');
diff --git a/prefs_manage.php b/prefs_manage.php
index 88c413f298..c112184827 100644
--- a/prefs_manage.php
+++ b/prefs_manage.php
@@ -26,6 +26,7 @@ require 'libraries/config/user_preferences.forms.php';
 
 $cf = new ConfigFile($GLOBALS['PMA_Config']->base_settings);
 PMA_userprefsPageInit($cf);
+$response = Response::getInstance();
 
 $error = '';
 if (isset($_POST['submit_export'])
@@ -33,7 +34,7 @@ if (isset($_POST['submit_export'])
     && $_POST['export_type'] == 'text_file'
 ) {
     // export to JSON file
-    PMA\libraries\Response::getInstance()->disable();
+    $response->disable();
     $filename = 'phpMyAdmin-config-' . urlencode(PMA_getenv('HTTP_HOST')) . '.json';
     PMA_downloadHeader($filename, 'application/json');
     $settings = PMA_loadUserprefs();
@@ -44,7 +45,7 @@ if (isset($_POST['submit_export'])
     && $_POST['export_type'] == 'php_file'
 ) {
     // export to JSON file
-    PMA\libraries\Response::getInstance()->disable();
+    $response->disable();
     $filename = 'phpMyAdmin-config-' . urlencode(PMA_getenv('HTTP_HOST')) . '.php';
     PMA_downloadHeader($filename, 'application/php');
     $settings = PMA_loadUserprefs();
@@ -57,7 +58,6 @@ if (isset($_POST['submit_export'])
     exit;
 } else if (isset($_POST['submit_get_json'])) {
     $settings = PMA_loadUserprefs();
-    $response = PMA\libraries\Response::getInstance();
     $response->addJSON('prefs', json_encode($settings['config_data']));
     $response->addJSON('mtime', $settings['mtime']);
     exit;
diff --git a/server_import.php b/server_import.php
index a9e5f2ec52..78fe23dbda 100644
--- a/server_import.php
+++ b/server_import.php
@@ -17,7 +17,7 @@ require_once 'libraries/config/page_settings.forms.php';
 
 PageSettings::showGroup('Import');
 
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 $header   = $response->getHeader();
 $scripts  = $header->getScripts();
 $scripts->addFile('import.js');
diff --git a/server_privileges.php b/server_privileges.php
index 806ed1904d..06989de1c3 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -5,6 +5,7 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\Response;
 
 /**
  * include common file
@@ -23,7 +24,7 @@ $cfgRelation = PMA_getRelationsParam();
 /**
  * Does the common work
  */
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 $header   = $response->getHeader();
 $scripts  = $header->getScripts();
 $scripts->addFile('server_privileges.js');
@@ -316,7 +317,6 @@ if ($response->isAjax()
     );
 
     if (! empty($message) && $message instanceof PMA\libraries\Message) {
-        $response = PMA\libraries\Response::getInstance();
         $response->setRequestStatus($message->isSuccess());
         $response->addJSON('message', $message);
         $response->addJSON($extra_data);
@@ -379,7 +379,6 @@ if (isset($_REQUEST['export'])
 
     unset($username, $hostname, $grants, $one_grant);
 
-    $response = PMA\libraries\Response::getInstance();
     if ($response->isAjax()) {
         $response->addJSON('message', $export);
         $response->addJSON('title', $title);
diff --git a/server_replication.php b/server_replication.php
index e5a5f08010..5fbd4300eb 100644
--- a/server_replication.php
+++ b/server_replication.php
@@ -5,6 +5,7 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\Response;
 
 /**
  * include files
@@ -18,7 +19,7 @@ require_once 'libraries/replication_gui.lib.php';
 /**
  * Does the common work
  */
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 $header   = $response->getHeader();
 $scripts  = $header->getScripts();
 $scripts->addFile('server_privileges.js');
diff --git a/server_status.php b/server_status.php
index d04a5779e9..002f367ffe 100644
--- a/server_status.php
+++ b/server_status.php
@@ -7,6 +7,7 @@
  */
 
 use PMA\libraries\Message;
+use PMA\libraries\Response;
 use PMA\libraries\ServerStatusData;
 
 require_once 'libraries/common.inc.php';
@@ -22,7 +23,7 @@ require_once 'libraries/replication_gui.lib.php';
 /**
  * start output
  */
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 $response->addHTML('<div>');
 
 $serverStatusData = new ServerStatusData();
diff --git a/server_status_advisor.php b/server_status_advisor.php
index ca7a75113f..16e0589aad 100644
--- a/server_status_advisor.php
+++ b/server_status_advisor.php
@@ -7,6 +7,7 @@
  */
 
 use PMA\libraries\Message;
+use PMA\libraries\Response;
 use PMA\libraries\ServerStatusData;
 
 require_once 'libraries/common.inc.php';
@@ -16,7 +17,7 @@ require_once 'libraries/replication_gui.lib.php';
 
 $serverStatusData = new ServerStatusData();
 
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 $scripts = $response->getHeader()->getScripts();
 $scripts->addFile('server_status_advisor.js');
 
diff --git a/server_status_monitor.php b/server_status_monitor.php
index dc88e8f31c..f6b93c4bac 100644
--- a/server_status_monitor.php
+++ b/server_status_monitor.php
@@ -7,6 +7,7 @@
  */
 
 use PMA\libraries\ServerStatusData;
+use PMA\libraries\Response;
 
 require_once 'libraries/common.inc.php';
 require_once 'libraries/server_common.inc.php';
@@ -14,6 +15,8 @@ require_once 'libraries/server_status_monitor.lib.php';
 require_once 'libraries/replication.inc.php';
 require_once 'libraries/replication_gui.lib.php';
 
+$response = Response::getInstance();
+
 /**
  * Ajax request
  */
@@ -26,7 +29,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
         switch($_REQUEST['type']) {
         case 'chartgrid': // Data for the monitor
             $ret = PMA_getJsonForChartingData();
-            PMA\libraries\Response::getInstance()->addJSON('message', $ret);
+            $response->addJSON('message', $ret);
             exit;
         }
     }
@@ -38,26 +41,26 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
 
         if ($_REQUEST['type'] == 'slow') {
             $return = PMA_getJsonForLogDataTypeSlow($start, $end);
-            PMA\libraries\Response::getInstance()->addJSON('message', $return);
+            $response->addJSON('message', $return);
             exit;
         }
 
         if ($_REQUEST['type'] == 'general') {
             $return = PMA_getJsonForLogDataTypeGeneral($start, $end);
-            PMA\libraries\Response::getInstance()->addJSON('message', $return);
+            $response->addJSON('message', $return);
             exit;
         }
     }
 
     if (isset($_REQUEST['logging_vars'])) {
         $loggingVars = PMA_getJsonForLoggingVars();
-        PMA\libraries\Response::getInstance()->addJSON('message', $loggingVars);
+        $response->addJSON('message', $loggingVars);
         exit;
     }
 
     if (isset($_REQUEST['query_analyzer'])) {
         $return = PMA_getJsonForQueryAnalyzer();
-        PMA\libraries\Response::getInstance()->addJSON('message', $return);
+        $response->addJSON('message', $return);
         exit;
     }
 }
diff --git a/server_status_processes.php b/server_status_processes.php
index 2533ac31eb..de71a8c6f7 100644
--- a/server_status_processes.php
+++ b/server_status_processes.php
@@ -6,6 +6,7 @@
  * @package PhpMyAdmin
  */
 
+use PMA\libraries\Response;
 use PMA\libraries\ServerStatusData;
 
 require_once 'libraries/common.inc.php';
@@ -19,7 +20,7 @@ require_once 'libraries/replication.inc.php';
 require_once 'libraries/replication_gui.lib.php';
 
 $ServerStatusData = new ServerStatusData();
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 
 /**
  * Kills a selected process
diff --git a/server_status_queries.php b/server_status_queries.php
index be539fb2d6..8e85be87c6 100644
--- a/server_status_queries.php
+++ b/server_status_queries.php
@@ -7,6 +7,7 @@
  * @package PhpMyAdmin
  */
 
+use PMA\libraries\Response;
 use PMA\libraries\Message;
 use PMA\libraries\ServerStatusData;
 
@@ -18,7 +19,7 @@ require_once 'libraries/replication_gui.lib.php';
 
 $serverStatusData = new ServerStatusData();
 
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 $header   = $response->getHeader();
 $scripts  = $header->getScripts();
 $scripts->addFile('server_status_queries.js');
diff --git a/server_status_variables.php b/server_status_variables.php
index 331c08576c..f5b4179607 100644
--- a/server_status_variables.php
+++ b/server_status_variables.php
@@ -6,6 +6,7 @@
  * @package PhpMyAdmin
  */
 
+use PMA\libraries\Response;
 use PMA\libraries\Message;
 use PMA\libraries\ServerStatusData;
 
@@ -33,7 +34,7 @@ if (isset($_REQUEST['flush'])) {
 
 $serverStatusData = new ServerStatusData();
 
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 $header   = $response->getHeader();
 $scripts  = $header->getScripts();
 $scripts->addFile('server_status_variables.js');
diff --git a/server_user_groups.php b/server_user_groups.php
index 72f4ff2a9b..211ccfe39a 100644
--- a/server_user_groups.php
+++ b/server_user_groups.php
@@ -5,6 +5,7 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\Response;
 
 require_once 'libraries/common.inc.php';
 require_once 'libraries/server_users.lib.php';
@@ -15,7 +16,7 @@ if (! $GLOBALS['cfgRelation']['menuswork']) {
     exit;
 }
 
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 $header   = $response->getHeader();
 $scripts  = $header->getScripts();
 $scripts->addFile('server_user_groups.js');
diff --git a/tbl_addfield.php b/tbl_addfield.php
index 1a01610352..8bce9c240b 100644
--- a/tbl_addfield.php
+++ b/tbl_addfield.php
@@ -6,13 +6,14 @@
  * @package PhpMyAdmin
  */
 use PMA\libraries\URL;
+use PMA\libraries\Response;
 
 /**
  * Get some core libraries
  */
 require_once 'libraries/common.inc.php';
 
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 $header   = $response->getHeader();
 $scripts  = $header->getScripts();
 $scripts->addFile('tbl_structure.js');
diff --git a/tbl_create.php b/tbl_create.php
index c37c351323..882d873677 100644
--- a/tbl_create.php
+++ b/tbl_create.php
@@ -6,6 +6,7 @@
  * @package PhpMyAdmin
  */
 use PMA\libraries\URL;
+use PMA\libraries\Response;
 
 /**
  * Get some core libraries
@@ -88,7 +89,7 @@ if (isset($_REQUEST['do_save_data'])) {
             }
         }
     } else {
-        $response = PMA\libraries\Response::getInstance();
+        $response = Response::getInstance();
         $response->setRequestStatus(false);
         $response->addJSON('message', $GLOBALS['dbi']->getError());
     }
diff --git a/tbl_export.php b/tbl_export.php
index 46527133bc..f8eff7cdf7 100644
--- a/tbl_export.php
+++ b/tbl_export.php
@@ -18,7 +18,7 @@ require_once 'libraries/config/page_settings.forms.php';
 
 PageSettings::showGroup('Export');
 
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 $header   = $response->getHeader();
 $scripts  = $header->getScripts();
 $scripts->addFile('export.js');
diff --git a/tbl_find_replace.php b/tbl_find_replace.php
index d3ec712bb8..dd2248d32e 100644
--- a/tbl_find_replace.php
+++ b/tbl_find_replace.php
@@ -7,6 +7,7 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\Response;
 
 /**
  * Gets some core libraries
@@ -20,7 +21,7 @@ $container->factory('PMA\libraries\controllers\table\TableSearchController');
 $container->alias(
     'TableSearchController', 'PMA\libraries\controllers\table\TableSearchController'
 );
-$container->set('PMA\libraries\Response', PMA\libraries\Response::getInstance());
+$container->set('PMA\libraries\Response', Response::getInstance());
 $container->alias('response', 'PMA\libraries\Response');
 
 $dependency_definitions = array(
diff --git a/tbl_import.php b/tbl_import.php
index 342e212a8c..578a6a79c2 100644
--- a/tbl_import.php
+++ b/tbl_import.php
@@ -6,6 +6,7 @@
  * @package PhpMyAdmin
  */
 use PMA\libraries\config\PageSettings;
+use PMA\libraries\Response;
 
 /**
  *
@@ -16,7 +17,7 @@ require_once 'libraries/config/page_settings.forms.php';
 
 PageSettings::showGroup('Import');
 
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 $header   = $response->getHeader();
 $scripts  = $header->getScripts();
 $scripts->addFile('import.js');
@@ -30,7 +31,6 @@ $url_query .= '&amp;goto=tbl_import.php&amp;back=tbl_import.php';
 require_once 'libraries/tbl_info.inc.php';
 
 require 'libraries/display_import.lib.php';
-$response = PMA\libraries\Response::getInstance();
 $response->addHTML(
     PMA_getImportDisplay(
         'table', $db, $table, $max_upload_size
diff --git a/tbl_operations.php b/tbl_operations.php
index 9587491ead..1ce6ec4c19 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -7,6 +7,7 @@
  */
 use PMA\libraries\Partition;
 use PMA\libraries\Table;
+use PMA\libraries\Response;
 
 /**
  *
@@ -24,7 +25,7 @@ $pma_table = new Table($GLOBALS['table'], $GLOBALS['db']);
 /**
  * Load JavaScript files
  */
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 $header   = $response->getHeader();
 $scripts  = $header->getScripts();
 $scripts->addFile('tbl_operations.js');
@@ -203,7 +204,6 @@ if (isset($result) && empty($message_to_show)) {
         if (isset($GLOBALS['ajax_request'])
             && $GLOBALS['ajax_request'] == true
         ) {
-            $response = PMA\libraries\Response::getInstance();
             $response->setRequestStatus($_message->isSuccess());
             $response->addJSON('message', $_message);
             if (!empty($sql_query)) {
@@ -226,7 +226,6 @@ if (isset($result) && empty($message_to_show)) {
         if (isset($GLOBALS['ajax_request'])
             && $GLOBALS['ajax_request'] == true
         ) {
-            $response = PMA\libraries\Response::getInstance();
             $response->setRequestStatus(false);
             $response->addJSON('message', $_message);
             if (!empty($sql_query)) {
diff --git a/tbl_replace.php b/tbl_replace.php
index 725defa5a3..55c060a13c 100644
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -12,6 +12,7 @@
  * @package PhpMyAdmin
  */
 use PMA\libraries\plugins\IOTransformationsPlugin;
+use PMA\libraries\Response;
 use PMA\libraries\Table;
 
 /**
@@ -35,7 +36,7 @@ $GLOBALS['dbi']->selectDb($GLOBALS['db']);
  */
 $goto_include = false;
 
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 $header = $response->getHeader();
 $scripts = $header->getScripts();
 $scripts->addFile('makegrid.js');
@@ -440,7 +441,6 @@ if ($response->isAjax() && ! isset($_POST['ajax_page_request'])) {
     $extra_data['sql_query']
         = PMA\libraries\Util::getMessage($message, $GLOBALS['display_query']);
 
-    $response = PMA\libraries\Response::getInstance();
     $response->setRequestStatus($message->isSuccess());
     $response->addJSON('message', $message);
     $response->addJSON($extra_data);
diff --git a/tbl_row_action.php b/tbl_row_action.php
index 067945a224..498584b559 100644
--- a/tbl_row_action.php
+++ b/tbl_row_action.php
@@ -6,6 +6,7 @@
  * @package PhpMyAdmin
  */
 use PMA\libraries\URL;
+use PMA\libraries\Response;
 
 /**
  *
@@ -66,7 +67,7 @@ if (!empty($submit_mult)) {
         && (! isset($_REQUEST['rows_to_delete'])
         || ! is_array($_REQUEST['rows_to_delete']))
     ) {
-        $response = PMA\libraries\Response::getInstance();
+        $response = Response::getInstance();
         $response->setRequestStatus(false);
         $response->addJSON('message', __('No row selected.'));
     }
diff --git a/tbl_select.php b/tbl_select.php
index 0c55d77aba..edfbb698fb 100644
--- a/tbl_select.php
+++ b/tbl_select.php
@@ -8,6 +8,7 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\Response;
 
 /**
  * Gets some core libraries
@@ -23,7 +24,7 @@ $container->factory('PMA\libraries\controllers\table\TableSearchController');
 $container->alias(
     'TableSearchController', 'PMA\libraries\controllers\table\TableSearchController'
 );
-$container->set('PMA\libraries\Response', PMA\libraries\Response::getInstance());
+$container->set('PMA\libraries\Response', Response::getInstance());
 $container->alias('response', 'PMA\libraries\Response');
 
 /* Define dependencies for the concerned controller */
diff --git a/tbl_sql.php b/tbl_sql.php
index 764cf72dd6..304f7c80f6 100644
--- a/tbl_sql.php
+++ b/tbl_sql.php
@@ -6,6 +6,7 @@
  * @package PhpMyAdmin
  */
 use PMA\libraries\config\PageSettings;
+use PMA\libraries\Response;
 
 /**
  *
@@ -19,7 +20,7 @@ PageSettings::showGroup('Sql_queries');
 /**
  * Runs common work
  */
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 $header   = $response->getHeader();
 $scripts  = $header->getScripts();
 $scripts->addFile('makegrid.js');
diff --git a/tbl_tracking.php b/tbl_tracking.php
index f4e23c42c8..e9ef0ba8e2 100644
--- a/tbl_tracking.php
+++ b/tbl_tracking.php
@@ -8,13 +8,14 @@
 
 // Run common work
 use PMA\libraries\Tracker;
+use PMA\libraries\Response;
 
 require_once './libraries/common.inc.php';
 
 require_once './libraries/tracking.lib.php';
 
 //Get some js files needed for Ajax requests
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 $header   = $response->getHeader();
 $scripts  = $header->getScripts();
 $scripts->addFile('jquery/jquery.tablesorter.js');
@@ -36,7 +37,7 @@ if (Tracker::isActive()
             htmlspecialchars($GLOBALS["db"] . '.' . $GLOBALS["table"])
         )
     );
-    PMA\libraries\Response::getInstance()->addHTML($msg->getDisplay());
+    $response->addHTML($msg->getDisplay());
 }
 
 $url_query .= '&amp;goto=tbl_tracking.php&amp;back=tbl_tracking.php';
@@ -206,5 +207,4 @@ $html .= PMA_getHtmlForDataDefinitionAndManipulationStatements(
 
 $html .= '<br class="clearfloat"/>';
 
-$response = PMA\libraries\Response::getInstance();
 $response->addHTML($html);
diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php
index d3be0762d7..c530ae0d26 100644
--- a/tbl_zoom_select.php
+++ b/tbl_zoom_select.php
@@ -7,6 +7,7 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\Response;
 
 /**
  * Gets some core libraries
@@ -20,7 +21,7 @@ $container->factory('PMA\libraries\controllers\table\TableSearchController');
 $container->alias(
     'TableSearchController', 'PMA\libraries\controllers\table\TableSearchController'
 );
-$container->set('PMA\libraries\Response', PMA\libraries\Response::getInstance());
+$container->set('PMA\libraries\Response', Response::getInstance());
 $container->alias('response', 'PMA\libraries\Response');
 
 /* Define dependencies for the concerned controller */
diff --git a/themes.php b/themes.php
index 8374d34f2d..e57e34f37b 100644
--- a/themes.php
+++ b/themes.php
@@ -6,13 +6,14 @@
  * @package PhpMyAdmin
  */
 use PMA\libraries\ThemeManager;
+use PMA\libraries\Response;
 
 /**
  * get some globals
  */
 require './libraries/common.inc.php';
 
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 $response->getFooter()->setMinimal();
 $header = $response->getHeader();
 $header->setBodyId('bodythemes');
diff --git a/transformation_overview.php b/transformation_overview.php
index fd2b36cc26..8d89572d9e 100644
--- a/transformation_overview.php
+++ b/transformation_overview.php
@@ -5,6 +5,7 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\Response;
 
 /**
  * Gets some core libraries and displays a top message if required
@@ -12,7 +13,7 @@
 require_once './libraries/common.inc.php';
 require_once './libraries/transformations.lib.php';
 
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 $header   = $response->getHeader();
 $header->disableMenuAndConsole();
 
diff --git a/transformation_wrapper.php b/transformation_wrapper.php
index 1751842e47..938ba36480 100644
--- a/transformation_wrapper.php
+++ b/transformation_wrapper.php
@@ -5,6 +5,7 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\Response;
 
 /**
  *
@@ -95,7 +96,7 @@ if ($cfgRelation['commwork'] && $cfgRelation['mimework']) {
 }
 
 // Only output the http headers
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 $response->getHeader()->sendHttpHeaders();
 
 // [MIME]
diff --git a/url.php b/url.php
index 20a0c9eee6..6cbce0f557 100644
--- a/url.php
+++ b/url.php
@@ -6,6 +6,7 @@
  * @package PhpMyAdmin
  */
 use PMA\libraries\Sanitize;
+use PMA\libraries\Response;
 
 /**
  * Gets core libraries and defines some variables
@@ -14,7 +15,7 @@ define('PMA_MINIMUM_COMMON', true);
 require_once './libraries/common.inc.php';
 
 // Only output the http headers
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 $response->getHeader()->sendHttpHeaders();
 $response->disable();
 
diff --git a/user_password.php b/user_password.php
index 2b97d0de5e..a108836d4f 100644
--- a/user_password.php
+++ b/user_password.php
@@ -7,6 +7,7 @@
  * @package PhpMyAdmin
  */
 use PMA\libraries\URL;
+use PMA\libraries\Response;
 
 /**
  * Gets some core libraries
@@ -18,7 +19,7 @@ require_once './libraries/common.inc.php';
  */
 require_once './libraries/server_privileges.lib.php';
 
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 $header   = $response->getHeader();
 $scripts  = $header->getScripts();
 $scripts->addFile('server_privileges.js');
@@ -87,7 +88,7 @@ function PMA_getChangePassMessage($change_password_message, $sql_query = '')
         /**
          * If in an Ajax request, we don't need to show the rest of the page
          */
-        $response = PMA\libraries\Response::getInstance();
+        $response = Response::getInstance();
         if ($change_password_message['error']) {
             $response->addJSON('message', $change_password_message['msg']);
             $response->setRequestStatus(false);
diff --git a/version_check.php b/version_check.php
index 96effc97d0..c62d128e8c 100644
--- a/version_check.php
+++ b/version_check.php
@@ -8,13 +8,14 @@
 
 // Sets up the session
 use PMA\libraries\VersionInformation;
+use PMA\libraries\Response;
 
 $_GET['ajax_request'] = 'true';
 
 require_once 'libraries/common.inc.php';
 
 // Disabling standard response.
-PMA\libraries\Response::getInstance()->disable();
+Response::getInstance()->disable();
 
 // Always send the correct headers
 PMA_headerJSON();
diff --git a/view_create.php b/view_create.php
index faeff038a9..a4eda2c1c4 100644
--- a/view_create.php
+++ b/view_create.php
@@ -8,6 +8,7 @@
  * @package PhpMyAdmin
  */
 use PMA\libraries\URL;
+use PMA\libraries\Response;
 
 require_once './libraries/common.inc.php';
 
@@ -18,6 +19,8 @@ require './libraries/db_common.inc.php';
 $url_params['goto'] = 'tbl_structure.php';
 $url_params['back'] = 'view_create.php';
 
+$response = Response::getInstance();
+
 $view_algorithm_options = array(
     'UNDEFINED',
     'MERGE',
@@ -43,7 +46,6 @@ if (isset($_REQUEST['view']['name'])
     && empty($_REQUEST['view']['name'])
 ) {
     $message = PMA\libraries\Message::error(__('View name can not be empty'));
-    $response = PMA\libraries\Response::getInstance();
     $response->addJSON(
         'message',
         $message
@@ -111,7 +113,6 @@ if (isset($_REQUEST['createview']) || isset($_REQUEST['alterview'])) {
             return;
         }
 
-        $response = PMA\libraries\Response::getInstance();
         $response->addJSON(
             'message',
             PMA\libraries\Message::error(
@@ -158,7 +159,6 @@ if (isset($_REQUEST['createview']) || isset($_REQUEST['alterview'])) {
         $message = PMA\libraries\Message::success();
         include 'tbl_structure.php';
     } else {
-        $response = PMA\libraries\Response::getInstance();
         $response->addJSON(
             'message',
             PMA\libraries\Util::getMessage(