From 04616ff7fe52629e0ae35e2a07067d3569106da4 Mon Sep 17 00:00:00 2001
From: Hugues Peccatte <hugues.peccatte@gmail.com>
Date: Fri, 5 Jul 2019 23:21:14 +0200
Subject: [PATCH] Import instead of using FQN

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
---
 libraries/classes/Config/Validator.php               | 12 ++++++++----
 libraries/classes/Database/Designer/Common.php       |  5 +++--
 libraries/classes/Dbi/DbiMysqli.php                  |  3 ++-
 .../classes/Plugins/Import/AbstractImportCsv.php     |  2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/libraries/classes/Config/Validator.php b/libraries/classes/Config/Validator.php
index 4baf4d2666..8294a9099d 100644
--- a/libraries/classes/Config/Validator.php
+++ b/libraries/classes/Config/Validator.php
@@ -13,6 +13,10 @@ use PhpMyAdmin\Config\ConfigFile;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Util;
+use function mysql_close;
+use function mysql_connect;
+use function mysqli_close;
+use function mysqli_connect;
 
 /**
  * Validation class for various validation functions
@@ -212,18 +216,18 @@ class Validator
         }
 
         if ($extension == 'mysql') {
-            $conn = @\mysql_connect($host . $port . $socket, $user, $pass);
+            $conn = @mysql_connect($host . $port . $socket, $user, $pass);
             if (! $conn) {
                 $error = __('Could not connect to the database server!');
             } else {
-                \mysql_close($conn);
+                mysql_close($conn);
             }
         } else {
-            $conn = @\mysqli_connect($host, $user, $pass, null, $port, $socket);
+            $conn = @mysqli_connect($host, $user, $pass, null, $port, $socket);
             if (! $conn) {
                 $error = __('Could not connect to the database server!');
             } else {
-                \mysqli_close($conn);
+                mysqli_close($conn);
             }
         }
         if ($error !== null) {
diff --git a/libraries/classes/Database/Designer/Common.php b/libraries/classes/Database/Designer/Common.php
index bf46714ba1..90e5cbc2f4 100644
--- a/libraries/classes/Database/Designer/Common.php
+++ b/libraries/classes/Database/Designer/Common.php
@@ -14,6 +14,7 @@ use PhpMyAdmin\Index;
 use PhpMyAdmin\Relation;
 use PhpMyAdmin\Table;
 use PhpMyAdmin\Util;
+use function rawurlencode;
 
 /**
  * Common functions for Designer
@@ -273,8 +274,8 @@ class Common
             if (Util::isForeignKeySupported($GLOBALS['designer']['TABLE_TYPE'][$i])) {
                 $j = 1;
             }
-            $retval['j_tabs'][\rawurlencode($GLOBALS['designer_url']['TABLE_NAME'][$i])] = $j;
-            $retval['h_tabs'][\rawurlencode($GLOBALS['designer_url']['TABLE_NAME'][$i])] = 1;
+            $retval['j_tabs'][rawurlencode($GLOBALS['designer_url']['TABLE_NAME'][$i])] = $j;
+            $retval['h_tabs'][rawurlencode($GLOBALS['designer_url']['TABLE_NAME'][$i])] = 1;
         }
         return $retval;
     }
diff --git a/libraries/classes/Dbi/DbiMysqli.php b/libraries/classes/Dbi/DbiMysqli.php
index 16f0ea8660..4f8d791218 100644
--- a/libraries/classes/Dbi/DbiMysqli.php
+++ b/libraries/classes/Dbi/DbiMysqli.php
@@ -14,6 +14,7 @@ use mysqli;
 use mysqli_result;
 use PhpMyAdmin\DatabaseInterface;
 use stdClass;
+use function mysqli_init;
 
 /**
  * Interface to the MySQL Improved extension (MySQLi)
@@ -59,7 +60,7 @@ class DbiMysqli implements DbiExtension
                 : $server['host'];
         }
 
-        $mysqli = \mysqli_init();
+        $mysqli = mysqli_init();
 
         $client_flags = 0;
 
diff --git a/libraries/classes/Plugins/Import/AbstractImportCsv.php b/libraries/classes/Plugins/Import/AbstractImportCsv.php
index 9778904b7e..5c5a250c96 100644
--- a/libraries/classes/Plugins/Import/AbstractImportCsv.php
+++ b/libraries/classes/Plugins/Import/AbstractImportCsv.php
@@ -29,7 +29,7 @@ abstract class AbstractImportCsv extends ImportPlugin
      * Sets the import plugin properties.
      * Called in the constructor.
      *
-     * @return \PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup|void object of the plugin
+     * @return OptionsPropertyMainGroup|void object of the plugin
      */
     protected function setProperties()
     {