8000 [Mailer] maintain sender/recipient name in SMTP envelopes by xabbuh · Pull Request #33387 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Mailer] maintain sender/recipient name in SMTP envelopes #33387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 4, 2019
Merged

[Mailer] maintain sender/recipient name in SMTP envelopes #33387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
maintain sender/recipient name in SMTP envelopes
  • Loading branch information
@xabbuh
xabbuh committed Sep 4, 2019
commit 46ed0e84cd1824648e458b6a0b7f7c2846603f00
4 changes: 2 additions & 2 deletions src/Symfony/Component/Mailer/DelayedSmtpEnvelope.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public function getSender(): Address
return parent::getSender();
}

return new Address(self::getSenderFromHeaders($this->message->getHeaders())->getAddress());
return self::getSenderFromHeaders($this->message->getHeaders());
}

public function setRecipients(array $recipients): void
Expand Down Expand Up @@ -75,7 +75,7 @@ private static function getRecipientsFromHeaders(Headers $headers): array
foreach (['to', 'cc', 'bcc'] as $name) {
foreach ($headers->all($name) as $header) {
foreach ($header->getAddresses() as $address) {
$recipients[] = new Address($address->getAddress());
$recipients[] = $address;
}
}
}
Expand Down
21 changes: 16 additions & 5 deletions src/Symfony/Component/Mailer/Tests/SmtpEnvelopeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,19 +56,19 @@ public function testSenderFromHeaders()
$headers->addPathHeader('Return-Path', new NamedAddress('return@symfony.com', 'return'));
$headers->addMailboxListHeader('To', ['from@symfony.com']);
$e = SmtpEnvelope::create(new Message($headers));
$this->assertEquals('return@symfony.com', $e->getSender()->getAddress());
$this->assertEquals(new NamedAddress('return@symfony.com', 'return'), $e->getSender());

$headers = new Headers();
$headers->addMailboxHeader('Sender', new NamedAddress('sender@symfony.com', 'sender'));
$headers->addMailboxListHeader('To', ['from 8000 @symfony.com']);
$e = SmtpEnvelope::create(new Message($headers));
$this->assertEquals('sender@symfony.com', $e->getSender()->getAddress());
$this->assertEquals(new NamedAddress('sender@symfony.com', 'sender'), $e->getSender());

$headers = new Headers();
$headers->addMailboxListHeader('From', [new NamedAddress('from@symfony.com', 'from'), 'some@symfony.com']);
$headers->addMailboxListHeader('To', ['from@symfony.com']);
$e = SmtpEnvelope::create(new Message($headers));
$this->assertEquals('from@symfony.com', $e->getSender()->getAddress());
$this->assertEquals(new NamedAddress('from@symfony.com', 'from'), $e->getSender());
}

public function testSenderFromHeadersWithoutFrom()
Expand All @@ -77,17 +77,28 @@ public function testSenderFromHeadersWithoutFrom()
$headers->addMailboxListHeader('To', ['from@symfony.com']);
$e = SmtpEnvelope::create($message = new Message($headers));
$message->getHeaders()->addMailboxListHeader('From', [new NamedAddress('from@symfony.com', 'from')]);
$this->assertEquals('from@symfony.com', $e->getSender()->getAddress());
$this->assertEquals(new NamedAddress('from@symfony.com', 'from'), $e->getSender());
}

public function testRecipientsFromHeaders()
{
$headers = new Headers();
$headers->addPathHeader('Return-Path', 'return@symfony.com');
$headers->addMailboxListHeader('To', [new Address('to@symfony.com')]);
$headers->addMailboxListHeader('Cc', [new Address('cc@symfony.com')]);
$headers->addMailboxListHeader('Bcc', [new Address('bcc@symfony.com')]);
$e = SmtpEnvelope::create(new Message($headers));
$this->assertEquals([new Address('to@symfony.com'), new Address('cc@symfony.com'), new Address('bcc@symfony.com')], $e->getRecipients());
}

public function testRecipientsFromHeadersWithNames()
{
$headers = new Headers();
$headers->addPathHeader('Return-Path', 'return@symfony.com');
$headers->addMailboxListHeader('To', [new NamedAddress('to@symfony.com', 'to')]);
$headers->addMailboxListHeader('Cc', [new NamedAddress('cc@symfony.com', 'cc')]);
$headers->addMailboxListHeader('Bcc', [new NamedAddress('bcc@symfony.com', 'bcc')]);
$e = SmtpEnvelope::create(new Message($headers));
$this->assertEquals([new Address('to@symfony.com'), new Address('cc@symfony.com'), new Address('bcc@symfony.com')], $e->getRecipients());
$this->assertEquals([new NamedAddress('to@symfony.com', 'to'), new NamedAddress('cc@symfony.com', 'cc'), new NamedAddress('bcc@symfony.com', 'bcc')], $e->getRecipients());
}
}
8 changes: 4 additions & 4 deletions src/Symfony/Component/Mailer/Transport/Smtp/SmtpTransport.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,9 @@ public function executeCommand(string $command, array $codes): string
protected function doSend(SentMessage $message): void
{
$envelope = $message->getEnvelope();
$this->doMailFromCommand($envelope->getSender()->toString());
$this->doMailFromCommand($envelope->getSender()->getAddress());
foreach ($envelope->getRecipients() as $recipient) {
$this->doRcptToCommand($recipient->toString());
$this->doRcptToCommand($recipient->getAddress());
}

$this->executeCommand("DATA\r\n", [354]);
Expand All @@ -170,12 +170,12 @@ protected function doHeloCommand(): void
$this->executeCommand(sprintf("HELO %s\r\n", $this->domain), [250]);
}

private function doMailFromCommand($address): void
private function doMailFromCommand(string $address): void
{
$this->executeCommand(sprintf("MAIL FROM:<%s>\r\n", $address), [250]);
}

private function doRcptToCommand($address): void
private function doRcptToCommand(string $address): void
{
$this->executeCommand(sprintf("RCPT TO:<%s>\r\n", $address), [250, 251, 252]);
}
Expand Down
0