laravel · taylorotwell · Mar 24, 2025 · Mar 23, 2025 · Mar 24, 2025 · Mar 24, 2025
diff --git a/src/Illuminate/Mail/Markdown.php b/src/Illuminate/Mail/Markdown.php
@@ -69,9 +69,25 @@ public function render($view, array $data = [], $inliner = null)
         $contents = $bladeCompiler->usingEchoFormat(
             'new \Illuminate\Support\EncodedHtmlString(%s)',
             function () use ($view, $data) {
-                return $this->view->replaceNamespace(
-                    'mail', $this->htmlComponentPaths()
-                )->make($view, $data)->render();
+                EncodedHtmlString::encodeUsing(function ($value) {
+                    $replacements = [
+                        '[' => '\[',
+                        '<' => '&lt;',
+                        '>' => '&gt;',
+                    ];
+
+                    return str_replace(array_keys($replacements), array_values($replacements), $value);
+                });
+
+                try {
+                    $contents = $this->view->replaceNamespace(
+                        'mail', $this->htmlComponentPaths()
+                    )->make($view, $data)->render();
+                } finally {
+                    EncodedHtmlString::flushState();
+                }
+
+                return $contents;
             }
         );
 
@@ -84,7 +100,7 @@ function () use ($view, $data) {
         }
 
         return new HtmlString(($inliner ?: new CssToInlineStyles)->convert(
-            $contents, $this->view->make($theme, $data)->render()
+            str_replace('\[', '[', $contents), $this->view->make($theme, $data)->render()
         ));
     }
 
@@ -112,10 +128,15 @@ public function renderText($view, array $data = [])
      * Parse the given Markdown text into HTML.
      *
      * @param  string  $text
+     * @param  bool  $encoded
      * @return \Illuminate\Support\HtmlString
      */
-    public static function parse($text)
+    public static function parse($text, bool $encoded = false)
     {
+        if ($encoded === false) {
+            return new HtmlString(static::converter()->convert($text)->getContent());
+        }
+
         EncodedHtmlString::encodeUsing(function ($value) {
             $replacements = [
                 '[' => '\[',

diff --git a/src/Illuminate/Mail/resources/views/html/button.blade.php b/src/Illuminate/Mail/resources/views/html/button.blade.php
@@ -12,7 +12,7 @@
 <table border="0" cellpadding="0" cellspacing="0" role="presentation">
 <tr>
 <td>
-<a href="{{ $url }}" class="button button-{{ $color }}" target="_blank" rel="noopener">{{ $slot }}</a>
+<a href="{{ $url }}" class="button button-{{ $color }}" target="_blank" rel="noopener">{!! $slot !!}</a>
 </td>
 </tr>
 </table>

diff --git a/src/Illuminate/Mail/resources/views/html/header.blade.php b/src/Illuminate/Mail/resources/views/html/header.blade.php
@@ -5,7 +5,7 @@
 @if (trim($slot) === 'Laravel')
 <img src="https://laravel.com/img/notification-logo.png" class="logo" alt="Laravel Logo">
 @else
-{{ $slot }}
+{!! $slot !!}
 @endif
 </a>
 </td>

diff --git a/src/Illuminate/Mail/resources/views/html/layout.blade.php b/src/Illuminate/Mail/resources/views/html/layout.blade.php
@@ -23,15 +23,15 @@
 }
 }
 </style>
-{{ $head ?? '' }}
+{!! $head ?? '' !!}
 </head>
 <body>
 
 <table class="wrapper" width="100%" cellpadding="0" cellspacing="0" role="presentation">
 <tr>
 <td align="center">
 <table class="content" width="100%" cellpadding="0" cellspacing="0" role="presentation">
-{{ $header ?? '' }}
+{!! $header ?? '' !!}
 
 <!-- Email Body -->
 <tr>
@@ -40,16 +40,16 @@
 <!-- Body content -->
 <tr>
 <td class="content-cell">
-{{ Illuminate\Mail\Markdown::parse($slot) }}
+{!! Illuminate\Mail\Markdown::parse($slot) !!}
 
-{{ $subcopy ?? '' }}
+{!! $subcopy ?? '' !!}
 </td>
 </tr>
 </table>
 </td>
 </tr>
 
-{{ $footer ?? '' }}
+{!! $footer ?? '' !!}
 </table>
 </td>
 </tr>

diff --git a/src/Illuminate/Mail/resources/views/html/message.blade.php b/src/Illuminate/Mail/resources/views/html/message.blade.php
@@ -7,13 +7,13 @@
 </x-slot:header>
 
 {{-- Body --}}
-{{ $slot }}
+{!! $slot !!}
 
 {{-- Subcopy --}}
 @isset($subcopy)
 <x-slot:subcopy>
 <x-mail::subcopy>
-{{ $subcopy }}
+{!! $subcopy !!}}
 </x-mail::subcopy>
 </x-slot:subcopy>
 @endisset

diff --git a/src/Illuminate/Mail/resources/views/html/panel.blade.php b/src/Illuminate/Mail/resources/views/html/panel.blade.php
@@ -4,7 +4,7 @@
 <table width="100%" cellpadding="0" cellspacing="0" role="presentation">
 <tr>
 <td class="panel-item">
-{{ Illuminate\Mail\Markdown::parse($slot) }}
+{!! Illuminate\Mail\Markdown::parse($slot) !!}
 </td>
 </tr>
 </table>

diff --git a/tests/Integration/Mail/Fixtures/message-with-template.blade.php b/tests/Integration/Mail/Fixtures/message-with-template.blade.php
@@ -0,0 +1,4 @@
+@component('mail::message')
+*Hi* {{ $user->name }}
+
+@endcomponent
diff --git a/tests/Integration/Mail/MailableTest.php b/tests/Integration/Mail/MailableTest.php
@@ -2,14 +2,20 @@
 
 namespace Illuminate\Tests\Integration\Mail;
 
+use Illuminate\Foundation\Auth\User;
+use Illuminate\Foundation\Testing\LazilyRefreshDatabase;
 use Illuminate\Mail\Mailable;
 use Illuminate\Mail\Mailables\Content;
 use Illuminate\Mail\Mailables\Envelope;
+use Orchestra\Testbench\Attributes\WithMigration;
+use Orchestra\Testbench\Factories\UserFactory;
 use Orchestra\Testbench\TestCase;
 use PHPUnit\Framework\Attributes\DataProvider;
 
 class MailableTest extends TestCase
 {
+    use LazilyRefreshDatabase;
+
     /** {@inheritdoc} */
     #[\Override]
     protected function defineEnvironment($app)
@@ -69,4 +75,55 @@ public static function markdownEncodedDataProvider()
             'My message is: Visit &lt;span&gt;https://laravel.com/docs&lt;/span&gt; to browse the documentation',
         ];
     }
