bug #59796 [Mime] use address for body at PathHeader (tinect)

nicolas-grekas · nicolas-grekas · commit 757fcbb455e8 · 2025-02-19T08:48:43.000+01:00
This PR was merged into the 6.4 branch. Discussion ---------- [Mime] use address for body at `PathHeader` | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #...  | License | MIT We noticed, that ReturnPath has wrong content in EML if any library is forcing key=>value. Setting it to `mail@example.com`, results into `<"mail@example.com" <mail@example.com>>` after stringify it which is not compliant: `Email \"\"mail@example.com"<mail@example.com\" does not comply with addr-spec of RFC 2822.` Commits ------- 0d4a498 [MIME] use address for body at PathHeader
diff --git a/src/Symfony/Component/Mime/Header/PathHeader.php b/src/Symfony/Component/Mime/Header/PathHeader.php
@@ -57,6 +57,6 @@ public function getAddress(): Address
 
     public function getBodyAsString(): string
     {
-        return '<'.$this->address->toString().'>';
+        return '<'.$this->address->getEncodedAddress().'>';
     }
 }
diff --git a/src/Symfony/Component/Mime/Tests/Header/HeadersTest.php b/src/Symfony/Component/Mime/Tests/Header/HeadersTest.php
@@ -346,4 +346,12 @@ public function testSetHeaderParameterNotParameterized()
         $this->expectException(\LogicException::class);
         $headers->setHeaderParameter('Content-Disposition', 'name', 'foo');
     }
+
+    public function testPathHeaderHasNoName()
+    {
+        $headers = new Headers();
+
+        $headers->addPathHeader('Return-Path', new Address('some@path', 'any ignored name'));
+        $this->assertSame('<some@path>', $headers->get('Return-Path')->getBodyAsString());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,6 @@ public function getAddress(): Address`
`57`	`57`
`58`	`58`	`public function getBodyAsString(): string`
`59`	`59`	`{`
`60`		`- return '<'.$this->address->toString().'>';`
	`60`	`+ return '<'.$this->address->getEncodedAddress().'>';`
`61`	`61`	`}`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -346,4 +346,12 @@ public function testSetHeaderParameterNotParameterized()`
`346`	`346`	`$this->expectException(\LogicException::class);`
`347`	`347`	`$headers->setHeaderParameter('Content-Disposition', 'name', 'foo');`
`348`	`348`	`}`
	`349`	`+`
	`350`	`+ public function testPathHeaderHasNoName()`
	`351`	`+ {`
	`352`	`+ $headers = new Headers();`
	`353`	`+`
	`354`	`+ $headers->addPathHeader('Return-Path', new Address('some@path', 'any ignored name'));`
	`355`	`+ $this->assertSame('<some@path>', $headers->get('Return-Path')->getBodyAsString());`
	`356`	`+ }`
`349`	`357`	`}`