wip

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
laravel · taylorotwell · Mar 24, 2025 · Mar 23, 2025 · Mar 24, 2025 · Mar 24, 2025
commit a6e26ef6f4a968e3926af580a15cdb564a257587
diff --git a/src/Illuminate/Mail/Markdown.php b/src/Illuminate/Mail/Markdown.php
@@ -69,9 +69,27 @@ 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;',
+                    ];
+
+                    $html = str_replace(array_keys($replacements), array_values($replacements), $value);
+
+                    return $html;
+                });
+
+                try {
+                    $contents = $this->view->replaceNamespace(
+                        'mail', $this->htmlComponentPaths()
+                    )->make($view, $data)->render();
+                } finally {
+                    EncodedHtmlString::flushState();
+                }
+
+                return $contents;
             }
         );
 
@@ -84,7 +102,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()
         ));
     }
 

diff --git a/src/Illuminate/Mail/resources/views/html/footer.blade.php b/src/Illuminate/Mail/resources/views/html/footer.blade.php
@@ -3,7 +3,7 @@
 <table class="footer" align="center" width="570" cellpadding="0" cellspacing="0" role="presentation">
 <tr>
 <td class="content-cell" align="center">
-{{ Illuminate\Mail\Markdown::parse($slot) }}
+{!! Illuminate\Mail\Markdown::parse($slot) !!}
 </td>
 </tr>
 </table>

diff --git a/src/Illuminate/Mail/resources/views/html/layout.blade.php b/src/Illuminate/Mail/resources/views/html/layout.blade.php
@@ -23,7 +23,7 @@
 }
 }
 </style>
-{{ $head ?? '' }}
+{!! $head ?? '' !!}
 </head>
 <body>
 
@@ -40,7 +40,7 @@
 <!-- Body content -->
 <tr>
 <td class="content-cell">
-{{ Illuminate\Mail\Markdown::parse($slot) }}
+{!! Illuminate\Mail\Markdown::parse($slot) !!}
 
 {!! $subcopy ?? '' !!}
 </td>

diff --git a/src/Illuminate/Mail/resources/views/html/message.blade.php b/src/Illuminate/Mail/resources/views/html/message.blade.php
@@ -13,7 +13,7 @@
 @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/subcopy.blade.php b/src/Illuminate/Mail/resources/views/html/subcopy.blade.php
@@ -1,7 +1,7 @@
 <table class="subcopy" width="100%" cellpadding="0" cellspacing="0" role="presentation">
 <tr>
 <td>
-{{ Illuminate\Mail\Markdown::parse($slot) }}
+{!! Illuminate\Mail\Markdown::parse($slot) !!}
 </td>
 </tr>
 </table>
diff --git a/src/Illuminate/Mail/resources/views/html/table.blade.php b/src/Illuminate/Mail/resources/views/html/table.blade.php
@@ -1,3 +1,3 @@
 <div class="table">
-{{ Illuminate\Mail\Markdown::parse($slot) }}
+{!! Illuminate\Mail\Markdown::parse($slot) !!}
 </div>
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 function __construct(public User $user)
+            {
+                //
+            }
+
+            public function build()
+            {
+                return $this->markdown('message-with-template');
+            }
+        };
+
+        $mailable->assertSeeInHtml($expected, false);
+    }
+
+    public static function markdownEncodedTemplateDataProvider()
+    {
+        $hi = '<em style="box-sizing: border-box; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Helvetica, Arial, sans-serif, \'Apple Color Emoji\', \'Segoe UI Emoji\', \'Segoe UI Symbol\'; position: relative;">Hi</em>';
+
+        yield ['[Laravel](https://laravel.com)', "{$hi} [Laravel](https://laravel.com)"];
+
+        yield [
+            '![Welcome to Laravel](https://laravel.com/assets/img/welcome/background.svg)',
+            "{$hi} ![Welcome to Laravel](https://laravel.com/assets/img/welcome/background.svg)",
+        ];
+
+        yield [
+            'Visit https://laravel.com/docs to browse the documentation',
+            "{$hi} Visit https://laravel.com/docs to browse the documentation",
+        ];
+
+        yield [
+            'Visit <https://laravel.com/docs> to browse the documentation',
+            "{$hi} Visit &lt;https://laravel.com/docs&gt; to browse the documentation",
+        ];
+
+        yield [
+            'Visit <span>https://laravel.com/docs</span> to browse the documentation',
+            "{$hi} Visit &lt;span&gt;https://laravel.com/docs&lt;/span&gt; to browse the documentation",
+        ];
+    }
 }