Use error suppression instead of an error handler in MySQLi Connection

src/Driver/Mysqli/MysqliConnection.php

@@ -17,8 +17,6 @@ use function mysqli_errno;
 use function mysqli_error;
 use function mysqli_init;
 use function mysqli_options;
-use function restore_error_handler;
-use function set_error_handler;
 use function sprintf;
 use function stripos;
 
@@ -70,16 +68,12 @@ class MysqliConnection implements PingableConnection, ServerInfoAwareConnection
         $this->setSecureConnection($params);
         $this->setDriverOptions($driverOptions);
 
-        set_error_handler(static function (): bool {
-            return true;
-        });
-
-        try {
-            if (! $this->conn->real_connect($host, $username, $password, $dbname, $port, $socket, $flags)) {
-                throw new MysqliException($this->conn->connect_error, $this->conn->sqlstate ?? 'HY000', $this->conn->connect_errno);
-            }
-        } finally {
-            restore_error_handler();
+        if (! @$this->conn->real_connect($host, $username, $password, $dbname, $port, $socket, $flags)) {
+            throw new MysqliException(
+                $this->conn->connect_error,
+                $this->conn->sqlstate ?? 'HY000',
+                $this->conn->connect_errno
+            );
         }
 
         if (! isset($params['charset'])) {

tests/Driver/Mysqli/MysqliConnectionTest.php

@@ -4,14 +4,11 @@ namespace Doctrine\DBAL\Tests\Driver\Mysqli;
 
 use Doctrine\DBAL\Driver\Mysqli\HostRequired;
 use Doctrine\DBAL\Driver\Mysqli\MysqliConnection;
-use Doctrine\DBAL\Driver\Mysqli\MysqliException;
 use Doctrine\DBAL\Platforms\MySqlPlatform;
 use Doctrine\DBAL\Tests\FunctionalTestCase;
 use PHPUnit\Framework\MockObject\MockObject;
 
 use function extension_loaded;
-use function restore_error_handler;
-use function set_error_handler;
 
 class MysqliConnectionTest extends FunctionalTestCase
 {
@@ -44,26 +41,6 @@ class MysqliConnectionTest extends FunctionalTestCase
         self::assertFalse($this->connectionMock->requiresQueryForServerVersion());
     }
 
-    public function testRestoresErrorHandlerOnException(): void
-    {
-        $handler = static function (): bool {
-            self::fail('Never expected this to be called');
-        };
-
-        $defaultHandler = set_error_handler($handler);
-
-        try {
-            new MysqliConnection(['host' => '255.255.255.255'], 'user', 'pass');
-            self::fail('An exception was supposed to be raised');
-        } catch (MysqliException $e) {
-            self::assertSame('Network is unreachable', $e->getMessage());
-        }
-
-        self::assertSame($handler, set_error_handler($defaultHandler), 'Restoring error handler failed.');
-        restore_error_handler();
-        restore_error_handler();
-    }
-
     public function testHostnameIsRequiredForPersistentConnection(): void
     {
         $this->expectException(HostRequired::class);