8000 [Mime] Keep Sender full address when used by non-SMTP transports by fabpot · Pull Request #37580 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Mime] Keep Sender full address when used by non-SMTP transports #37580

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
Jul 15, 2020
Merged

[Mime] Keep Sender full address when used by non-SMTP transports #37580

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
[Mime] Keep Sender full address when used by non-SMTP transports
  • Loading branch information
@fabpot
fabpot committed Jul 15, 2020
commit 1ca9be77aadc953da08a01f201981aa8c71ff6b3
6 changes: 5 additions & 1 deletion src/Symfony/Component/Mailer/Envelope.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,13 @@ public static function create(RawMessage $message): self

public function setSender(Address $sender): void
{
$this->sender = new Address($sender->getAddress());
$this->sender = $sender;
}

/**
* @return Address Returns a "mailbox" as specified by RFC 2822
* Must be converted to an "addr-spec" when used as a "MAIL FROM" value in SMTP (use getAddress())
*/
public function getSender(): Address
{
return $this->sender;
Expand Down
28 changes: 14 additions & 14 deletions src/Symfony/Component/Mailer/Tests/EnvelopeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ public function testConstructorWithAddressSender()

public function testConstructorWithNamedAddressSender()
{
$e = new Envelope(new Address('fabien@symfony.com', 'Fabien'), [new Address('thomas@symfony.com')]);
$this->assertEquals(new Address('fabien@symfony.com'), $e->getSender());
$e = new Envelope($sender = new Address('fabien@symfony.com', 'Fabien'), [new Address('thomas@symfony.com')]);
$this->assertEquals($sender, $e->getSender());
}

public function testConstructorWithAddressRecipients()
Expand All @@ -54,31 +54,31 @@ public function testConstructorWithWrongRecipients()
public function testSenderFromHeaders()
{
$headers = new Headers();
$headers->addPathHeader('Return-Path', new Address('return@symfony.com', 'return'));
$headers->addMailboxListHeader('To', ['from@symfony.com']);
$headers->addPathHeader('Return-Path', $return = new Address('return@symfony.com', 'return'));
$headers->addMailboxListHeader('To', ['to@symfony.com']);
$e = Envelope::create(new Message($headers));
$this->assertEquals(new Address('return@symfony.com', 'return'), $e->getSender());
$this->assertEquals($return, $e->getSender());

$headers = new Headers();
$headers->addMailboxHeader('Sender', new Address('sender@symfony.com', 'sender'));
$headers->addMailboxListHeader('To', ['from@symfony.com']);
$headers->addMailboxHeader('Sender', $sender = new Address('sender@symfony.com', 'sender'));
$headers->addMailboxListHeader('To', ['to@symfony.com']);
$e = Envelope::create(new Message($headers));
$this->assertEquals(new Address('sender@symfony.com', 'sender'), $e->ge 80E3 tSender());
$this->assertEquals($sender, $e->getSender());

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

public function testSenderFromHeadersWithoutFrom()
{
$headers = new Headers();
$headers->addMailboxListHeader('To', ['from@symfony.com']);
$headers->addMailboxListHeader('To', ['to@symfony.com']);
$e = Envelope::create($message = new Message($headers));
$message->getHeaders()->addMailboxListHeader('From', [new Address('from@symfony.com', 'from')]);
$this->assertEquals(new Address('from@symfony.com', 'from'), $e->getSender());
$message->getHeaders()->addMailboxListHeader('From', [$from = new Address('from@symfony.com', 'from')]);
$this->assertEquals($from, $e->getSender());
}

public function testRecipientsFromHeaders()
Expand Down
0