From c036acfe5aac9213cc56f7376d8a2be45fefc172 Mon Sep 17 00:00:00 2001 From: Alexandre parent Date: Mon, 15 May 2023 11:58:35 -0400 Subject: [PATCH] Ensure DoctrineIntegrationTest always run in UTC --- .../Transport/DoctrineIntegrationTest.php | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineIntegrationTest.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineIntegrationTest.php index 5cd3b55787654..cdf08030a36d9 100644 --- a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineIntegrationTest.php +++ b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineIntegrationTest.php @@ -74,25 +74,25 @@ public function testItRetrieveTheFirstAvailableMessage() 'body' => '{"message": "Hi handled"}', 'headers' => json_encode(['type' => DummyMessage::class]), 'queue_name' => 'default', - 'created_at' => $this->formatDateTime(new \DateTimeImmutable('2019-03-15 12:00:00')), - 'available_at' => $this->formatDateTime(new \DateTimeImmutable('2019-03-15 12:00:00')), - 'delivered_at' => $this->formatDateTime(new \DateTimeImmutable()), + 'created_at' => $this->formatDateTime(new \DateTimeImmutable('2019-03-15 12:00:00', new \DateTimeZone('UTC'))), + 'available_at' => $this->formatDateTime(new \DateTimeImmutable('2019-03-15 12:00:00', new \DateTimeZone('UTC'))), + 'delivered_at' => $this->formatDateTime(new \DateTimeImmutable('now', new \DateTimeZone('UTC'))), ]); // one available later $this->driverConnection->insert('messenger_messages', [ 'body' => '{"message": "Hi delayed"}', 'headers' => json_encode(['type' => DummyMessage::class]), 'queue_name' => 'default', - 'created_at' => $this->formatDateTime(new \DateTimeImmutable('2019-03-15 12:00:00')), - 'available_at' => $this->formatDateTime(new \DateTimeImmutable('2019-03-15 13:00:00')), + 'created_at' => $this->formatDateTime(new \DateTimeImmutable('2019-03-15 12:00:00', new \DateTimeZone('UTC'))), + 'available_at' => $this->formatDateTime(new \DateTimeImmutable('2019-03-15 13:00:00', new \DateTimeZone('UTC'))), ]); // one available $this->driverConnection->insert('messenger_messages', [ 'body' => '{"message": "Hi available"}', 'headers' => json_encode(['type' => DummyMessage::class]), 'queue_name' => 'default', - 'created_at' => $this->formatDateTime(new \DateTimeImmutable('2019-03-15 12:00:00')), - 'available_at' => $this->formatDateTime(new \DateTimeImmutable('2019-03-15 12:30:00')), + 'created_at' => $this->formatDateTime(new \DateTimeImmutable('2019-03-15 12:00:00', new \DateTimeZone('UTC'))), + 'available_at' => $this->formatDateTime(new \DateTimeImmutable('2019-03-15 12:30:00', new \DateTimeZone('UTC'))), ]); $encoded = $this->connection->get(); @@ -108,33 +108,33 @@ public function testItCountMessages() 'body' => '{"message": "Hi handled"}', 'headers' => json_encode(['type' => DummyMessage::class]), 'queue_name' => 'default', - 'created_at' => $this->formatDateTime(new \DateTimeImmutable('2019-03-15 12:00:00')), - 'available_at' => $this->formatDateTime(new \DateTimeImmutable('2019-03-15 12:00:00')), - 'delivered_at' => $this->formatDateTime(new \DateTimeImmutable()), + 'created_at' => $this->formatDateTime(new \DateTimeImmutable('2019-03-15 12:00:00', new \DateTimeZone('UTC'))), + 'available_at' => $this->formatDateTime(new \DateTimeImmutable('2019-03-15 12:00:00', new \DateTimeZone('UTC'))), + 'delivered_at' => $this->formatDateTime(new \DateTimeImmutable('now', new \DateTimeZone('UTC'))), ]); // one available later $this->driverConnection->insert('messenger_messages', [ 'body' => '{"message": "Hi delayed"}', 'headers' => json_encode(['type' => DummyMessage::class]), 'queue_name' => 'default', - 'created_at' => $this->formatDateTime(new \DateTimeImmutable('2019-03-15 12:00:00')), - 'available_at' => $this->formatDateTime((new \DateTimeImmutable())->modify('+1 minute')), + 'created_at' => $this->formatDateTime(new \DateTimeImmutable('2019-03-15 12:00:00', new \DateTimeZone('UTC'))), + 'available_at' => $this->formatDateTime(new \DateTimeImmutable('+1 minute', new \DateTimeZone('UTC'))), ]); // one available $this->driverConnection->insert('messenger_messages', [ 'body' => '{"message": "Hi available"}', 'headers' => json_encode(['type' => DummyMessage::class]), 'queue_name' => 'default', - 'created_at' => $this->formatDateTime(new \DateTimeImmutable('2019-03-15 12:00:00')), - 'available_at' => $this->formatDateTime(new \DateTimeImmutable('2019-03-15 12:30:00')), + 'created_at' => $this->formatDateTime(new \DateTimeImmutable('2019-03-15 12:00:00', new \DateTimeZone('UTC'))), + 'available_at' => $this->formatDateTime(new \DateTimeImmutable('2019-03-15 12:30:00', new \DateTimeZone('UTC'))), ]); // another available $this->driverConnection->insert('messenger_messages', [ 'body' => '{"message": "Hi available"}', 'headers' => json_encode(['type' => DummyMessage::class]), 'queue_name' => 'default', - 'created_at' => $this->formatDateTime(new \DateTimeImmutable('2019-03-15 12:00:00')), - 'available_at' => $this->formatDateTime(new \DateTimeImmutable('2019-03-15 12:30:00')), + 'created_at' => $this->formatDateTime(new \DateTimeImmutable('2019-03-15 12:00:00', new \DateTimeZone('UTC'))), + 'available_at' => $this->formatDateTime(new \DateTimeImmutable('2019-03-15 12:30:00', new \DateTimeZone('UTC'))), ]); $this->assertSame(2, $this->connection->getMessageCount()); @@ -148,16 +148,16 @@ public function testItRetrieveTheMessageThatIsOlderThanRedeliverTimeout() 'body' => '{"message": "Hi requeued"}', 'headers' => json_encode(['type' => DummyMessage::class]), 'queue_name' => 'default', - 'created_at' => $this->formatDateTime(new \DateTimeImmutable('2019-03-15 12:00:00')), - 'available_at' => $this->formatDateTime(new \DateTimeImmutable('2019-03-15 12:00:00')), + 'created_at' => $this->formatDateTime(new \DateTimeImmutable('2019-03-15 12:00:00', new \DateTimeZone('UTC'))), + 'available_at' => $this->formatDateTime(new \DateTimeImmutable('2019-03-15 12:00:00', new \DateTimeZone('UTC'))), 'delivered_at' => $this->formatDateTime($twoHoursAgo), ]); $this->driverConnection->insert('messenger_messages', [ 'body' => '{"message": "Hi available"}', 'headers' => json_encode(['type' => DummyMessage::class]), 'queue_name' => 'default', - 'created_at' => $this->formatDateTime(new \DateTimeImmutable('2019-03-15 12:00:00')), - 'available_at' => $this->formatDateTime(new \DateTimeImmutable('2019-03-15 12:30:00')), + 'created_at' => $this->formatDateTime(new \DateTimeImmutable('2019-03-15 12:00:00', new \DateTimeZone('UTC'))), + 'available_at' => $this->formatDateTime(new \DateTimeImmutable('2019-03-15 12:30:00', new \DateTimeZone('UTC'))), ]); $next = $this->connection->get();