diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '5.1' into 5.x 

* 5.1:
  [Messenger] Fix DBAL deprecations in PostgreSQLConnection
  [DoctrineBridge] Fix DBAL deprecations in middlewares.
This commit is contained in:
Robin Chalas 2020-11-07 17:24:48 +01:00
parent 5c5b8d61ee 245d04189e
commit f226d981af
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Symfony/Bridge/Doctrine/Messenger/DoctrinePingConnectionMiddleware.php
View File

@ -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 @@ class DoctrinePingConnectionMiddleware extends AbstractDoctrineMiddleware
$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();
}

5
src/Symfony/Bridge/Doctrine/Tests/Messenger/DoctrinePingConnectionMiddlewareTest.php
View File

@ -13,6 +13,7 @@ namespace Symfony\Bridge\Doctrine\Tests\Messenger;
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 @@ class DoctrinePingConnectionMiddlewareTest extends MiddlewareTestCase
{
$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 @@ class DoctrinePingConnectionMiddlewareTest extends MiddlewareTestCase
{
$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')

2
src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php
View File

@ -341,7 +341,7 @@ class Connection implements ResetInterface
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')) {

6
src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/PostgreSqlConnection.php
View File

@ -64,7 +64,7 @@ final class PostgreSqlConnection extends Connection
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 @@ final class PostgreSqlConnection extends Connection
{
parent::setup();
$this->driverConnection->exec(implode("\n", $this->getTriggerSql()));
$this->executeStatement(implode("\n", $this->getTriggerSql()));
}
/**
@ -134,7 +134,7 @@ SQL
return;
}
$this->driverConnection->exec(sprintf('UNLISTEN "%s"', $this->configuration['table_name']));
$this->executeStatement(sprintf('UNLISTEN "%s"', $this->configuration['table_name']));
$this->listening = false;
}
}