Commit7dd5c60

committed

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

1 parent69f7f6e commit7dd5c60Copy full SHA for 7dd5c60

File tree

-4

lines changed

-4

lines changed

Lines changed: 3 additions & 3 deletions

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`	`thrownewLogicException('Unable to determine the sender of the message.');`
`97`	`97`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public function testSenderFromHeadersWithMulitpleHeaders()`
`96`	`96`	`$headers->addPathHeader('Return-Path',$return =newAddress('return@symfony.com','return'));`
`97`	`97`	`$headers->addMailboxListHeader('To', ['to@symfony.com']);`
`98`	`98`	`$e = Envelope::create(newMessage($headers));`
`99`		`-$this->assertEquals($from,$e->getSender());`
	`99`	`+$this->assertEquals($return,$e->getSender());`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`publicfunctiontestRecipientsFromHeaders()`

Comments

(0)