Merge branch '4.4' into 5.1
* 4.4: [DoctrineBridge] Fix DBAL deprecations in middlewares.
This commit is contained in:
commit
245d04189e
@ -12,6 +12,7 @@
|
|||||||
namespace Symfony\Bridge\Doctrine\Messenger;
|
namespace Symfony\Bridge\Doctrine\Messenger;
|
||||||
|
|
||||||
use Doctrine\DBAL\DBALException;
|
use Doctrine\DBAL\DBALException;
|
||||||
|
use Doctrine\DBAL\Exception;
|
||||||
use Doctrine\ORM\EntityManagerInterface;
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
use Symfony\Component\Messenger\Envelope;
|
use Symfony\Component\Messenger\Envelope;
|
||||||
use Symfony\Component\Messenger\Middleware\StackInterface;
|
use Symfony\Component\Messenger\Middleware\StackInterface;
|
||||||
@ -38,8 +39,8 @@ class DoctrinePingConnectionMiddleware extends AbstractDoctrineMiddleware
|
|||||||
$connection = $entityManager->getConnection();
|
$connection = $entityManager->getConnection();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$connection->query($connection->getDatabasePlatform()->getDummySelectSQL());
|
$connection->executeQuery($connection->getDatabasePlatform()->getDummySelectSQL());
|
||||||
} catch (DBALException $e) {
|
} catch (DBALException | Exception $e) {
|
||||||
$connection->close();
|
$connection->close();
|
||||||
$connection->connect();
|
$connection->connect();
|
||||||
}
|
}
|
||||||
|
@ -13,6 +13,7 @@ namespace Symfony\Bridge\Doctrine\Tests\Messenger;
|
|||||||
|
|
||||||
use Doctrine\DBAL\Connection;
|
use Doctrine\DBAL\Connection;
|
||||||
use Doctrine\DBAL\DBALException;
|
use Doctrine\DBAL\DBALException;
|
||||||
|
use Doctrine\DBAL\Exception;
|
||||||
use Doctrine\ORM\EntityManagerInterface;
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
use Doctrine\Persistence\ManagerRegistry;
|
use Doctrine\Persistence\ManagerRegistry;
|
||||||
use Symfony\Bridge\Doctrine\Messenger\DoctrinePingConnectionMiddleware;
|
use Symfony\Bridge\Doctrine\Messenger\DoctrinePingConnectionMiddleware;
|
||||||
@ -49,7 +50,7 @@ class DoctrinePingConnectionMiddlewareTest extends MiddlewareTestCase
|
|||||||
{
|
{
|
||||||
$this->connection->expects($this->once())
|
$this->connection->expects($this->once())
|
||||||
->method('getDatabasePlatform')
|
->method('getDatabasePlatform')
|
||||||
->will($this->throwException(new DBALException()));
|
->will($this->throwException(class_exists(Exception::class) ? new Exception() : new DBALException()));
|
||||||
|
|
||||||
$this->connection->expects($this->once())
|
$this->connection->expects($this->once())
|
||||||
->method('close')
|
->method('close')
|
||||||
@ -68,7 +69,7 @@ class DoctrinePingConnectionMiddlewareTest extends MiddlewareTestCase
|
|||||||
{
|
{
|
||||||
$this->connection->expects($this->once())
|
$this->connection->expects($this->once())
|
||||||
->method('getDatabasePlatform')
|
->method('getDatabasePlatform')
|
||||||
->will($this->throwException(new DBALException()));
|
->will($this->throwException(class_exists(Exception::class) ? new Exception() : new DBALException()));
|
||||||
|
|
||||||
$this->entityManager->expects($this->once())
|
$this->entityManager->expects($this->once())
|
||||||
->method('isOpen')
|
->method('isOpen')
|
||||||
|
Reference in New Issue
Block a user