Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[Messenger] Fix DateTime format on the Doctrine transport #32640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[Messenger] Fix DateTime format on the Doctrine transport #32640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions src/Symfony/Component/Messenger/Tests/Transport/Doctrine/DoctrineIntegrationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,25 +81,25 @@ public function testItRetrieveTheFirstAvailableMessage()
'body' => '{"message": "Hi handled"}',
'headers' => json_encode(['type' => DummyMessage::class]),
'queue_name' => 'default',
'created_at' => Connection::formatDateTime(new \DateTime('2019-03-15 12:00:00')),
'available_at' => Connection::formatDateTime(new \DateTime('2019-03-15 12:00:00')),
'delivered_at' => Connection::formatDateTime(new \DateTime()),
'created_at' => '2019-03-15 12:00:00',
'available_at' => '2019-03-15 12:00:00',
'delivered_at' => (new \DateTime())->format('Y-m-d H:i:s'),
]);
// one available later
$this->driverConnection->insert('messenger_messages', [
'body' => '{"message": "Hi delayed"}',
'headers' => json_encode(['type' => DummyMessage::class]),
'queue_name' => 'default',
'created_at' => Connection::formatDateTime(new \DateTime('2019-03-15 12:00:00')),
'available_at' => Connection::formatDateTime(new \DateTime('2019-03-15 13:00:00')),
'created_at' => '2019-03-15 12:00:00',
'available_at' => '2019-03-15 13:00:00',
]);
// one available
$this->driverConnection->insert('messenger_messages', [
'body' => '{"message": "Hi available"}',
'headers' => json_encode(['type' => DummyMessage::class]),
'queue_name' => 'default',
'created_at' => Connection::formatDateTime(new \DateTime('2019-03-15 12:00:00')),
'available_at' => Connection::formatDateTime(new \DateTime('2019-03-15 12:30:00')),
'created_at' => '2019-03-15 12:00:00',
'available_at' => '2019-03-15 12:30:00',
]);

$encoded = $this->connection->get();
Expand All @@ -114,33 +114,33 @@ public function testItCountMessages()
'body' => '{"message": "Hi handled"}',
'headers' => json_encode(['type' => DummyMessage::class]),
'queue_name' => 'default',
'created_at' => Connection::formatDateTime(new \DateTime('2019-03-15 12:00:00')),
'available_at' => Connection::formatDateTime(new \DateTime('2019-03-15 12:00:00')),
'delivered_at' => Connection::formatDateTime(new \DateTime()),
'created_at' => '2019-03-15 12:00:00',
'available_at' => '2019-03-15 12:00:00',
'delivered_at' => (new \DateTime())->format('Y-m-d H:i:s'),
]);
// one available later
$this->driverConnection->insert('messenger_messages', [
'body' => '{"message": "Hi delayed"}',
'headers' => json_encode(['type' => DummyMessage::class]),
'queue_name' => 'default',
'created_at' => Connection::formatDateTime(new \DateTime('2019-03-15 12:00:00')),
'available_at' => Connection::formatDateTime((new \DateTime())->modify('+1 minute')),
'created_at' => '2019-03-15 12:00:00',
'available_at' => ((new \DateTime())->modify('+1 minute'))->format('Y-m-d H:i:s'),
]);
// one available
$this->driverConnection->insert('messenger_messages', [
'body' => '{"message": "Hi available"}',
'headers' => json_encode(['type' => DummyMessage::class]),
'queue_name' => 'default',
'created_at' => Connection::formatDateTime(new \DateTime('2019-03-15 12:00:00')),
'available_at' => Connection::formatDateTime(new \DateTime('2019-03-15 12:30:00')),
'created_at' => '2019-03-15 12:00:00',
'available_at' => '2019-03-15 12:30:00',
]);
// another available
$this->driverConnection->insert('messenger_messages', [
'body' => '{"message": "Hi available"}',
'headers' => json_encode(['type' => DummyMessage::class]),
'queue_name' => 'default',
'created_at' => Connection::formatDateTime(new \DateTime('2019-03-15 12:00:00')),
'available_at' => Connection::formatDateTime(new \DateTime('2019-03-15 12:30:00')),
'created_at' => '2019-03-15 12:00:00',
'available_at' => '2019-03-15 12:30:00',
]);

$this->assertSame(2, $this->connection->getMessageCount());
Expand All @@ -154,16 +154,16 @@ public function testItRetrieveTheMessageThatIsOlderThanRedeliverTimeout()
'body' => '{"message": "Hi requeued"}',
'headers' => json_encode(['type' => DummyMessage::class]),
'queue_name' => 'default',
'created_at' => Connection::formatDateTime(new \DateTime('2019-03-15 12:00:00')),
'available_at' => Connection::formatDateTime(new \DateTime('2019-03-15 12:00:00')),
'delivered_at' => Connection::formatDateTime($twoHoursAgo),
'created_at' => '2019-03-15 12:00:00',
'available_at' => '2019-03-15 12:00:00',
'delivered_at' => $twoHoursAgo->format('Y-m-d H:i:s'),
]);
$this->driverConnection->insert('messenger_messages', [
'body' => '{"message": "Hi available"}',
'headers' => json_encode(['type' => DummyMessage::class]),
'queue_name' => 'default',
'created_at' => Connection::formatDateTime(new \DateTime('2019-03-15 12:00:00')),
'available_at' => Connection::formatDateTime(new \DateTime('2019-03-15 12:30:00')),
'created_at' => '2019-03-15 12:00:00',
'available_at' => '2019-03-15 12:30:00',
]);

$next = $this->connection->get();
Expand Down
14 changes: 7 additions & 7 deletions src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ public function send(string $body, array $headers, int $delay = 0): string
':body' => $body,
':headers' => json_encode($headers),
':queue_name' => $this->configuration['queue_name'],
':created_at' => self::formatDateTime($now),
':available_at' => self::formatDateTime($availableAt),
':created_at' => $this->formatDateTime($now),
':available_at' => $this->formatDateTime($availableAt),
]);

return $this->driverConnection->lastInsertId();
Expand Down Expand Up @@ -161,7 +161,7 @@ public function get(): ?array
$now = new \DateTime();
$this->executeQuery($queryBuilder->getSQL(), [
':id' => $doctrineEnvelope['id'],
':delivered_at' => self::formatDateTime($now),
':delivered_at' => $this->formatDateTime($now),
]);

$this->driverConnection->commit();
Expand Down Expand Up @@ -268,9 +268,9 @@ private function createAvailableMessagesQueryBuilder(): QueryBuilder
->andWhere('m.available_at <= :now')
->andWhere('m.queue_name = :queue_name')
->setParameters([
':now' => self::formatDateTime($now),
':now' => $this->formatDateTime($now),
':queue_name' => $this->configuration['queue_name'],
':redeliver_limit' => self::formatDateTime($redeliverLimit),
':redeliver_limit' => $this->formatDateTime($redeliverLimit),
]);
}

Expand Down Expand Up @@ -329,9 +329,9 @@ private function getSchema(): Schema
return $schema;
}

public static function formatDateTime(\DateTimeInterface $dateTime)
private function formatDateTime(\DateTimeInterface $dateTime): string
{
return $dateTime->format('Y-m-d\TH:i:s');
return $dateTime->format($this->driverConnection->getDatabasePlatform()->getDateTimeFormatString());
}

private function decodeEnvelopeHeaders(array $doctrineEnvelope): array
Expand Down