Skip to content

Commit 87ca220

Browse files
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
2 parents 2fc3b4b + ac537b6 commit 87ca220

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

Header/PathHeader.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,6 @@ public function getAddress(): Address
5757

5858
public function getBodyAsString(): string
5959
{
60-
return '<'.$this->address->toString().'>';
60+
return '<'.$this->address->getEncodedAddress().'>';
6161
}
6262
}

Tests/Header/HeadersTest.php

+8
Original file line numberDiff line numberDiff line change
@@ -346,4 +346,12 @@ public function testSetHeaderParameterNotParameterized()
346346
$this->expectException(\LogicException::class);
347347
$headers->setHeaderParameter('Content-Disposition', 'name', 'foo');
348348
}
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+
}
349357
}

0 commit comments

Comments
 (0)