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

Author: tpetry

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.');
     }

Tests/EnvelopeTest.php

@@ -84,19 +84,19 @@ public function testSenderFromHeadersWithoutFrom()
     public function testSenderFromHeadersWithMulitpleHeaders()
     {
         $headers = new Headers();
-        $headers->addMailboxListHeader('From', [$from = new Address('[email protected]', 'from'), '[email protected]']);
-        $headers->addPathHeader('Return-Path', $return = new Address('[email protected]', 'return'));
+        $headers->addMailboxListHeader('From', [new Address('[email protected]', 'from'), '[email protected]']);
+        $headers->addPathHeader('Return-Path', new Address('[email protected]', 'return'));
         $headers->addMailboxHeader('Sender', $sender = new Address('[email protected]', 'sender'));
         $headers->addMailboxListHeader('To', ['[email protected]']);
         $e = Envelope::create(new Message($headers));
         $this->assertEquals($sender, $e->getSender());
 
         $headers = new Headers();
-        $headers->addMailboxListHeader('From', [$from = new Address('[email protected]', 'from'), '[email protected]']);
+        $headers->addMailboxListHeader('From', [new Address('[email protected]', 'from'), '[email protected]']);
         $headers->addPathHeader('Return-Path', $return = new Address('[email protected]', 'return'));
         $headers->addMailboxListHeader('To', ['[email protected]']);
         $e = Envelope::create(new Message($headers));
-        $this->assertEquals($from, $e->getSender());
+        $this->assertEquals($return, $e->getSender());
     }
 
     public function testRecipientsFromHeaders()