fix: return-path has higher priority for envelope address than from address (fixes #41322)

tpetry · tpetry · commit 7dd5c60bff9f · 2022-04-11T12:40:09.000+02:00
diff --git a/src/Symfony/Component/Mailer/DelayedEnvelope.php b/src/Symfony/Component/Mailer/DelayedEnvelope.php
@@ -86,12 +86,12 @@ private static function getSenderFromHeaders(Headers $headers): Address
         if ($sender = $headers->get('Sender')) {
             return $sender->getAddress();
         }
-        if ($from = $headers->get('From')) {
-            return $from->getAddresses()[0];
-        }
         if ($return = $headers->get('Return-Path')) {
             return $return->getAddress();
         }
+        if ($from = $headers->get('From')) {
+            return $from->getAddresses()[0];
+        }
 
         throw new LogicException('Unable to determine the sender of the message.');
     }
diff --git a/src/Symfony/Component/Mailer/Tests/EnvelopeTest.php b/src/Symfony/Component/Mailer/Tests/EnvelopeTest.php
@@ -96,7 +96,7 @@ public function testSenderFromHeadersWithMulitpleHeaders()
         $headers->addPathHeader('Return-Path', $return = new Address('return@symfony.com', 'return'));
         $headers->addMailboxListHeader('To', ['to@symfony.com']);
         $e = Envelope::create(new Message($headers));
-        $this->assertEquals($from, $e->getSender());
+        $this->assertEquals($return, $e->getSender());
     }
 
     public function testRecipientsFromHeaders()

Original file line number	Diff line number	Diff line change
`@@ -86,12 +86,12 @@ private static function getSenderFromHeaders(Headers $headers): Address`
`86`	`86`	`if ($sender = $headers->get('Sender')) {`
`87`	`87`	`return $sender->getAddress();`
`88`	`88`	`}`
`89`		`- if ($from = $headers->get('From')) {`
`90`		`- return $from->getAddresses()[0];`
`91`		`- }`
`92`	`89`	`if ($return = $headers->get('Return-Path')) {`
`93`	`90`	`return $return->getAddress();`
`94`	`91`	`}`
	`92`	`+ if ($from = $headers->get('From')) {`
	`93`	`+ return $from->getAddresses()[0];`
	`94`	`+ }`
`95`	`95`
`96`	`96`	`throw new LogicException('Unable to determine the sender of the message.');`
`97`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public function testSenderFromHeadersWithMulitpleHeaders()`
`96`	`96`	`$headers->addPathHeader('Return-Path', $return = new Address('return@symfony.com', 'return'));`
`97`	`97`	`$headers->addMailboxListHeader('To', ['to@symfony.com']);`
`98`	`98`	`$e = Envelope::create(new Message($headers));`
`99`		`- $this->assertEquals($from, $e->getSender());`
	`99`	`+ $this->assertEquals($return, $e->getSender());`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`public function testRecipientsFromHeaders()`