Merge branch '7.4' into 8.0

* 7.4: (21 commits)
  [ObjectMapper] lazy loading
  [Filesystem] Unify logic for isAbsolute() in Path
  [DependencyInjection] Include return type in AppReference shape
  [Finder] Make method calls explicit in ExcludeDirectoryFilterIterator
  [Cache] Remove unset call on undefined variable in PhpArrayAdapter
  [Twig] Ensure WrappedTemplatedEmail::getReturnPath() returns a string
  [Routing] Simplify importing routes defined on controller services
  Fix tests
  [DependendcyInjection] Improve shape for "from_callable" definitions
  [PHPDoc] Fix various PHPDoc syntax errors
  [Console] Add missing VERBOSITY_SILENT case in CommandDataCollector
  [Notifier] Remove unused $transportName argument in EmailChannel::notify()
  [Translation] Remove an unused argument passed to parseNode() method
  [HttpClient] Reject 3xx pushed responses
  [Serializer] Use Asia/Tokyo instead of Japan in tests
  [ProxyManagerBridge] Remove comment that reference github discussion
  [JsonPath] Remove unused "nothing" property from JsonCrawler
  [ErrorHandler] Improve PHPDoc precision in SerializerErrorRenderer
  [Routing] Fix matching the "0" URL
  [Form] Fix EnumType choice_label logic for grouped choices
  ...

Author: nicolas-grekas

Mime/WrappedTemplatedEmail.php

@@ -92,7 +92,7 @@ public function setReturnPath(string $address): static
 
     public function getReturnPath(): string
     {
-        return $this->message->getReturnPath();
+        return $this->message->getReturnPath()?->toString() ?? '';
     }
 
     /**

Tests/Mime/WrappedTemplatedEmailTest.php

@@ -14,6 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\Twig\Mime\BodyRenderer;
 use Symfony\Bridge\Twig\Mime\TemplatedEmail;
+use Symfony\Bridge\Twig\Mime\WrappedTemplatedEmail;
 use Twig\Environment;
 use Twig\Loader\FilesystemLoader;
 
@@ -99,4 +100,22 @@ private function buildEmail(string $template): TemplatedEmail
 
         return $email;
     }
+
+    public function testGetReturnPathWhenNull()
+    {
+        $twig = $this->createMock(Environment::class);
+        $message = new TemplatedEmail();
+        $email = new WrappedTemplatedEmail($twig, $message);
+
+        $this->assertSame('', $email->getReturnPath());
+    }
+
+    public function testGetReturnPathWhenSet()
+    {
+        $twig = $this->createMock(Environment::class);
+        $message = (new TemplatedEmail())->returnPath('[email protected]');
+        $email = new WrappedTemplatedEmail($twig, $message);
+
+        $this->assertSame('[email protected]', $email->getReturnPath());
+    }
 }