fixed bug with return-path

peteruu · web-flow · commit af005e807778 · 2022-02-24T13:25:54.000+01:00
mailer info was ignoring return-path setting more info here symfony#41322
diff --git a/src/Symfony/Component/Mailer/DelayedEnvelope.php b/src/Symfony/Component/Mailer/DelayedEnvelope.php
@@ -83,15 +83,15 @@ private static function getRecipientsFromHeaders(Headers $headers): array
 
     private static function getSenderFromHeaders(Headers $headers): Address
     {
+        if ($return = $headers->get('Return-Path')) {
+            return $return->getAddress();
+        }
         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();
-        }
 
         throw new LogicException('Unable to determine the sender of the message.');
     }

Original file line number	Diff line number	Diff line change
`@@ -83,15 +83,15 @@ private static function getRecipientsFromHeaders(Headers $headers): array`
`83`	`83`
`84`	`84`	`private static function getSenderFromHeaders(Headers $headers): Address`
`85`	`85`	`{`
	`86`	`+ if ($return = $headers->get('Return-Path')) {`
	`87`	`+ return $return->getAddress();`
	`88`	`+ }`
`86`	`89`	`if ($sender = $headers->get('Sender')) {`
`87`	`90`	`return $sender->getAddress();`
`88`	`91`	`}`
`89`	`92`	`if ($from = $headers->get('From')) {`
`90`	`93`	`return $from->getAddresses()[0];`
`91`	`94`	`}`
`92`		`- if ($return = $headers->get('Return-Path')) {`
`93`		`- return $return->getAddress();`
`94`		`- }`
`95`	`95`
`96`	`96`	`throw new LogicException('Unable to determine the sender of the message.');`
`97`	`97`	`}`