[10.x] Fix custom themes not reseting on Markdown renderer (#46200)

AEM5299 · web-flow · commit c06dfacc1bf3 · 2023-02-21T16:22:10.000+03:00
* test failing

* resets theme to default if Mailable theme is null
diff --git a/src/Illuminate/Mail/Mailable.php b/src/Illuminate/Mail/Mailable.php
@@ -324,9 +324,7 @@ protected function buildMarkdownView()
     {
         $markdown = Container::getInstance()->make(Markdown::class);
 
-        if (isset($this->theme)) {
-            $markdown->theme($this->theme);
-        }
+        $markdown->theme($this->theme ?? 'default');
 
         $data = $this->buildViewData();
 
diff --git a/tests/Mail/MailMailableTest.php b/tests/Mail/MailMailableTest.php
@@ -7,8 +7,10 @@
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Mail\Attachment;
 use Illuminate\Mail\Mailable;
+use Illuminate\Mail\Mailables\Content;
 use Illuminate\Mail\Mailables\Envelope;
 use Illuminate\Mail\Mailer;
+use Illuminate\Mail\Markdown;
 use Illuminate\Mail\Transport\ArrayTransport;
 use Mockery as m;
 use PHPUnit\Framework\AssertionFailedError;
@@ -437,6 +439,52 @@ public function testMailableSetsFromCorrectly()
         }
     }
 
+    public function testMailableSetsMarkdownThemeCorrectly()
+    {
+        $viewFactory = m::mock(Factory::class);
+        $viewFactory->shouldReceive('flushFinderCache');
+        $viewFactory->shouldReceive('replaceNamespace')->andReturnSelf();
+        $viewFactory->shouldReceive('make')->andReturnSelf();
+        $viewFactory->shouldReceive('render')->andReturn('<html></html>', 'body {}');
+        $viewFactory->shouldReceive('exists')->andReturn(true);
+
+        Container::getInstance()->instance(Factory::class, $viewFactory);
+        Container::getInstance()->singleton(Markdown::class);
+        Container::getInstance()->instance('mailer', new class
+        {
+            public function render()
+            {
+                //
+            }
+        });
+
+        (new class() extends Mailable
+        {
+            public $theme = 'custom-theme';
+
+            public function content()
+            {
+                return new Content(
+                    markdown: 'mail.markdown',
+                );
+            }
+        })->render();
+
+        $this->assertEquals('custom-theme', Container::getInstance()->make(Markdown::class)->getTheme());
+
+        (new class() extends Mailable
+        {
+            public function content()
+            {
+                return new Content(
+                    markdown: 'mail.markdown',
+                );
+            }
+        })->render();
+
+        $this->assertEquals('default', Container::getInstance()->make(Markdown::class)->getTheme());
+    }
+
     public function testMailableSetsSubjectCorrectly()
     {
         $mailable = new WelcomeMailableStub;

Original file line number	Diff line number	Diff line change
`@@ -324,9 +324,7 @@ protected function buildMarkdownView()`
`324`	`324`	`{`
`325`	`325`	`$markdown = Container::getInstance()->make(Markdown::class);`
`326`	`326`
`327`		`- if (isset($this->theme)) {`
`328`		`- $markdown->theme($this->theme);`
`329`		`- }`
	`327`	`+ $markdown->theme($this->theme ?? 'default');`
`330`	`328`
`331`	`329`	`$data = $this->buildViewData();`
`332`	`330`