Remove references to DBALException

Author: derrabus

Messenger/DoctrinePingConnectionMiddleware.php

@@ -11,8 +11,7 @@
 
 namespace Symfony\Bridge\Doctrine\Messenger;
 
-use Doctrine\DBAL\DBALException;
-use Doctrine\DBAL\Exception;
+use Doctrine\DBAL\Exception as DBALException;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\Middleware\StackInterface;
@@ -40,7 +39,7 @@ private function pingConnection(EntityManagerInterface $entityManager)
 
         try {
             $connection->executeQuery($connection->getDatabasePlatform()->getDummySelectSQL());
-        } catch (DBALException | Exception $e) {
+        } catch (DBALException $e) {
             $connection->close();
             $connection->connect();
         }

Tests/Messenger/DoctrinePingConnectionMiddlewareTest.php

@@ -12,8 +12,7 @@
 namespace Symfony\Bridge\Doctrine\Tests\Messenger;
 
 use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\DBALException;
-use Doctrine\DBAL\Exception;
+use Doctrine\DBAL\Exception as DBALException;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Bridge\Doctrine\Messenger\DoctrinePingConnectionMiddleware;
@@ -50,7 +49,7 @@ public function testMiddlewarePingOk()
     {
         $this->connection->expects($this->once())
             ->method('getDatabasePlatform')
-            ->will($this->throwException(class_exists(Exception::class) ? new Exception() : new DBALException()));
+            ->will($this->throwException(new DBALException()));
 
         $this->connection->expects($this->once())
             ->method('close')
@@ -69,7 +68,7 @@ public function testMiddlewarePingResetEntityManager()
     {
         $this->connection->expects($this->once())
             ->method('getDatabasePlatform')
-            ->will($this->throwException(class_exists(Exception::class) ? new Exception() : new DBALException()));
+            ->will($this->throwException(new DBALException()));
 
         $this->entityManager->expects($this->once())
             ->method('isOpen')

composer.json

@@ -47,11 +47,11 @@
         "doctrine/annotations": "^1.10.4",
         "doctrine/collections": "~1.0",
         "doctrine/data-fixtures": "^1.1",
-        "doctrine/dbal": "^2.10|^3.0",
+        "doctrine/dbal": "^2.13|^3.0",
         "doctrine/orm": "^2.7.3"
     },
     "conflict": {
-        "doctrine/dbal": "<2.10",
+        "doctrine/dbal": "<2.13",
         "doctrine/orm": "<2.7.3",
         "phpunit/phpunit": "<5.4.3",
         "symfony/dependency-injection": "<4.4",