check for view existence first

laravel · Sep 17, 2020 · 5f78c90 · 5f78c90 · sheldonkotyk · Jan 13, 2021
1 parent 58dc491
commit 5f78c90
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/Illuminate/Mail/Markdown.php b/src/Illuminate/Mail/Markdown.php
@@ -63,9 +63,13 @@ public function render($view, array $data = [], $inliner = null)
             'mail', $this->htmlComponentPaths()
         )->make($view, $data)->render();
 
-        $theme = Str::contains($this->theme, '::')
-            ? $this->theme
-            : 'mail::themes.'.$this->theme;
+        if ($this->view->exists($this->theme)) {
+            $theme = $this->theme;
+        } else {
+            $theme = Str::contains($this->theme, '::')
+                ? $this->theme
+                : 'mail::themes.'.$this->theme;
+        }
 
         return new HtmlString(($inliner ?: new CssToInlineStyles)->convert(
             $contents, $this->view->make($theme, $data)->render()

diff --git a/tests/Mail/MailMarkdownTest.php b/tests/Mail/MailMarkdownTest.php
@@ -20,6 +20,7 @@ public function testRenderFunctionReturnsHtml()
         $markdown = new Markdown($viewFactory);
         $viewFactory->shouldReceive('flushFinderCache')->once();
         $viewFactory->shouldReceive('replaceNamespace')->once()->with('mail', $markdown->htmlComponentPaths())->andReturnSelf();
+        $viewFactory->shouldReceive('exists')->with('default')->andReturn(false);
         $viewFactory->shouldReceive('make')->with('view', [])->andReturnSelf();
         $viewFactory->shouldReceive('make')->with('mail::themes.default', [])->andReturnSelf();
         $viewFactory->shouldReceive('render')->twice()->andReturn('<html></html>', 'body {}');
@@ -36,8 +37,9 @@ public function testRenderFunctionReturnsHtmlWithCustomTheme()
         $markdown->theme('yaz');
         $viewFactory->shouldReceive('flushFinderCache')->once();
         $viewFactory->shouldReceive('replaceNamespace')->once()->with('mail', $markdown->htmlComponentPaths())->andReturnSelf();
+        $viewFactory->shouldReceive('exists')->with('yaz')->andReturn(true);
         $viewFactory->shouldReceive('make')->with('view', [])->andReturnSelf();
-        $viewFactory->shouldReceive('make')->with('mail::themes.yaz', [])->andReturnSelf();
+        $viewFactory->shouldReceive('make')->with('yaz', [])->andReturnSelf();
         $viewFactory->shouldReceive('render')->twice()->andReturn('<html></html>', 'body {}');
 
         $result = $markdown->render('view', []);