bug #39025 [DoctrineBridge] Fix DBAL deprecations in middlewares (derrabus)

chalasr · chalasr · commit b8a5e48105f5 · 2020-11-07T15:51:28.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [DoctrineBridge] Fix DBAL deprecations in middlewares | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | N/A | License | MIT | Doc PR | N/A Commits ------- 969da48 [DoctrineBridge] Fix DBAL deprecations in middlewares.
diff --git a/src/Symfony/Bridge/Doctrine/Messenger/DoctrinePingConnectionMiddleware.php b/src/Symfony/Bridge/Doctrine/Messenger/DoctrinePingConnectionMiddleware.php
@@ -12,6 +12,7 @@
 namespace Symfony\Bridge\Doctrine\Messenger;
 
 use Doctrine\DBAL\DBALException;
+use Doctrine\DBAL\Exception;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\Middleware\StackInterface;
@@ -38,8 +39,8 @@ private function pingConnection(EntityManagerInterface $entityManager)
         $connection = $entityManager->getConnection();
 
         try {
-            $connection->query($connection->getDatabasePlatform()->getDummySelectSQL());
-        } catch (DBALException $e) {
+            $connection->executeQuery($connection->getDatabasePlatform()->getDummySelectSQL());
+        } catch (DBALException | Exception $e) {
             $connection->close();
             $connection->connect();
         }
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Messenger/DoctrinePingConnectionMiddlewareTest.php b/src/Symfony/Bridge/Doctrine/Tests/Messenger/DoctrinePingConnectionMiddlewareTest.php
@@ -13,6 +13,7 @@
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\DBALException;
+use Doctrine\DBAL\Exception;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Bridge\Doctrine\Messenger\DoctrinePingConnectionMiddleware;
@@ -49,7 +50,7 @@ public function testMiddlewarePingOk()
     {
         $this->connection->expects($this->once())
             ->method('getDatabasePlatform')
-            ->will($this->throwException(new DBALException()));
+            ->will($this->throwException(class_exists(Exception::class) ? new Exception() : new DBALException()));
 
         $this->connection->expects($this->once())
             ->method('close')
@@ -68,7 +69,7 @@ public function testMiddlewarePingResetEntityManager()
     {
         $this->connection->expects($this->once())
             ->method('getDatabasePlatform')
-            ->will($this->throwException(new DBALException()));
+            ->will($this->throwException(class_exists(Exception::class) ? new Exception() : new DBALException()));
 
         $this->entityManager->expects($this->once())
             ->method('isOpen')
