From 61754cb891aa3d28d65da90c2a4afd6f4315a101 Mon Sep 17 00:00:00 2001 From: Clara van Miert Date: Thu, 20 Aug 2020 19:19:12 +0200 Subject: [PATCH 1/2] [Mailer] Support Return-Path in SesApiAsyncAwsTransport Enable sending `SendEmailRequest`s with a `Return-Path` configured in `SesApiAsyncAwsTransport`. --- .../Amazon/Tests/Transport/SesApiAsyncAwsTransportTest.php | 4 +++- .../Bridge/Amazon/Transport/SesApiAsyncAwsTransport.php | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesApiAsyncAwsTransportTest.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesApiAsyncAwsTransportTest.php index 88e1bd98cc..75635c1604 100644 --- a/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesApiAsyncAwsTransportTest.php +++ b/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesApiAsyncAwsTransportTest.php @@ -69,6 +69,7 @@ class SesApiAsyncAwsTransportTest extends TestCase $this->assertSame('Hello There!', $content['Content']['Simple']['Body']['Text']['Data']); $this->assertSame('Hello There!', $content['Content']['Simple']['Body']['Html']['Data']); $this->assertSame(['replyto-1@example.com', 'replyto-2@example.com'], $content['ReplyToAddresses']); + $this->assertSame('bounces@example.com', $content['FeedbackForwardingEmailAddress']); $json = '{"MessageId": "foobar"}'; @@ -85,7 +86,8 @@ class SesApiAsyncAwsTransportTest extends TestCase ->from(new Address('fabpot@symfony.com', 'Fabien')) ->text('Hello There!') ->html('Hello There!') - ->replyTo(new Address('replyto-1@example.com'), new Address('replyto-2@example.com')); + ->replyTo(new Address('replyto-1@example.com'), new Address('replyto-2@example.com')) + ->returnPath(new Address('bounces@example.com')); $message = $transport->send($mail); diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesApiAsyncAwsTransport.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesApiAsyncAwsTransport.php index e7878ccc8b..45366e01fe 100644 --- a/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesApiAsyncAwsTransport.php +++ b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesApiAsyncAwsTransport.php @@ -89,6 +89,9 @@ class SesApiAsyncAwsTransport extends SesHttpAsyncAwsTransport if ($emails = $email->getReplyTo()) { $request['ReplyToAddresses'] = $this->stringifyAddresses($emails); } + if ($email->getReturnPath()) { + $request['FeedbackForwardingEmailAddress'] = $email->getReturnPath()->toString(); + } return new SendEmailRequest($request); } From 7b865eaeba61a3bbfe62fd7c8ad539155265959c Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 23 Aug 2020 11:12:48 +0200 Subject: [PATCH 2/2] Fix constraint --- src/Symfony/Component/Mailer/Bridge/Amazon/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/composer.json b/src/Symfony/Component/Mailer/Bridge/Amazon/composer.json index 5889d26817..8860768ce0 100644 --- a/src/Symfony/Component/Mailer/Bridge/Amazon/composer.json +++ b/src/Symfony/Component/Mailer/Bridge/Amazon/composer.json @@ -18,7 +18,7 @@ "require": { "php": ">=7.2.5", "symfony/deprecation-contracts": "^2.1", - "symfony/mailer": "^4.4|^5.0" + "symfony/mailer": "^5.2" }, "require-dev": { "async-aws/ses": "^1.0",