+
+    #[WithMigration]
+    #[DataProvider('markdownEncodedTemplateDataProvider')]
+    public function testItCanAssertMarkdownEncodedStringUsingTemplate($given, $expected)
+    {
+        $user = UserFactory::new()->create([
+            'name' => $given,
+        ]);
+
+        $mailable = new class($user) extends Mailable
+        {
+            public $theme = 'taylor';
+
+            public function __construct(public User $user)
+            {
+                //
+            }
+
+            public function build()
+            {
+                return $this->markdown('message-with-template');
+            }
+        };
+
+        $mailable->assertSeeInHtml($expected, false);
+    }
+
+    public static function markdownEncodedTemplateDataProvider()
+    {
+        yield ['[Laravel](https://laravel.com)', '<em>Hi</em> [Laravel](https://laravel.com)'];
+
+        yield [
+            '![Welcome to Laravel](https://laravel.com/assets/img/welcome/background.svg)',
+            '<em>Hi</em> ![Welcome to Laravel](https://laravel.com/assets/img/welcome/background.svg)',
+        ];
+
+        yield [
+            'Visit https://laravel.com/docs to browse the documentation',
+            '<em>Hi</em> Visit https://laravel.com/docs to browse the documentation',
+        ];
+
+        yield [
+            'Visit <https://laravel.com/docs> to browse the documentation',
+            '<em>Hi</em> Visit &lt;https://laravel.com/docs&gt; to browse the documentation',
+        ];
+
+        yield [
+            'Visit <span>https://laravel.com/docs</span> to browse the documentation',
+            '<em>Hi</em> Visit &lt;span&gt;https://laravel.com/docs&lt;/span&gt; to browse the documentation',
+        ];
+    }
 }
diff --git a/tests/Integration/Mail/MarkdownParserTest.php b/tests/Integration/Mail/MarkdownParserTest.php
@@ -24,7 +24,7 @@ public function testItCanParseMarkdownString($given, $expected)
     #[DataProvider('markdownEncodedDataProvider')]
     public function testItCanParseMarkdownEncodedString($given, $expected)
     {
-        tap(Markdown::parse($given), function ($html) use ($expected) {
+        tap(Markdown::parse($given, encoded: true), function ($html) use ($expected) {
             $this->assertInstanceOf(HtmlString::class, $html);
 
             $this->assertStringEqualsStringIgnoringLineEndings($expected.PHP_EOL, (string) $html);