Merge branch '5.1' into 5.x

chalasr · chalasr · commit f226d981af4e · 2020-11-07T17:24:48.000+01:00
* 5.1:
  [Messenger] Fix DBAL deprecations in PostgreSQLConnection
  [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')
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php
@@ -341,7 +341,7 @@ private function executeQuery(string $sql, array $parameters = [], array $types
         return $stmt;
     }
 
-    private function executeStatement(string $sql, array $parameters = [], array $types = [])
+    protected function executeStatement(string $sql, array $parameters = [], array $types = [])
     {
         try {
             if (method_exists($this->driverConnection, 'executeStatement')) {
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/PostgreSqlConnection.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/PostgreSqlConnection.php
@@ -64,7 +64,7 @@ public function get(): ?array
         if (!$this->listening) {
             // This is secure because the table name must be a valid identifier:
             // https://www.postgresql.org/docs/current/sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIERS
-            $this->driverConnection->exec(sprintf('LISTEN "%s"', $this->configuration['table_name']));
+            $this->executeStatement(sprintf('LISTEN "%s"', $this->configuration['table_name']));
             $this->listening = true;
         }
 
@@ -87,7 +87,7 @@ public function setup(): void
     {
         parent::setup();
 
-        $this->driverConnection->exec(implode("\n", $this->getTriggerSql()));
+        $this->executeStatement(implode("\n", $this->getTriggerSql()));
     }
 
     /**
@@ -134,7 +134,7 @@ private function unlisten()
             return;
         }
 
-        $this->driverConnection->exec(sprintf('UNLISTEN "%s"', $this->configuration['table_name']));
+        $this->executeStatement(sprintf('UNLISTEN "%s"', $this->configuration['table_name']));
         $this->listening = false;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,7 @@ private function executeQuery(string $sql, array $parameters = [], array $types`
`341`	`341`	`return $stmt;`
`342`	`342`	`}`
`343`	`343`
`344`		`- private function executeStatement(string $sql, array $parameters = [], array $types = [])`
	`344`	`+ protected function executeStatement(string $sql, array $parameters = [], array $types = [])`
`345`	`345`	`{`
`346`	`346`	`try {`
`347`	`347`	`if (method_exists($this->driverConnection, 'executeStatement')) {`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public function get(): ?array`
`64`	`64`	`if (!$this->listening) {`
`65`	`65`	`// This is secure because the table name must be a valid identifier:`
`66`	`66`	`// https://www.postgresql.org/docs/current/sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIERS`
`67`		`- $this->driverConnection->exec(sprintf('LISTEN "%s"', $this->configuration['table_name']));`
	`67`	`+ $this->executeStatement(sprintf('LISTEN "%s"', $this->configuration['table_name']));`
`68`	`68`	`$this->listening = true;`
`69`	`69`	`}`
`70`	`70`
`@@ -87,7 +87,7 @@ public function setup(): void`
`87`	`87`	`{`
`88`	`88`	`parent::setup();`
`89`	`89`
`90`		`- $this->driverConnection->exec(implode("\n", $this->getTriggerSql()));`
	`90`	`+ $this->executeStatement(implode("\n", $this->getTriggerSql()));`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`/**`
`@@ -134,7 +134,7 @@ private function unlisten()`
`134`	`134`	`return;`
`135`	`135`	`}`
`136`	`136`
`137`		`- $this->driverConnection->exec(sprintf('UNLISTEN "%s"', $this->configuration['table_name']));`
	`137`	`+ $this->executeStatement(sprintf('UNLISTEN "%s"', $this->configuration['table_name']));`
`138`	`138`	`$this->listening = false;`
`139`	`139`	`}`
`140`	`140`	`}`