Skip to content

Commit

Permalink
[8.x] Make mail stubs (#38596)
Browse files Browse the repository at this point in the history
* Publish make:mail stubs

* Publish make:mail stubs

* Updated mail.stub namespace and class

* Updated markdown-mail.stub class and namespace
  • Loading branch information
kg-bot authored Aug 30, 2021
1 parent 9ed095d commit 7ad9769
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 7 deletions.
20 changes: 17 additions & 3 deletions src/Illuminate/Foundation/Console/MailMakeCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

/**
Expand Down
2 changes: 2 additions & 0 deletions src/Illuminate/Foundation/Console/StubPublishCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
4 changes: 2 additions & 2 deletions src/Illuminate/Foundation/Console/stubs/mail.stub
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
4 changes: 2 additions & 2 deletions src/Illuminate/Foundation/Console/stubs/markdown-mail.stub
Original file line number Diff line number Diff line change
@@ -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;

Expand Down

0 comments on commit 7ad9769

Please sign in to comment.