Merge branch '5.1' into 5.x

* 5.1:
  [Messenger] Fix DBAL deprecations in PostgreSQLConnection
  [DoctrineBridge] Fix DBAL deprecations in middlewares.

Author: chalasr

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();
         }

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')