From 21bca2d3215f8173b6af1a09c6355dfe4d0e6860 Mon Sep 17 00:00:00 2001
From: Hugues Peccatte <hugues.peccatte@gmail.com>
Date: Sat, 12 Sep 2015 23:04:37 +0200
Subject: [PATCH] Fix DBIExtension lib.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
---
 libraries/dbi/DBIExtension.lib.php | 28 ++++++++++++++++++++++++++++
 libraries/dbi/DBIExtension.php     | 23 -----------------------
 libraries/dbi/DBIMysqli.php        |  1 -
 3 files changed, 28 insertions(+), 24 deletions(-)
 create mode 100644 libraries/dbi/DBIExtension.lib.php

diff --git a/libraries/dbi/DBIExtension.lib.php b/libraries/dbi/DBIExtension.lib.php
new file mode 100644
index 0000000000..a5045f7941
--- /dev/null
+++ b/libraries/dbi/DBIExtension.lib.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Contract for every database extension supported by phpMyAdmin
+ *
+ * @package PhpMyAdmin-DBI
+ */
+
+/**
+ * Defines PMA_MYSQL_CLIENT_API if it does not exist based
+ * on MySQL client version.
+ *
+ * @param string $version MySQL version string
+ *
+ * @return void
+ */
+function PMA_defineClientAPI($version)
+{
+    if (! defined('PMA_MYSQL_CLIENT_API')) {
+        $client_api = explode('.', $version);
+        define(
+        'PMA_MYSQL_CLIENT_API',
+        (int)sprintf(
+            '%d%02d%02d',
+            $client_api[0], $client_api[1], intval($client_api[2])
+        )
+        );
+    }
+}
diff --git a/libraries/dbi/DBIExtension.php b/libraries/dbi/DBIExtension.php
index 0800ddb081..a6d36f4a16 100644
--- a/libraries/dbi/DBIExtension.php
+++ b/libraries/dbi/DBIExtension.php
@@ -234,26 +234,3 @@ interface DBIExtension
      */
     public function fieldFlags($result, $i);
 }
-
-
-/**
- * Defines PMA_MYSQL_CLIENT_API if it does not exist based
- * on MySQL client version.
- *
- * @param string $version MySQL version string
- *
- * @return void
- */
-function PMA_defineClientAPI($version)
-{
-    if (! defined('PMA_MYSQL_CLIENT_API')) {
-        $client_api = explode('.', $version);
-        define(
-            'PMA_MYSQL_CLIENT_API',
-            (int)sprintf(
-                '%d%02d%02d',
-                $client_api[0], $client_api[1], intval($client_api[2])
-            )
-        );
-    }
-}
diff --git a/libraries/dbi/DBIMysqli.php b/libraries/dbi/DBIMysqli.php
index 0d9b9d533b..f5315433cc 100644
--- a/libraries/dbi/DBIMysqli.php
+++ b/libraries/dbi/DBIMysqli.php
@@ -8,7 +8,6 @@
  */
 namespace PMA\libraries\dbi;
 
-use mysqli_result;
 use PMA\libraries\DatabaseInterface;
 
 if (! defined('PHPMYADMIN')) {