Skip to content

Fix rendering empty email if view is not cached #6

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
ericyzhu merged 2 commits into from
Mar 18, 2022
+9 −7
Merged

Fix rendering empty email if view is not cached #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6869649
allow to define custom transports
vmikhav Mar 15, 2022
8c3d5ab
fix rendering empty email if view is not cached
vmikhav Mar 17, 2022
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
1 change: 0 additions & 1 deletion publish/mail.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@
],

'log' => [
'dsn' => 'log://',
'transport' => \HyperfExt\Mail\Transport\LogTransport::class,
'options' => [
'name' => 'mail.local',
Expand Down
8 changes: 4 additions & 4 deletions src/MailManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,12 @@ public function send(MailableInterface $mailable): void
*/
protected function createTransport(array $config): TransportInterface
{
if (empty($config['dsn'])) {
throw new InvalidArgumentException('The mail transport DSN must be specified.');
if (!empty($config['transport'])) {
return make($config['transport'], ['options' => $config['options'] ?? []]);
}

if ($config['dsn'] === 'log://') {
return make($config['transport'], ['options' => $config['options'] ?? []]);
if (empty($config['dsn'])) {
throw new InvalidArgumentException('The mail transport DSN must be specified.');
}

$logger = null;
Expand Down
7 changes: 5 additions & 2 deletions src/Mailable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,8 @@ protected function hasRecipient(

protected function buildView(array $data): array
{
Coroutine::create(function () use ($data, &$html, &$plain) {
$chan = new \Swoole\Coroutine\Channel(1);
Coroutine::create(function () use ($data, $chan) {
if (! empty($this->locale)) {
ApplicationContext::getContainer()->get(TranslatorInterface::class)->setLocale($this->locale);
}
Expand All @@ -511,9 +512,11 @@ protected function buildView(array $data): array
} elseif (! empty($this->textViewTemplate)) {
$plain = $this->renderView($this->textViewTemplate, $data);
}

$chan->push([$html, $plain]);
});

return [$html, $plain];
return $chan->pop();
}

/**
Expand Down