Merge branch '5.0' into 5.1
* 5.0: Handle fetch mode deprecation of DBAL 2.11.
This commit is contained in:
commit
50dda4c9a7
@ -13,7 +13,7 @@ use Symfony\Component\Security\Core\Exception\TokenNotFoundException;
|
|||||||
*/
|
*/
|
||||||
class DoctrineTokenProviderTest extends TestCase
|
class DoctrineTokenProviderTest extends TestCase
|
||||||
{
|
{
|
||||||
public static function setUpBeforeClass()
|
public static function setUpBeforeClass(): void
|
||||||
{
|
{
|
||||||
if (\PHP_VERSION_ID >= 80000) {
|
if (\PHP_VERSION_ID >= 80000) {
|
||||||
self::markTestSkipped('Doctrine DBAL 2.x is incompatible with PHP 8.');
|
self::markTestSkipped('Doctrine DBAL 2.x is incompatible with PHP 8.');
|
||||||
|
@ -257,7 +257,7 @@ class PdoAdapter extends AbstractAdapter implements PruneableInterface
|
|||||||
$stmt->bindValue(':time', time(), \PDO::PARAM_INT);
|
$stmt->bindValue(':time', time(), \PDO::PARAM_INT);
|
||||||
$stmt->execute();
|
$stmt->execute();
|
||||||
|
|
||||||
return (bool) $stmt->fetchColumn();
|
return (bool) (method_exists($stmt, 'fetchOne') ? $stmt->fetchOne() : $stmt->fetchColumn());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -193,7 +193,7 @@ class PdoStore implements PersistingStoreInterface
|
|||||||
$stmt->bindValue(':token', $this->getUniqueToken($key));
|
$stmt->bindValue(':token', $this->getUniqueToken($key));
|
||||||
$stmt->execute();
|
$stmt->execute();
|
||||||
|
|
||||||
return (bool) $stmt->fetchColumn();
|
return (bool) (method_exists($stmt, 'fetchOne') ? $stmt->fetchOne() : $stmt->fetchColumn());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -12,7 +12,8 @@
|
|||||||
namespace Symfony\Component\Messenger\Bridge\Doctrine\Tests\Transport;
|
namespace Symfony\Component\Messenger\Bridge\Doctrine\Tests\Transport;
|
||||||
|
|
||||||
use Doctrine\DBAL\DBALException;
|
use Doctrine\DBAL\DBALException;
|
||||||
use Doctrine\DBAL\Driver\Statement;
|
use Doctrine\DBAL\Driver\ResultStatement;
|
||||||
|
use Doctrine\DBAL\ForwardCompatibility\Driver\ResultStatement as ForwardCompatibleResultStatement;
|
||||||
use Doctrine\DBAL\Platforms\AbstractPlatform;
|
use Doctrine\DBAL\Platforms\AbstractPlatform;
|
||||||
use Doctrine\DBAL\Query\QueryBuilder;
|
use Doctrine\DBAL\Query\QueryBuilder;
|
||||||
use Doctrine\DBAL\Schema\AbstractSchemaManager;
|
use Doctrine\DBAL\Schema\AbstractSchemaManager;
|
||||||
@ -143,11 +144,16 @@ class ConnectionTest extends TestCase
|
|||||||
return $queryBuilder;
|
return $queryBuilder;
|
||||||
}
|
}
|
||||||
|
|
||||||
private function getStatementMock($expectedResult): Statement
|
private function getStatementMock($expectedResult): ResultStatement
|
||||||
{
|
{
|
||||||
$stmt = $this->createMock(Statement::class);
|
$mockedInterface = interface_exists(ForwardCompatibleResultStatement::class)
|
||||||
|
? ForwardCompatibleResultStatement::class
|
||||||
|
: ResultStatement::class;
|
||||||
|
|
||||||
|
$stmt = $this->createMock($mockedInterface);
|
||||||
|
|
||||||
$stmt->expects($this->once())
|
$stmt->expects($this->once())
|
||||||
->method('fetch')
|
->method(method_exists($mockedInterface, 'fetchAssociative') ? 'fetchAssociative' : 'fetch')
|
||||||
->willReturn($expectedResult);
|
->willReturn($expectedResult);
|
||||||
|
|
||||||
return $stmt;
|
return $stmt;
|
||||||
@ -309,9 +315,12 @@ class ConnectionTest extends TestCase
|
|||||||
'headers' => json_encode(['type' => DummyMessage::class]),
|
'headers' => json_encode(['type' => DummyMessage::class]),
|
||||||
];
|
];
|
||||||
|
|
||||||
$stmt = $this->createMock(Statement::class);
|
$mockedInterface = interface_exists(ForwardCompatibleResultStatement::class)
|
||||||
|
? ForwardCompatibleResultStatement::class
|
||||||
|
: ResultStatement::class;
|
||||||
|
$stmt = $this->createMock($mockedInterface);
|
||||||
$stmt->expects($this->once())
|
$stmt->expects($this->once())
|
||||||
->method('fetchAll')
|
->method(method_exists($mockedInterface, 'fetchAllAssociative') ? 'fetchAllAssociative' : 'fetchAll')
|
||||||
->willReturn([$message1, $message2]);
|
->willReturn([$message1, $message2]);
|
||||||
|
|
||||||
$driverConnection
|
$driverConnection
|
||||||
|
@ -64,15 +64,14 @@ class DoctrineIntegrationTest extends TestCase
|
|||||||
{
|
{
|
||||||
$this->connection->send('{"message": "Hi i am delayed"}', ['type' => DummyMessage::class], 600000);
|
$this->connection->send('{"message": "Hi i am delayed"}', ['type' => DummyMessage::class], 600000);
|
||||||
|
|
||||||
$available_at = $this->driverConnection->createQueryBuilder()
|
$stmt = $this->driverConnection->createQueryBuilder()
|
||||||
->select('m.available_at')
|
->select('m.available_at')
|
||||||
->from('messenger_messages', 'm')
|
->from('messenger_messages', 'm')
|
||||||
->where('m.body = :body')
|
->where('m.body = :body')
|
||||||
->setParameter(':body', '{"message": "Hi i am delayed"}')
|
->setParameter(':body', '{"message": "Hi i am delayed"}')
|
||||||
->execute()
|
->execute();
|
||||||
->fetchColumn();
|
|
||||||
|
|
||||||
$available_at = new \DateTime($available_at);
|
$available_at = new \DateTime(method_exists($stmt, 'fetchOne') ? $stmt->fetchOne() : $stmt->fetchColumn());
|
||||||
|
|
||||||
$now = new \DateTime();
|
$now = new \DateTime();
|
||||||
$now->modify('+60 seconds');
|
$now->modify('+60 seconds');
|
||||||
|
@ -170,11 +170,12 @@ class Connection implements ResetInterface
|
|||||||
->setMaxResults(1);
|
->setMaxResults(1);
|
||||||
|
|
||||||
// use SELECT ... FOR UPDATE to lock table
|
// use SELECT ... FOR UPDATE to lock table
|
||||||
$doctrineEnvelope = $this->executeQuery(
|
$stmt = $this->executeQuery(
|
||||||
$query->getSQL().' '.$this->driverConnection->getDatabasePlatform()->getWriteLockSQL(),
|
$query->getSQL().' '.$this->driverConnection->getDatabasePlatform()->getWriteLockSQL(),
|
||||||
$query->getParameters(),
|
$query->getParameters(),
|
||||||
$query->getParameterTypes()
|
$query->getParameterTypes()
|
||||||
)->fetch();
|
);
|
||||||
|
$doctrineEnvelope = method_exists($stmt, 'fetchAssociative') ? $stmt->fetchAssociative() : $stmt->fetch();
|
||||||
|
|
||||||
if (false === $doctrineEnvelope) {
|
if (false === $doctrineEnvelope) {
|
||||||
$this->driverConnection->commit();
|
$this->driverConnection->commit();
|
||||||
@ -264,7 +265,9 @@ class Connection implements ResetInterface
|
|||||||
->select('COUNT(m.id) as message_count')
|
->select('COUNT(m.id) as message_count')
|
||||||
->setMaxResults(1);
|
->setMaxResults(1);
|
||||||
|
|
||||||
return $this->executeQuery($queryBuilder->getSQL(), $queryBuilder->getParameters(), $queryBuilder->getParameterTypes())->fetchColumn();
|
$stmt = $this->executeQuery($queryBuilder->getSQL(), $queryBuilder->getParameters(), $queryBuilder->getParameterTypes());
|
||||||
|
|
||||||
|
return method_exists($stmt, 'fetchOne') ? $stmt->fetchOne() : $stmt->fetchColumn();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function findAll(int $limit = null): array
|
public function findAll(int $limit = null): array
|
||||||
@ -274,7 +277,8 @@ class Connection implements ResetInterface
|
|||||||
$queryBuilder->setMaxResults($limit);
|
$queryBuilder->setMaxResults($limit);
|
||||||
}
|
}
|
||||||
|
|
||||||
$data = $this->executeQuery($queryBuilder->getSQL(), $queryBuilder->getParameters(), $queryBuilder->getParameterTypes())->fetchAll();
|
$stmt = $this->executeQuery($queryBuilder->getSQL(), $queryBuilder->getParameters(), $queryBuilder->getParameterTypes());
|
||||||
|
$data = method_exists($stmt, 'fetchAllAssociative') ? $stmt->fetchAllAssociative() : $stmt->fetchAll();
|
||||||
|
|
||||||
return array_map(function ($doctrineEnvelope) {
|
return array_map(function ($doctrineEnvelope) {
|
||||||
return $this->decodeEnvelopeHeaders($doctrineEnvelope);
|
return $this->decodeEnvelopeHeaders($doctrineEnvelope);
|
||||||
@ -286,9 +290,8 @@ class Connection implements ResetInterface
|
|||||||
$queryBuilder = $this->createQueryBuilder()
|
$queryBuilder = $this->createQueryBuilder()
|
||||||
->where('m.id = ?');
|
->where('m.id = ?');
|
||||||
|
|
||||||
$data = $this->executeQuery($queryBuilder->getSQL(), [
|
$stmt = $this->executeQuery($queryBuilder->getSQL(), [$id]);
|
||||||
$id,
|
$data = method_exists($stmt, 'fetchAssociative') ? $stmt->fetchAssociative() : $stmt->fetch();
|
||||||
])->fetch();
|
|
||||||
|
|
||||||
return false === $data ? null : $this->decodeEnvelopeHeaders($data);
|
return false === $data ? null : $this->decodeEnvelopeHeaders($data);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user