Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit628f4c6

Browse files
committed
maintain sender/recipient name in SMTP envelopes
1 parent9407c6b commit628f4c6

File tree

2 files changed

+18
-7
lines changed

2 files changed

+18
-7
lines changed

‎src/Symfony/Component/Mailer/DelayedSmtpEnvelope.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function getSender(): Address
4747
returnparent::getSender();
4848
}
4949

50-
returnnewAddress(self::getSenderFromHeaders($this->message->getHeaders())->getAddress());
50+
returnself::getSenderFromHeaders($this->message->getHeaders());
5151
}
5252

5353
publicfunctionsetRecipients(array$recipients):void
@@ -75,7 +75,7 @@ private static function getRecipientsFromHeaders(Headers $headers): array
7575
foreach (['to','cc','bcc']as$name) {
7676
foreach ($headers->all($name)as$header) {
7777
foreach ($header->getAddresses()as$address) {
78-
$recipients[] =newAddress($address->getAddress());
78+
$recipients[] =$address;
7979
}
8080
}
8181
}

‎src/Symfony/Component/Mailer/Tests/SmtpEnvelopeTest.php‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,19 +56,19 @@ public function testSenderFromHeaders()
5656
$headers->addPathHeader('Return-Path',newNamedAddress('return@symfony.com','return'));
5757
$headers->addMailboxListHeader('To', ['from@symfony.com']);
5858
$e = SmtpEnvelope::create(newMessage($headers));
59-
$this->assertEquals('return@symfony.com',$e->getSender()->getAddress());
59+
$this->assertEquals(newNamedAddress('return@symfony.com','return'),$e->getSender());
6060

6161
$headers =newHeaders();
6262
$headers->addMailboxHeader('Sender',newNamedAddress('sender@symfony.com','sender'));
6363
$headers->addMailboxListHeader('To', ['from@symfony.com']);
6464
$e = SmtpEnvelope::create(newMessage($headers));
65-
$this->assertEquals('sender@symfony.com',$e->getSender()->getAddress());
65+
$this->assertEquals(newNamedAddress('sender@symfony.com','sender'),$e->getSender());
6666

6767
$headers =newHeaders();
6868
$headers->addMailboxListHeader('From', [newNamedAddress('from@symfony.com','from'),'some@symfony.com']);
6969
$headers->addMailboxListHeader('To', ['from@symfony.com']);
7070
$e = SmtpEnvelope::create(newMessage($headers));
71-
$this->assertEquals('from@symfony.com',$e->getSender()->getAddress());
71+
$this->assertEquals(newNamedAddress('from@symfony.com','from'),$e->getSender());
7272
}
7373

7474
publicfunctiontestSenderFromHeadersWithoutFrom()
@@ -77,17 +77,28 @@ public function testSenderFromHeadersWithoutFrom()
7777
$headers->addMailboxListHeader('To', ['from@symfony.com']);
7878
$e = SmtpEnvelope::create($message =newMessage($headers));
7979
$message->getHeaders()->addMailboxListHeader('From', [newNamedAddress('from@symfony.com','from')]);
80-
$this->assertEquals('from@symfony.com',$e->getSender()->getAddress());
80+
$this->assertEquals(newNamedAddress('from@symfony.com','from'),$e->getSender());
8181
}
8282

8383
publicfunctiontestRecipientsFromHeaders()
84+
{
85+
$headers =newHeaders();
86+
$headers->addPathHeader('Return-Path','return@symfony.com');
87+
$headers->addMailboxListHeader('To', [newAddress('to@symfony.com')]);
88+
$headers->addMailboxListHeader('Cc', [newAddress('cc@symfony.com')]);
89+
$headers->addMailboxListHeader('Bcc', [newAddress('bcc@symfony.com')]);
90+
$e = SmtpEnvelope::create(newMessage($headers));
91+
$this->assertEquals([newAddress('to@symfony.com'),newAddress('cc@symfony.com'),newAddress('bcc@symfony.com')],$e->getRecipients());
92+
}
93+
94+
publicfunctiontestRecipientsFromHeadersWithNames()
8495
{
8596
$headers =newHeaders();
8697
$headers->addPathHeader('Return-Path','return@symfony.com');
8798
$headers->addMailboxListHeader('To', [newNamedAddress('to@symfony.com','to')]);
8899
$headers->addMailboxListHeader('Cc', [newNamedAddress('cc@symfony.com','cc')]);
89100
$headers->addMailboxListHeader('Bcc', [newNamedAddress('bcc@symfony.com','bcc')]);
90101
$e = SmtpEnvelope::create(newMessage($headers));
91-
$this->assertEquals([newAddress('to@symfony.com'),newAddress('cc@symfony.com'),newAddress('bcc@symfony.com')],$e->getRecipients());
102+
$this->assertEquals([newNamedAddress('to@symfony.com','to'),newNamedAddress('cc@symfony.com','cc'),newNamedAddress('bcc@symfony.com','bcc')],$e->getRecipients());
92103
}
93104
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp