Merge branch '5.1'

fabpot · fabpot · commit 988f39b6e195 · 2020-08-23T11:13:44.000+02:00
* 5.1:
  Fix constraint
  [Mailer] Support Return-Path in SesApiAsyncAwsTransport
diff --git a/Amazon/Tests/Transport/SesApiAsyncAwsTransportTest.php b/Amazon/Tests/Transport/SesApiAsyncAwsTransportTest.php
@@ -70,6 +70,7 @@ public function testSend()
             $this->assertSame('<b>Hello There!</b>', $content['Content']['Simple']['Body']['Html']['Data']);
             $this->assertSame(['replyto-1@example.com', 'replyto-2@example.com'], $content['ReplyToAddresses']);
             $this->assertSame('aws-configuration-set-name', $content['ConfigurationSetName']);
+            $this->assertSame('bounces@example.com', $content['FeedbackForwardingEmailAddress']);
 
             $json = '{"MessageId": "foobar"}';
 
@@ -86,7 +87,8 @@ public function testSend()
             ->from(new Address('fabpot@symfony.com', 'Fabien'))
             ->text('Hello There!')
             ->html('<b>Hello There!</b>')
-            ->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'));
 
         $mail->getHeaders()->addTextHeader('X-SES-CONFIGURATION-SET', 'aws-configuration-set-name');
 
diff --git a/Amazon/Transport/SesApiAsyncAwsTransport.php b/Amazon/Transport/SesApiAsyncAwsTransport.php
@@ -92,6 +92,9 @@ protected function getRequest(SentMessage $message): SendEmailRequest
         if ($header = $email->getHeaders()->get('X-SES-CONFIGURATION-SET')) {
             $request['ConfigurationSetName'] = $header->getBodyAsString();
         }
+        if ($email->getReturnPath()) {
+            $request['FeedbackForwardingEmailAddress'] = $email->getReturnPath()->toString();
+        }
 
         return new SendEmailRequest($request);
     }
diff --git a/Amazon/composer.json b/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",
diff --git a/SesApiAsyncAwsTransport.php b/SesApiAsyncAwsTransport.php
@@ -92,6 +92,9 @@ protected function getRequest(SentMessage $message): SendEmailRequest
         if ($header = $email->getHeaders()->get('X-SES-CONFIGURATION-SET')) {
             $request['ConfigurationSetName'] = $header->getBodyAsString();
         }
+        if ($email->getReturnPath()) {
+            $request['FeedbackForwardingEmailAddress'] = $email->getReturnPath()->toString();
+        }
 
         return new SendEmailRequest($request);
     }
diff --git a/SesApiAsyncAwsTransportTest.php b/SesApiAsyncAwsTransportTest.php
@@ -70,6 +70,7 @@ public function testSend()
             $this->assertSame('<b>Hello There!</b>', $content['Content']['Simple']['Body']['Html']['Data']);
             $this->assertSame(['replyto-1@example.com', 'replyto-2@example.com'], $content['ReplyToAddresses']);
             $this->assertSame('aws-configuration-set-name', $content['ConfigurationSetName']);
+            $this->assertSame('bounces@example.com', $content['FeedbackForwardingEmailAddress']);
 
             $json = '{"MessageId": "foobar"}';
 
@@ -86,7 +87,8 @@ public function testSend()
             ->from(new Address('fabpot@symfony.com', 'Fabien'))
             ->text('Hello There!')
             ->html('<b>Hello There!</b>')
-            ->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'));
 
         $mail->getHeaders()->addTextHeader('X-SES-CONFIGURATION-SET', 'aws-configuration-set-name');
 

-Original file line number
+Diff line change
             $this->assertSame('<b>Hello There!</b>', $content['Content']['Simple']['Body']['Html']['Data']);
             $this->assertSame(['[email protected]', '[email protected]'], $content['ReplyToAddresses']);
             $this->assertSame('aws-configuration-set-name', $content['ConfigurationSetName']);
 +            $this->assertSame('[email protected]', $content['FeedbackForwardingEmailAddress']);
             $json = '{"MessageId": "foobar"}';
             ->from(new Address('[email protected]', 'Fabien'))
             ->text('Hello There!')
             ->html('<b>Hello There!</b>')
 -            ->replyTo(new Address('[email protected]'), new Address('[email protected]'));
 +            ->replyTo(new Address('[email protected]'), new Address('[email protected]'))
 +            ->returnPath(new Address('[email protected]'));
         $mail->getHeaders()->addTextHeader('X-SES-CONFIGURATION-SET', 'aws-configuration-set-name');
Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,9 @@ protected function getRequest(SentMessage $message): SendEmailRequest`
`92`	`92`	`if ($header = $email->getHeaders()->get('X-SES-CONFIGURATION-SET')) {`
`93`	`93`	`$request['ConfigurationSetName'] = $header->getBodyAsString();`
`94`	`94`	`}`
	`95`	`+ if ($email->getReturnPath()) {`
	`96`	`+ $request['FeedbackForwardingEmailAddress'] = $email->getReturnPath()->toString();`
	`97`	`+ }`
`95`	`98`
`96`	`99`	`return new SendEmailRequest($request);`
`97`	`100`	`}`