Merge branch '6.0' into 6.1

* 6.0: (22 commits)
  Add missing license header
  Add missing license header
  [Workflow] Catch error when trying to get an uninitialized marking
  Add missing license header
  Allow usage of Provider domains if possible
  Use reference date in reverse transform Fixes #40997
  Fix env resolution in lock configuration
  Fix Symfony not working on SMB share #45990
  [Messenger] DoctrineTransportFactory works with notify and decorated PostgreSQL driver
  [Cache] make LockRegistry use static properties instead of static variables
  fix: return-path has higher priority for envelope address than from address (fixes #41322)
  [HttpClient] Fix sending content-length when streaming the body
  [Console] Header with column max width is now well wrap with separator
  Fix use_cookies framework session configuration
  [FrameworkBundle] [Command] Fix `debug:router --no-interaction` error …
  [Intl] Update the ICU data to 71.1 - 5.4
  [Intl] Update the ICU data to 71.1 - 4.4
  Add tests to messenger connection get for OraclePlatform
  [RateLimiter] Adding default empty value
  [DependencyInjection] Add TaggedIteratorArgument unit tests
  ...

Author: nicolas-grekas

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

@@ -101,19 +101,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()

Tests/Transport/NativeTransportFactoryTest.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Mailer\Tests\Transport;
 
 use PHPUnit\Framework\TestCase;

Tests/Transport/Smtp/EsmtpTransportFactoryTest.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Mailer\Tests\Transport\Smtp;
 
 use Symfony\Component\Mailer\Test\TransportFactoryTestCase;