From bc6486e2e0497f4ec6b04561dccd8a094f8e75c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Wed, 6 Sep 2017 14:17:45 +0200
Subject: [PATCH] Move mysqli flag description sot Dbi class
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 libraries/classes/Dbi/DbiMysqli.php  | 18 +++++++++++++++++-
 libraries/database_interface.inc.php |  1 -
 libraries/dbi/dbi_mysqli.inc.php     | 27 ---------------------------
 3 files changed, 17 insertions(+), 29 deletions(-)
 delete mode 100644 libraries/dbi/dbi_mysqli.inc.php

diff --git a/libraries/classes/Dbi/DbiMysqli.php b/libraries/classes/Dbi/DbiMysqli.php
index 04b8e254f2..d152c27ef3 100644
--- a/libraries/classes/Dbi/DbiMysqli.php
+++ b/libraries/classes/Dbi/DbiMysqli.php
@@ -57,6 +57,22 @@ if (! defined('MYSQLI_TYPE_JSON')) {
  */
 class DbiMysqli implements DbiExtension
 {
+    static private $pma_mysqli_flag_names = array(
+        MYSQLI_NUM_FLAG => 'num',
+        MYSQLI_PART_KEY_FLAG => 'part_key',
+        MYSQLI_SET_FLAG => 'set',
+        MYSQLI_TIMESTAMP_FLAG => 'timestamp',
+        MYSQLI_AUTO_INCREMENT_FLAG => 'auto_increment',
+        MYSQLI_ENUM_FLAG => 'enum',
+        MYSQLI_ZEROFILL_FLAG => 'zerofill',
+        MYSQLI_UNSIGNED_FLAG => 'unsigned',
+        MYSQLI_BLOB_FLAG => 'blob',
+        MYSQLI_MULTIPLE_KEY_FLAG => 'multiple_key',
+        MYSQLI_UNIQUE_KEY_FLAG => 'unique_key',
+        MYSQLI_PRI_KEY_FLAG => 'primary_key',
+        MYSQLI_NOT_NULL_FLAG => 'not_null',
+    );
+
     /**
      * connects to the database server
      *
@@ -540,7 +556,7 @@ class DbiMysqli implements DbiExtension
         $charsetnr = $f->charsetnr;
         $f = $f->flags;
         $flags = array();
-        foreach ($GLOBALS['pma_mysqli_flag_names'] as $flag => $name) {
+        foreach (self::$pma_mysqli_flag_names as $flag => $name) {
             if ($f & $flag) {
                 $flags[] = $name;
             }
diff --git a/libraries/database_interface.inc.php b/libraries/database_interface.inc.php
index a34921eb12..de7d915582 100644
--- a/libraries/database_interface.inc.php
+++ b/libraries/database_interface.inc.php
@@ -79,7 +79,6 @@ if (defined('TESTSUITE')) {
         $extension = new DbiMysql();
         break;
     case 'mysqli' :
-        include_once 'libraries/dbi/dbi_mysqli.inc.php';
         $extension = new DbiMysqli();
         break;
     }
diff --git a/libraries/dbi/dbi_mysqli.inc.php b/libraries/dbi/dbi_mysqli.inc.php
deleted file mode 100644
index 145f09ad05..0000000000
--- a/libraries/dbi/dbi_mysqli.inc.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Interface to the improved MySQL extension (MySQLi)
- *
- * @package    PhpMyAdmin-DBI
- * @subpackage MySQLi
- */
-
-/**
- * Names of field flags.
- */
-$GLOBALS['pma_mysqli_flag_names'] = array(
-    MYSQLI_NUM_FLAG => 'num',
-    MYSQLI_PART_KEY_FLAG => 'part_key',
-    MYSQLI_SET_FLAG => 'set',
-    MYSQLI_TIMESTAMP_FLAG => 'timestamp',
-    MYSQLI_AUTO_INCREMENT_FLAG => 'auto_increment',
-    MYSQLI_ENUM_FLAG => 'enum',
-    MYSQLI_ZEROFILL_FLAG => 'zerofill',
-    MYSQLI_UNSIGNED_FLAG => 'unsigned',
-    MYSQLI_BLOB_FLAG => 'blob',
-    MYSQLI_MULTIPLE_KEY_FLAG => 'multiple_key',
-    MYSQLI_UNIQUE_KEY_FLAG => 'unique_key',
-    MYSQLI_PRI_KEY_FLAG => 'primary_key',
-    MYSQLI_NOT_NULL_FLAG => 'not_null',
-);