Juggle connect()/getServerVersion()

Author: andrewmy

pkg/dbal/ManagerRegistryConnectionFactory.php

@@ -61,7 +61,13 @@ private function establishConnection(): Connection
     {
         /** @var Connection $connection */
         $connection = $this->registry->getConnection($this->config['connection_name']);
-        $connection->getServerVersion(); // calls connect() internally
+        if (method_exists($connection, 'connect')) {
+            // DBAL < 4
+            $connection->connect();
+        } else {
+            // DBAL >= 4, calls connect() internally
+            $connection->getServerVersion();
+        }
 
         return $connection;
     }

pkg/enqueue-bundle/Consumption/Extension/DoctrinePingConnectionExtension.php

@@ -36,7 +36,13 @@ public function onMessageReceived(MessageReceived $context): void
             );
 
             $connection->close();
-            $connection->getServerVersion(); // calls connect() internally
+            if (method_exists($connection, 'connect')) {
+                // DBAL < 4
+                $connection->connect();
+            } else {
+                // DBAL >= 4, calls connect() internally
+                $connection->getServerVersion();
+            }
 
             $context->getLogger()->debug(
                 '[DoctrinePingConnectionExtension] Connection is active now.'

pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrinePingConnectionExtensionTest.php

@@ -41,10 +41,16 @@ public function testShouldNotReconnectIfConnectionIsOK()
             ->expects($this->never())
             ->method('close')
         ;
-        $connection
-            ->expects($this->never())
-            ->method('getServerVersion')
-        ;
+        if (method_exists($connection, 'connect')) {
+            // DBAL < 4
+            $connection->expects($this->never())
+                ->method('connect');
+        } else {
+            // DBAL >= 4, calls connect() internally
+            $connection
+                ->expects($this->never())
+                ->method('getServerVersion');
+        }
 
         $context = $this->createContext();
 
@@ -81,10 +87,15 @@ public function testShouldDoesReconnectIfConnectionFailed()
             ->expects($this->once())
             ->method('close')
         ;
-        $connection
-            ->expects($this->once())
-            ->method('getServerVersion')
-        ;
+        if (method_exists($connection, 'connect')) {
+            // DBAL < 4
+            $connection->expects($this->once())
+                ->method('connect');
+        } else {
+            // DBAL >= 4, calls connect() internally
+            $connection->expects($this->once())
+                ->method('getServerVersion');
+        }
 
         $context = $this->createContext();