Merge branch '6.4' into 7.2

* 6.4: [psalm] ensureOverrideAttribute="false" [Semaphore] allow redis cluster/sentinel dsn [MIME] use address for body at PathHeader
symfony · Feb 19, 2025 · 87ca220 · 87ca220
2 parents 2fc3b4b + ac537b6
commit 87ca220
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/Header/PathHeader.php b/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/Tests/Header/HeadersTest.php b/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());
+    }
 }