symfony
diff --git a/‎src/Symfony/Component/Mailer/DelayedEnvelope.php
Lines changed: 3 additions & 3 deletions b/‎src/Symfony/Component/Mailer/DelayedEnvelope.php
Lines changed: 3 additions & 3 deletions
diff --git a/‎src/Symfony/Component/Mailer/Tests/EnvelopeTest.php
Lines changed: 4 additions & 4 deletions b/‎src/Symfony/Component/Mailer/Tests/EnvelopeTest.php
Lines changed: 4 additions & 4 deletions
@@ -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.');
     }
 
@@ -84,19 +84,19 @@ public function testSenderFromHeadersWithoutFrom()
     public function testSenderFromHeadersWithMulitpleHeaders()
     {
         $headers = new Headers();
-        $headers->addMailboxListHeader('From', [$from = new Address('from@symfony.com', 'from'), 'some@symfony.com']);
-        $headers->addPathHeader('Return-Path', $return = new Address('return@symfony.com', 'return'));
+        $headers->addMailboxListHeader('From', [new Address('from@symfony.com', 'from'), 'some@symfony.com']);
+        $headers->addPathHeader('Return-Path', new Address('return@symfony.com', 'return'));
         $headers->addMailboxHeader('Sender', $sender = new Address('sender@symfony.com', 'sender'));
         $headers->addMailboxListHeader('To', ['to@symfony.com']);
         $e = Envelope::create(new Message($headers));
         $this->assertEquals($sender, $e->getSender());
 
         $headers = new Headers();
-        $headers->addMailboxListHeader('From', [$from = new Address('from@symfony.com', 'from'), 'some@symfony.com']);
+        $headers->addMailboxListHeader('From', [new Address('from@symfony.com', 'from'), 'some@symfony.com']);
         $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`	`}`