Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[11.x] Fixed class and class.invokable stub paths after publish #50676

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions src/Illuminate/Foundation/Console/ClassMakeCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,22 @@ class ClassMakeCommand extends GeneratorCommand
*/
protected function getStub()
{
if ($this->option('invokable')) {
return __DIR__.'/stubs/class.invokable.stub';
}
return $this->option('invokable')
? $this->resolveStubPath('/stubs/class.invokable.stub')
: $this->resolveStubPath('/stubs/class.stub');
}

return __DIR__.'/stubs/class.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