8000 minor #51615 [Doctrine][Messenger] Remove obsolete DBAL 2 compat code… · symfony/symfony@24b1bc8 · GitHub
[go: up one dir, main page]
Skip to content

Commit 24b1bc8

Browse files
fabpotfabpot
committed
minor #51615 [Doctrine][Messenger] Remove obsolete DBAL 2 compat code (derrabus)
This PR was merged into the 6.4 branch. Discussion ---------- [Doctrine][Messenger] Remove obsolete DBAL 2 compat code | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | N/A | License | MIT | Doc PR | N/A DBAL 2's forward compatibility layer should allow us to remove this feature detection. Commits ------- 9883d02 Remove obsolete DBAL 2 compat code
2 parents fee9b30 + 9883d02 commit 24b1bc8

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

‎src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineIntegrationTest.php

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
use Doctrine\DBAL\Configuration;
1515
use Doctrine\DBAL\DriverManager;
16-
use Doctrine\DBAL\Result;
1716
use Doctrine\DBAL\Schema\AbstractSchemaManager;
1817
use Doctrine\DBAL\Schema\DefaultSchemaManagerFactory;
1918
use Doctrine\DBAL\Tools\DsnParser;
@@ -59,18 +58,14 @@ public function testSendWithDelay()
5958
{
6059
$this->connection->send('{"message": "Hi i am delayed"}', ['type' => DummyMessage::class], 600000);
6160

62-
$stmt = $this->driverConnection->createQueryBuilder()
61+
$result = $this->driverConnection->createQueryBuilder()
6362
->select('m.available_at')
6463
->from('messenger_messages', 'm')
6564
->where('m.body = :body')
66-
->setParameter('body', '{"message": "Hi i am delayed"}');
67-
if (method_exists($stmt, 'executeQuery')) {
68-
$stmt = $stmt->executeQuery();
69-
} else {
70-
$stmt = $stmt->execute();
71-
}
65+
->setParameter('body', '{"message": "Hi i am delayed"}')
66+
->executeQuery();
7267

73-
$available_at = new \DateTimeImmutable($stmt instanceof Result ? $stmt->fetchOne() : $stmt->fetchColumn());
68+
$available_at = new \DateTimeImmutable($result->fetchOne());
7469

7570
$now = new \DateTimeImmutable('now + 60 seconds');
7671
$this->assertGreaterThan($now, $available_at);
@@ -186,7 +181,7 @@ public function testTheTransportIsSetupOnGet()
186181
$this->assertEquals('the body', $envelope['body']);
187182
}
188183

189-
private function formatDateTime(\DateTimeImmutable $dateTime)
184+
private function formatDateTime(\DateTimeImmutable $dateTime): string
190185
{
191186
return $dateTime->format($this->driverConnection->getDatabasePlatform()->getDateTimeFormatString());
192187
}

0 commit comments

Comments
 (0)
0