Remove trigger_error from Dbal\DbiMysqli::connect()

MauricioFauth · MauricioFauth · commit d974d30fbbf8 · 2023-12-29T14:36:15.000-03:00
Replaces them with Dbal\ConnectionException.

Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/src/DatabaseInterface.php b/src/DatabaseInterface.php
@@ -7,6 +7,7 @@
 use PhpMyAdmin\Config\Settings\Server;
 use PhpMyAdmin\ConfigStorage\Relation;
 use PhpMyAdmin\Dbal\Connection;
+use PhpMyAdmin\Dbal\ConnectionException;
 use PhpMyAdmin\Dbal\DbalInterface;
 use PhpMyAdmin\Dbal\DbiExtension;
 use PhpMyAdmin\Dbal\DbiMysqli;
@@ -1636,7 +1637,14 @@ public function connect(Server $currentServer, int $connectionType, int|null $ta
         // Do not show location and backtrace for connection errors
         $errorHandler = ErrorHandler::getInstance();
         $errorHandler->setHideLocation(true);
-        $result = $this->extension->connect($server);
+        try {
+            $result = $this->extension->connect($server);
+        } catch (ConnectionException $exception) {
+            trigger_error($exception->getMessage(), E_USER_WARNING);
+
+            return null;
+        }
+
         $errorHandler->setHideLocation(false);
 
         if ($result !== null) {
diff --git a/src/Dbal/ConnectionException.php b/src/Dbal/ConnectionException.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpMyAdmin\Dbal;
+
+use Exception;
+
+class ConnectionException extends Exception
+{
+}
diff --git a/src/Dbal/DbiExtension.php b/src/Dbal/DbiExtension.php
@@ -17,6 +17,8 @@ interface DbiExtension
 {
     /**
      * Connects to the database server.
+     *
+     * @throws ConnectionException
      */
     public function connect(Server $server): Connection|null;
 
diff --git a/src/Dbal/DbiMysqli.php b/src/Dbal/DbiMysqli.php
@@ -23,10 +23,7 @@
 use function sprintf;
 use function str_contains;
 use function strtolower;
-use function trigger_error;
 
-use const E_USER_ERROR;
-use const E_USER_WARNING;
 use const MYSQLI_CLIENT_COMPRESS;
 use const MYSQLI_CLIENT_SSL;
 use const MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT;
@@ -115,8 +112,10 @@ public function connect(Server $server): Connection|null
                 return self::connect($server->withSSL(true));
             }
 
+            mysqli_report(MYSQLI_REPORT_OFF);
+
             if ($errorNumber === 1045 && $server->hideConnectionErrors) {
-                trigger_error(
+                throw new ConnectionException(
                     sprintf(
                         __(
                             'Error 1045: Access denied for user. Additional error information'
@@ -125,15 +124,12 @@ public function connect(Server $server): Connection|null
                         '[code][doc@cfg_Servers_hide_connection_errors]'
                         . '$cfg[\'Servers\'][$i][\'hide_connection_errors\'][/doc][/code]',
                     ),
-                    E_USER_ERROR,
+                    $errorNumber,
+                    $exception,
                 );
-            } else {
-                trigger_error($errorNumber . ': ' . $errorMessage, E_USER_WARNING);
             }
 
-            mysqli_report(MYSQLI_REPORT_OFF);
-
-            return null;
+            throw new ConnectionException($errorNumber . ': ' . $errorMessage, $errorNumber, $exception);
         }
 
         $mysqli->options(MYSQLI_OPT_LOCAL_INFILE, (int) defined('PMA_ENABLE_LDI'));

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@ interface DbiExtension`
`17`	`17`	`{`
`18`	`18`	`/**`
`19`	`19`	`* Connects to the database server.`
	`20`	`+ *`
	`21`	`+ * @throws ConnectionException`
`20`	`22`	`*/`
`21`	`23`	`public function connect(Server $server): Connection\|null;`
`22`	`24`