Merge pull request #18014 from MauricioFauth/connection-dbal

Create Dbal\Connection class
phpmyadmin · Jan 16, 2023 · e2bda4f · e2bda4f
2 parents 591bc50 + a6bdf8a
commit e2bda4f
Show file tree

Hide file tree

Showing 12 changed files with 288 additions and 491 deletions.
diff --git a/libraries/classes/Common.php b/libraries/classes/Common.php
@@ -609,19 +609,18 @@ private static function connectToDatabaseServer(DatabaseInterface $dbi, Authenti
          * Try to connect MySQL with the control user profile (will be used to get the privileges list for the current
          * user but the true user link must be open after this one so it would be default one for all the scripts).
          */
-        $controlLink = false;
+        $controlConnection = null;
         if ($GLOBALS['cfg']['Server']['controluser'] !== '') {
-            $controlLink = $dbi->connect(DatabaseInterface::CONNECT_CONTROL);
+            $controlConnection = $dbi->connect(DatabaseInterface::CONNECT_CONTROL);
         }
 
         // Connects to the server (validates user's login)
-        $userLink = $dbi->connect(DatabaseInterface::CONNECT_USER);
-
-        if ($userLink === false) {
+        $userConnection = $dbi->connect(DatabaseInterface::CONNECT_USER);
+        if ($userConnection === null) {
             $auth->showFailure('mysql-denied');
         }
 
-        if ($controlLink) {
+        if ($controlConnection !== null) {
             return;
         }