Skip to content

Fix gen:mail --markdown type error and accept HtmlString content in Mailer #4

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
huangdijia merged 2 commits into from
Sep 12, 2026
Merged

Fix gen:mail --markdown type error and accept HtmlString content in Mailer #4

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
1ff2887
Initial plan
Copilot Sep 11, 2026
a74e754
Fix markdown generation and HtmlString mail rendering
Copilot Sep 11, 2026
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
6 changes: 3 additions & 3 deletions src/Command/MailCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public function __construct(

protected function getStub(): string
{
return $this->getConfig()['stub'] ?? ($this->input->getOption('markdown') !== false ? __DIR__ . '/stubs/mail.stub' : __DIR__ . '/stubs/markdown-mail.stub');
return $this->getConfig()['stub'] ?? ($this->input->getOption('markdown') ? __DIR__ . '/stubs/markdown-mail.stub' : __DIR__ . '/stubs/mail.stub');
}

protected function getDefaultNamespace(): string
Expand Down Expand Up @@ -81,7 +81,7 @@ protected function getView(): string
{
$view = $this->input->getOption('markdown');

if (! $view) {
if (! is_string($view) || $view === '') {
$name = str_replace('\\', '/', $this->input->getArgument('name'));

$view = 'mail.' . collect(explode('/', $name))
Expand All @@ -103,7 +103,7 @@ protected function buildClass(string $name): string
parent::buildClass($name)
);

if ($this->input->getOption('markdown') !== false) {
if ($this->input->getOption('markdown')) {
$class = str_replace(['DummyView', '{{ view }}'], $this->getView(), $class);
}

Expand Down
8 changes: 4 additions & 4 deletions src/Mailer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,9 +285,9 @@ protected function sendMailable(MailableContract $mailable): ?SentMessage
/**
* Parse the given view name or array.
*/
protected function parseView(null|Closure|array|string $view): array
protected function parseView(null|Closure|Htmlable|HtmlString|array|string $view): array
{
if (is_string($view) || $view instanceof Closure) {
if (is_string($view) || $view instanceof Closure || $view instanceof Htmlable || $view instanceof HtmlString) {
return [$view, null, null];
}

Expand Down Expand Up @@ -315,7 +315,7 @@ protected function parseView(null|Closure|array|string $view): array
/**
* Add the content to a given message.
*/
protected function addContent(Message $message, null|Closure|string $view, null|Closure|string $plain, ?string $raw, array $data = []): void
protected function addContent(Message $message, null|Closure|Htmlable|HtmlString|string $view, null|Closure|Htmlable|HtmlString|string $plain, ?string $raw, array $data = []): void
{
if (isset($view)) {
$message->html($this->renderView($view, $data) ?: ' ');
Expand All @@ -333,7 +333,7 @@ protected function addContent(Message $message, null|Closure|string $view, null|
/**
* Render the given view.
*/
protected function renderView(Closure|string $view, array $data): string
protected function renderView(Closure|Htmlable|HtmlString|string $view, array $data): string
{
$view = value($view, $data);
if ($view instanceof Htmlable) {
Expand Down