From 7ad97694f2ea5e6219a3c9de71c1a35c7a7292e5 Mon Sep 17 00:00:00 2001
From: Stefan Ninic <ninicstefan94@gmail.com>
Date: Mon, 30 Aug 2021 21:40:24 +0200
Subject: [PATCH] [8.x] Make mail stubs (#38596)

* Publish make:mail stubs

* Publish make:mail stubs

* Updated mail.stub namespace and class

* Updated markdown-mail.stub class and namespace
---
 .../Foundation/Console/MailMakeCommand.php    | 20 ++++++++++++++++---
 .../Foundation/Console/StubPublishCommand.php |  2 ++
 .../Foundation/Console/stubs/mail.stub        |  4 ++--
 .../Console/stubs/markdown-mail.stub          |  4 ++--
 4 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/Illuminate/Foundation/Console/MailMakeCommand.php b/src/Illuminate/Foundation/Console/MailMakeCommand.php
index 19bef8db3c33..a872556cfd36 100644
--- a/src/Illuminate/Foundation/Console/MailMakeCommand.php
+++ b/src/Illuminate/Foundation/Console/MailMakeCommand.php
@@ -86,9 +86,23 @@ protected function buildClass($name)
      */
     protected function getStub()
     {
-        return $this->option('markdown')
-                        ? __DIR__.'/stubs/markdown-mail.stub'
-                        : __DIR__.'/stubs/mail.stub';
+        return $this->resolveStubPath(
+            $this->option('markdown')
+                ? '/stubs/markdown-mail.stub'
+                : '/stubs/mail.stub');
+    }
+
+    /**
+     * Resolve the fully-qualified path to the stub.
+     *
+     * @param  string  $stub
+     * @return string
+     */
+    protected function resolveStubPath($stub)
+    {
+        return file_exists($customPath = $this->laravel->basePath(trim($stub, '/')))
+            ? $customPath
+            : __DIR__.$stub;
     }
 
     /**
diff --git a/src/Illuminate/Foundation/Console/StubPublishCommand.php b/src/Illuminate/Foundation/Console/StubPublishCommand.php
index 491a7b4d962b..885f0f5c15dc 100644
--- a/src/Illuminate/Foundation/Console/StubPublishCommand.php
+++ b/src/Illuminate/Foundation/Console/StubPublishCommand.php
@@ -37,6 +37,8 @@ public function handle()
             __DIR__.'/stubs/event.stub' => $stubsPath.'/event.stub',
             __DIR__.'/stubs/job.queued.stub' => $stubsPath.'/job.queued.stub',
             __DIR__.'/stubs/job.stub' => $stubsPath.'/job.stub',
+            __DIR__.'/stubs/mail.stub' => $stubsPath.'/mail.stub',
+            __DIR__.'/stubs/markdown-mail.stub' => $stubsPath.'/markdown-mail.stub',
             __DIR__.'/stubs/markdown-notification.stub' => $stubsPath.'/markdown-notification.stub',
             __DIR__.'/stubs/model.pivot.stub' => $stubsPath.'/model.pivot.stub',
             __DIR__.'/stubs/model.stub' => $stubsPath.'/model.stub',
diff --git a/src/Illuminate/Foundation/Console/stubs/mail.stub b/src/Illuminate/Foundation/Console/stubs/mail.stub
index 1fa0bcfcc882..f432a815cec6 100644
--- a/src/Illuminate/Foundation/Console/stubs/mail.stub
+++ b/src/Illuminate/Foundation/Console/stubs/mail.stub
@@ -1,13 +1,13 @@
 <?php
 
-namespace DummyNamespace;
+namespace {{ namespace }};
 
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
 
-class DummyClass extends Mailable
+class {{ class }} extends Mailable
 {
     use Queueable, SerializesModels;
 
diff --git a/src/Illuminate/Foundation/Console/stubs/markdown-mail.stub b/src/Illuminate/Foundation/Console/stubs/markdown-mail.stub
index 7bf41616df5d..12f9ef2c12e2 100644
--- a/src/Illuminate/Foundation/Console/stubs/markdown-mail.stub
+++ b/src/Illuminate/Foundation/Console/stubs/markdown-mail.stub
@@ -1,13 +1,13 @@
 <?php
 
-namespace DummyNamespace;
+namespace {{ namespace }};
 
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
 
-class DummyClass extends Mailable
+class {{ class }} extends Mailable
 {
     use Queueable, SerializesModels;