diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index a01801c31b..2dbc4a9d85 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -20175,12 +20175,6 @@ parameters:
 			count: 1
 			path: tests/unit/SqlTest.php
 
-		-
-			message: '#^Method PhpMyAdmin\\Tests\\Stubs\\DbiDummy\:\:connect\(\) never returns null so it can be removed from the return type\.$#'
-			identifier: return.unusedType
-			count: 1
-			path: tests/unit/Stubs/DbiDummy.php
-
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\:
diff --git a/src/Dbal/DatabaseInterface.php b/src/Dbal/DatabaseInterface.php
index 07021745ab..747d70c32d 100644
--- a/src/Dbal/DatabaseInterface.php
+++ b/src/Dbal/DatabaseInterface.php
@@ -60,7 +60,6 @@ use function strtoupper;
 use function strtr;
 use function substr;
 use function syslog;
-use function trigger_error;
 use function uasort;
 use function uksort;
 use function usort;
@@ -1617,27 +1616,13 @@ class DatabaseInterface
 
         $errorHandler->setHideLocation(false);
 
-        if ($result !== null) {
-            $this->connections[$target->value] = $result;
-            /* Run post connect for user connections */
-            if ($target === ConnectionType::User) {
-                $this->postConnect($currentServer);
-            }
-
-            return $result;
+        $this->connections[$target->value] = $result;
+        /* Run post connect for user connections */
+        if ($target === ConnectionType::User) {
+            $this->postConnect($currentServer);
         }
 
-        if ($connectionType === ConnectionType::ControlUser) {
-            $errorHandler = ErrorHandler::getInstance();
-            $errorHandler->addError(
-                __('Connection for controluser as defined in your configuration failed.'),
-                E_USER_WARNING,
-                __FILE__,
-                __LINE__,
-            );
-        }
-
-        return null;
+        return $result;
     }
 
     /**
diff --git a/src/Dbal/DbiExtension.php b/src/Dbal/DbiExtension.php
index 3257e3d931..dc0f9bc08c 100644
--- a/src/Dbal/DbiExtension.php
+++ b/src/Dbal/DbiExtension.php
@@ -20,7 +20,7 @@ interface DbiExtension
      *
      * @throws ConnectionException
      */
-    public function connect(Server $server): Connection|null;
+    public function connect(Server $server): Connection;
 
     /**
      * selects given database
diff --git a/src/Dbal/DbiMysqli.php b/src/Dbal/DbiMysqli.php
index 35fad40490..17a31f6e45 100644
--- a/src/Dbal/DbiMysqli.php
+++ b/src/Dbal/DbiMysqli.php
@@ -18,7 +18,6 @@ use function __;
 use function defined;
 use function mysqli_connect_errno;
 use function mysqli_get_client_info;
-use function mysqli_init;
 use function mysqli_report;
 use function sprintf;
 use function str_contains;
@@ -40,15 +39,11 @@ use const MYSQLI_USE_RESULT;
  */
 class DbiMysqli implements DbiExtension
 {
-    public function connect(Server $server): Connection|null
+    public function connect(Server $server): Connection
     {
         mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
 
-        $mysqli = mysqli_init();
-
-        if ($mysqli === false) {
-            return null;
-        }
+        $mysqli = new mysqli();
 
         $clientFlags = 0;
 
diff --git a/tests/unit/Stubs/DbiDummy.php b/tests/unit/Stubs/DbiDummy.php
index 4987d804e0..35ba27a653 100644
--- a/tests/unit/Stubs/DbiDummy.php
+++ b/tests/unit/Stubs/DbiDummy.php
@@ -92,7 +92,7 @@ class DbiDummy implements DbiExtension
         $this->init();
     }
 
-    public function connect(Server $server): Connection|null
+    public function connect(Server $server): Connection
     {
         return new Connection(new stdClass());
     }