fix parsing of payload timestamp to DateTimeImmutable

ovgray · ovgray · commit 3225112b7668 · 2023-08-31T12:22:10.000-04:00
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/RemoteEvent/MailgunPayloadConverter.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/RemoteEvent/MailgunPayloadConverter.php
@@ -50,8 +50,8 @@ public function convert(array $payload): AbstractMailerEvent
             };
             $event = new MailerEngagementEvent($name, $payload['id'], $payload);
         }
-        if (!$date = \DateTimeImmutable::createFromFormat('U.u', $payload['timestamp'])) {
-            throw new ParseException(sprintf('Invalid date "%s".', $payload['timestamp']));
+        if (!$date = \DateTimeImmutable::createFromFormat('U.u', sprintf('%.6F', $payload['timestamp']))) {
+            throw new ParseException(sprintf('Invalid date "%s".', sprintf('%.6F', $payload['timestamp'])));
         }
         $event->setDate($date);
         $event->setRecipientEmail($payload['recipient']);
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/clicks.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/clicks.php
@@ -6,6 +6,6 @@
 $wh->setRecipientEmail('alice@example.com');
 $wh->setTags(['my_tag_1', 'my_tag_2']);
 $wh->setMetadata(['my_var_1' => 'Mailgun Variable #1', 'my-var-2' => 'awesome']);
-$wh->setDate(\DateTimeImmutable::createFromFormat('U.u', 1521243339.873676));
+$wh->setDate(\DateTimeImmutable::createFromFormat('U.u', '1521243339.873676'));
 
 return $wh;
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/delivered_messages.json b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/delivered_messages.json
@@ -6,7 +6,7 @@
     },
     "event-data": {
         "id": "CPgfbmQMTCKtHW6uIWtuVe",
-        "timestamp": 1521472262.908181,
+        "timestamp": 1521472262.000002,
         "log-level": "info",
         "event": "delivered",
         "delivery-status": {
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/delivered_messages.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/delivered_messages.php
@@ -6,7 +6,7 @@
 $wh->setRecipientEmail('alice@example.com');
 $wh->setTags(['my_tag_1', 'my_tag_2']);
 $wh->setMetadata(['my_var_1' => 'Mailgun Variable #1', 'my-var-2' => 'awesome']);
-$wh->setDate(\DateTimeImmutable::createFromFormat('U.u', 1521472262.908181));
+$wh->setDate(\DateTimeImmutable::createFromFormat('U.u', '1521472262.000002'));
 $wh->setReason('OK');
 
 return $wh;
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/opens.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/opens.php
@@ -6,6 +6,6 @@
 $wh->setRecipientEmail('alice@example.com');
 $wh->setTags(['my_tag_1', 'my_tag_2']);
 $wh->setMetadata(['my_var_1' => 'Mailgun Variable #1', 'my-var-2' => 'awesome']);
-$wh->setDate(\DateTimeImmutable::createFromFormat('U.u', 1521243339.873676));
+$wh->setDate(\DateTimeImmutable::createFromFormat('U.u', '1521243339.873676'));
 
 return $wh;
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/permanent_failure.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/permanent_failure.php
@@ -6,7 +6,7 @@
 $wh->setRecipientEmail('alice@example.com');
 $wh->setTags(['my_tag_1', 'my_tag_2']);
 $wh->setMetadata(['my_var_1' => 'Mailgun Variable #1', 'my-var-2' => 'awesome']);
-$wh->setDate(\DateTimeImmutable::createFromFormat('U.u', 1521233195.375624));
+$wh->setDate(\DateTimeImmutable::createFromFormat('U.u', '1521233195.375624'));
 $wh->setReason('No Such User Here');
 
 return $wh;
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/spam_complaints.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/spam_complaints.php
@@ -6,6 +6,6 @@
 $wh->setRecipientEmail('alice@example.com');
 $wh->setTags(['my_tag_1', 'my_tag_2']);
 $wh->setMetadata(['my_var_1' => 'Mailgun Variable #1', 'my-var-2' => 'awesome']);
-$wh->setDate(\DateTimeImmutable::createFromFormat('U.u', 1521233123.501324));
+$wh->setDate(\DateTimeImmutable::createFromFormat('U.u', '1521233123.501324'));
 
 return $wh;
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/suppression_failure.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/suppression_failure.php
@@ -6,7 +6,7 @@
 $wh->setRecipientEmail('alice@example.com');
 $wh->setTags(['my_tag_1', 'my_tag_2']);
 $wh->setMetadata(['my_var_1' => 'Mailgun Variable #1', 'my-var-2' => 'awesome']);
-$wh->setDate(\DateTimeImmutable::createFromFormat('U.u', 1521233195.375624));
+$wh->setDate(\DateTimeImmutable::createFromFormat('U.u', '1521233195.375624'));
 $wh->setReason('Not delivering to previously bounced address');
 
 return $wh;
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/temporary_failure.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/temporary_failure.php
@@ -6,7 +6,7 @@
 $wh->setRecipientEmail('alice@example.com');
 $wh->setTags(['my_tag_1', 'my_tag_2']);
 $wh->setMetadata(['my_var_1' => 'Mailgun Variable #1', 'my-var-2' => 'awesome']);
-$wh->setDate(\DateTimeImmutable::createFromFormat('U.u', 1521472262.908181));
+$wh->setDate(\DateTimeImmutable::createFromFormat('U.u', '1521472262.908181'));
 $wh->setReason("4.2.2 The email account that you tried to reach is over quota. Please direct\n4.2.2 the recipient to\n4.2.2  https://support.example.com/mail/?p=422");
 
 return $wh;
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/unsubscribes.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/unsubscribes.php
@@ -6,6 +6,6 @@
 $wh->setRecipientEmail('alice@example.com');
 $wh->setTags(['my_tag_1', 'my_tag_2']);
 $wh->setMetadata(['my_var_1' => 'Mailgun Variable #1', 'my-var-2' => 'awesome']);
-$wh->setDate(\DateTimeImmutable::createFromFormat('U.u', 1521243339.873676));
+$wh->setDate(\DateTimeImmutable::createFromFormat('U.u', '1521243339.873676'));
 
 return $wh;

Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,8 @@ public function convert(array $payload): AbstractMailerEvent`
`50`	`50`	`};`
`51`	`51`	`$event = new MailerEngagementEvent($name, $payload['id'], $payload);`
`52`	`52`	`}`
`53`		`- if (!$date = \DateTimeImmutable::createFromFormat('U.u', $payload['timestamp'])) {`
`54`		`- throw new ParseException(sprintf('Invalid date "%s".', $payload['timestamp']));`
	`53`	`+ if (!$date = \DateTimeImmutable::createFromFormat('U.u', sprintf('%.6F', $payload['timestamp']))) {`
	`54`	`+ throw new ParseException(sprintf('Invalid date "%s".', sprintf('%.6F', $payload['timestamp'])));`
`55`	`55`	`}`
`56`	`56`	`$event->setDate($date);`
`57`	`57`	`$event->setRecipientEmail($payload['recipient']);`