[Twig] Ensure WrappedTemplatedEmail::getReturnPath() returns a string

yoeunes · yoeunes · commit f3a763e61376 · 2025-11-04T16:36:39.000+01:00
diff --git a/src/Symfony/Bridge/Twig/Mime/WrappedTemplatedEmail.php b/src/Symfony/Bridge/Twig/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() ?? '';
     }
 
     /**
diff --git a/src/Symfony/Bridge/Twig/Tests/Mime/WrappedTemplatedEmailTest.php b/src/Symfony/Bridge/Twig/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(): void
+    {
+        $twig = $this->createMock(Environment::class);
+        $message = new TemplatedEmail();
+        $email = new WrappedTemplatedEmail($twig, $message);
+
+        $this->assertSame('', $email->getReturnPath());
+    }
+
+    public function testGetReturnPathWhenSet(): void
+    {
+        $twig = $this->createMock(Environment::class);
+        $message = (new TemplatedEmail())->returnPath('test@example.com');
+        $email = new WrappedTemplatedEmail($twig, $message);
+
+        $this->assertSame('test@example.com', $email->getReturnPath());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public function setReturnPath(string $address): static`
`92`	`92`
`93`	`93`	`public function getReturnPath(): string`
`94`	`94`	`{`
`95`		`- return $this->message->getReturnPath();`
	`95`	`+ return $this->message->getReturnPath()?->toString() ?? '';`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`/**`