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

taylorotwell · web-flow · commit d10c6dfcdef4 · 2023-03-02T08:22:11.000-06:00
This reverts commit c06dfac.
diff --git a/src/Illuminate/Mail/Mailable.php b/src/Illuminate/Mail/Mailable.php
@@ -324,7 +324,9 @@ protected function buildMarkdownView()
     {
         $markdown = Container::getInstance()->make(Markdown::class);
 
-        $markdown->theme($this->theme ?? 'default');
+        if (isset($this->theme)) {
+            $markdown->theme($this->theme);
+        }
 
         $data = $this->buildViewData();
 
diff --git a/tests/Mail/MailMailableTest.php b/tests/Mail/MailMailableTest.php
@@ -7,10 +7,8 @@
 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;
@@ -439,52 +437,6 @@ 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,7 +324,9 @@ protected function buildMarkdownView()`
`324`	`324`	`{`
`325`	`325`	`$markdown = Container::getInstance()->make(Markdown::class);`
`326`	`326`
`327`		`- $markdown->theme($this->theme ?? 'default');`
	`327`	`+ if (isset($this->theme)) {`
	`328`	`+ $markdown->theme($this->theme);`
	`329`	`+ }`
`328`	`330`
`329`	`331`	`$data = $this->buildViewData();`
`330`	`332`