Merge branch '6.4' into 7.0

* 6.4: fix test fix test [SecurityBundle] Fix failing tests fix tests [DependencyInjection] fix unable to make lazy service from readonly class [Dotenv] Specify envKey while loading variables with the dotenv:dump command [Mailer][Postmark][Webhook] Accept different date formats
symfony · Feb 9, 2024 · 435531b · 435531b
2 parents 2f7e69a + 13d6d3f
commit 435531b
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 10 deletions.
diff --git a/RemoteEvent/PostmarkPayloadConverter.php b/RemoteEvent/PostmarkPayloadConverter.php
@@ -47,7 +47,14 @@ public function convert(array $payload): AbstractMailerEvent
             'SpamComplaint' => $payload['BouncedAt'],
             default => throw new ParseException(sprintf('Unsupported event "%s".', $payload['RecordType'])),
         };
-        if (!$date = \DateTimeImmutable::createFromFormat('Y-m-d\TH:i:sT', $payloadDate)) {
+
+        $date = \DateTimeImmutable::createFromFormat(\DateTimeInterface::ATOM, $payloadDate)
+            // microseconds, 6 digits
+            ?: \DateTimeImmutable::createFromFormat('Y-m-d\TH:i:s.uP', $payloadDate)
+            // microseconds, 7 digits
+            ?: \DateTimeImmutable::createFromFormat('Y-m-d\TH:i:s.u?P', $payloadDate);
+
+        if (!$date) {
             throw new ParseException(sprintf('Invalid date "%s".', $payloadDate));
         }
         $event->setDate($date);

diff --git a/Tests/Webhook/Fixtures/bounce.json b/Tests/Webhook/Fixtures/bounce.json
@@ -16,7 +16,7 @@
     "Details": "Test bounce details",
     "Email": "john@example.com",
     "From": "sender@example.com",
-    "BouncedAt": "2022-09-02T14:29:19Z",
+    "BouncedAt": "2022-09-02T14:29:19.1234567Z",
     "DumpAvailable": true,
     "Inactive": true,
     "CanActivate": true,

diff --git a/Tests/Webhook/Fixtures/bounce.php b/Tests/Webhook/Fixtures/bounce.php
@@ -7,6 +7,6 @@
 $wh->setTags(['Test']);
 $wh->setMetadata(['example' => 'value', 'example_2' => 'value']);
 $wh->setReason('The server was unable to deliver your message (ex: unknown user, mailbox not found).');
-$wh->setDate(\DateTimeImmutable::createFromFormat('Y-m-d\TH:i:sT', '2022-09-02T14:29:19Z'));
+$wh->setDate(\DateTimeImmutable::createFromFormat('Y-m-d\TH:i:s.uP', '2022-09-02T14:29:19.123456Z'));
 
 return $wh;
diff --git a/Tests/Webhook/Fixtures/delivery.php b/Tests/Webhook/Fixtures/delivery.php
@@ -7,6 +7,6 @@
 $wh->setTags(['welcome-email']);
 $wh->setMetadata(['example' => 'value', 'example_2' => 'value']);
 $wh->setReason('');
-$wh->setDate(\DateTimeImmutable::createFromFormat('Y-m-d\TH:i:sT', '2022-09-02T11:49:27Z'));
+$wh->setDate(\DateTimeImmutable::createFromFormat(\DateTimeInterface::ATOM, '2022-09-02T11:49:27Z'));
 
 return $wh;
diff --git a/Tests/Webhook/Fixtures/link_click.php b/Tests/Webhook/Fixtures/link_click.php
@@ -6,6 +6,6 @@
 $wh->setRecipientEmail('john@example.com');
 $wh->setTags(['welcome-email']);
 $wh->setMetadata(['example' => 'value', 'example_2' => 'value']);
-$wh->setDate(\DateTimeImmutable::createFromFormat('Y-m-d\TH:i:sT', '2022-09-02T14:31:09Z'));
+$wh->setDate(\DateTimeImmutable::createFromFormat(\DateTimeInterface::ATOM, '2022-09-02T14:31:09Z'));
 
 return $wh;
diff --git a/Tests/Webhook/Fixtures/open.php b/Tests/Webhook/Fixtures/open.php
@@ -6,6 +6,6 @@
 $wh->setRecipientEmail('john@example.com');
 $wh->setTags(['welcome-email']);
 $wh->setMetadata(['example' => 'value', 'example_2' => 'value']);
-$wh->setDate(\DateTimeImmutable::createFromFormat('Y-m-d\TH:i:sT', '2022-09-02T14:30:47Z'));
+$wh->setDate(\DateTimeImmutable::createFromFormat(\DateTimeInterface::ATOM, '2022-09-02T14:30:47Z'));
 
 return $wh;
diff --git a/Tests/Webhook/Fixtures/spam_complaint.json b/Tests/Webhook/Fixtures/spam_complaint.json
@@ -16,7 +16,7 @@
     "Details": "Test spam complaint details",
     "Email": "john@example.com",
     "From": "sender@example.com",
-    "BouncedAt": "2022-09-02T14:29:57Z",
+    "BouncedAt": "2022-09-02T14:29:57.123456Z",
     "DumpAvailable": true,
     "Inactive": true,
     "CanActivate": false,

diff --git a/Tests/Webhook/Fixtures/spam_complaint.php b/Tests/Webhook/Fixtures/spam_complaint.php
@@ -6,6 +6,5 @@
 $wh->setRecipientEmail('john@example.com');
 $wh->setTags(['Test']);
 $wh->setMetadata(['example' => 'value', 'example_2' => 'value']);
-$wh->setDate(\DateTimeImmutable::createFromFormat('Y-m-d\TH:i:sT', '2022-09-02T14:29:57Z'));
-
+$wh->setDate(\DateTimeImmutable::createFromFormat('Y-m-d\TH:i:s.uP', '2022-09-02T14:29:57.123456Z'));
 return $wh;
diff --git a/Tests/Webhook/Fixtures/subscription_change.php b/Tests/Webhook/Fixtures/subscription_change.php
@@ -6,6 +6,6 @@
 $wh->setRecipientEmail('john@example.com');
 $wh->setTags(['welcome-email']);
 $wh->setMetadata(['example' => 'value', 'example_2' => 'value']);
-$wh->setDate(\DateTimeImmutable::createFromFormat('Y-m-d\TH:i:sT', '2022-09-02T14:32:30Z'));
+$wh->setDate(\DateTimeImmutable::createFromFormat(\DateTimeInterface::ATOM, '2022-09-02T14:32:30Z'));
 
 return $wh;