8000 [Messenger] Templated email messages fails when sending async (thru messenger transport) by ronnylt · Pull Request #39458 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Messenger] Templated email messages fails when sending async (thru messenger transport) #39458

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

Closed
wants to merge 2 commits into from
Closed

[Messenger] Templated email messages fails when sending async (thru messenger transport) #39458

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
077f052
Failing test async emails with templates
ronnylt Dec 11, 2020
3c3c39f
Fix templated email sending by not cloning message
ronnylt Dec 12, 2020
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
Prev Previous commit
Fix templated email sending by not cloning message
  • Loading branch information
@ronnylt
ronnylt committed Dec 12, 2020
commit 3c3c39f441ae7eb3572be42b5e3b045ad84e3794
4 changes: 3 additions & 1 deletion .../Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/EmailController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ public function sendTemplatedEmail(MailerInterface $mailer)
$mail = (new TemplatedEmail())
->to('fabien@symfony.com')->from('fabien@symfony.com')->subject('Foo')
->addReplyTo('me@symfony.com')
->htmlTemplate('mail.html.twig');
->htmlTemplate('mail.html.twig')
->context(['foo' => 'bar'])
;

$mailer->send($mail);

Expand Down
1 change: 0 additions & 1 deletion .../Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Resources/views/mail.html.twig
View file
Open in desktop

This file was deleted.

23 changes: 22 additions & 1 deletion src/Symfony/Bundle/FrameworkBundle/Tests/Functional/MailerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,31 @@ public function testMailerAssertions()
$this->assertEmailAddressContains($email, 'Reply-To', 'me@symfony.com');
}

public function testSendingQueuedMessage()
public function testSendingTemplatedEmail()
{
$client = $this->createClient(['test_case' => 'Mailer', 'root_config' => 'config.yml', 'debug' => true]);
$client->request('GET', '/send_templated_email');
$this->assertResponseIsSuccessful();

$this->assertEmailCount(1);

$email = $this->getMailerMessage();
$this->assertEmailHasHeader($email, 'To');
$this->assertEmailHeaderSame($email, 'To', 'fabien@symfony.com');
$this->assertEmailTextBodyContains($email, 'Test foo is bar!');
}

public function testSendingQueuedTemplatedEmail()
{
$client = $this->createClient(['test_case' => 'Mailer', 'root_config' => 'config_messenger.yml', 'debug' => true]);
$client->request('GET', '/send_templated_email');
$this->assertResponseIsSuccessful();

$this->assertEmailCount(1);

$email = $this->getMailerMessage();
$this->assertEmailHasHeader($email, 'To');
$this->assertEmailHeaderSame($email, 'To', 'fabien@symfony.com');
$this->assertEmailTextBodyContains($email, 'Test foo is bar!');
}
}
2 changes: 2 additions & 0 deletions src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Mailer/bundles.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@

use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestBundle;
use Symfony\Bundle\TwigBundle\TwigBundle;

return [
new FrameworkBundle(),
new TwigBundle(),
new TestBundle(),
];
1 change: 1 addition & 0 deletions src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/templates/mail.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Test foo is {{ foo }}!
8 changes: 5 additions & 3 deletions src/Symfony/Component/Mailer/Mailer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,18 @@ public function __construct(TransportInterface $transport, MessageBusInterface $

public function send(RawMessage $message, Envelope $envelope = null): void
{
// If a bus is not available, send directly to the transport
if (null === $this->bus) {
$this->transport->send($message, $envelope);

return;
}

// Allows the transformation of a Message and the Envelope before the email is sent
if (null !== $this->dispatcher) {
$clonedMessage = clone $message;
$clonedEnvelope = null !== $envelope ? clone $envelope : Envelope::create($clonedMessage);
$event = new MessageEvent($clonedMessage, $clonedEnvelope, (string) $this->transport, true);
$envelope = null !== $envelope ? $envelope : Envelope::create($message);
$event = new MessageEvent($message, $envelope, (string) $this->transport, true);

$this->dispatcher->dispatch($event);
}

Expand Down
0