Work around the removal of Connection::connect()

Author: andrewmy

pkg/dbal/DbalConnectionFactory.php

@@ -86,7 +86,7 @@ private function establishConnection(): Connection
     {
         if (false == $this->connection) {
             $this->connection = DriverManager::getConnection($this->config['connection']);
-            $this->connection->connect();
+            $this->connection->getServerVersion(); // calls connect() internally
         }
 
         return $this->connection;

pkg/dbal/ManagerRegistryConnectionFactory.php

@@ -59,8 +59,9 @@ public function close(): void
 
     private function establishConnection(): Connection
     {
+        /** @var Connection $connection */
         $connection = $this->registry->getConnection($this->config['connection_name']);
-        $connection->connect();
+        $connection->getServerVersion(); // calls connect() internally
 
         return $connection;
     }

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

@@ -36,7 +36,7 @@ public function onMessageReceived(MessageReceived $context): void
             );
 
             $connection->close();
-            $connection->connect();
+            $connection->getServerVersion(); // calls connect() internally
 
             $context->getLogger()->debug(
                 '[DoctrinePingConnectionExtension] Connection is active now.'

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

@@ -43,7 +43,7 @@ public function testShouldNotReconnectIfConnectionIsOK()
         ;
         $connection
             ->expects($this->never())
-            ->method('connect')
+            ->method('getServerVersion')
         ;
 
         $context = $this->createContext();
@@ -83,7 +83,7 @@ public function testShouldDoesReconnectIfConnectionFailed()
         ;
         $connection
             ->expects($this->once())
-            ->method('connect')
+            ->method('getServerVersion')
         ;
 
         $context = $this->createContext();

pkg/job-queue/Test/DbalPersistedConnection.php

@@ -22,10 +22,10 @@ class DbalPersistedConnection extends Connection
      */
     protected static $persistedTransactionNestingLevels;
 
-    public function connect()
+    public function connect(): DriverConnection
     {
         if ($this->isConnected()) {
-            return false;
+            return $this->_conn;
         }
 
         if ($this->hasPersistedConnection()) {
@@ -35,28 +35,22 @@ public function connect()
             $this->persistConnection($this->_conn);
         }
 
-        return true;
+        return $this->_conn;
     }
 
-    public function beginTransaction()
+    public function beginTransaction(): void
     {
         $this->wrapTransactionNestingLevel('beginTransaction');
-
-        return true;
     }
 
-    public function commit()
+    public function commit(): void
     {
         $this->wrapTransactionNestingLevel('commit');
-
-        return true;
     }
 
-    public function rollBack()
+    public function rollBack(): void
     {
         $this->wrapTransactionNestingLevel('rollBack');
-
-        return true;
     }
 
     /**