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.

Sign up for GitHub

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

[5.4] Use the correct user model namespace in make:policy Command #19965

Merged
merged 6 commits into from
Jul 10, 2017
Merged

[5.4] Use the correct user model namespace in make:policy Command #19965

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
abb9f57
Uses the correct user model namespace for new policies
Lloople Jul 8, 2017
5a7cfe5
Correct function name
Lloople Jul 8, 2017
50a0be8
Fix return comment
Lloople Jul 8, 2017
af2fad2
Fix hard-coded default namespace
Lloople Jul 8, 2017
37d429d
Add comprovation before replacing the namespace
Lloople Jul 8, 2017
18de133
Fix StyleCI
Lloople Jul 8, 2017
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
37 changes: 37 additions & 0 deletions src/Illuminate/Foundation/Console/PolicyMakeCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,48 @@ protected function buildClass($name)
{
$stub = parent::buildClass($name);

$stub = $this->replaceUserModelNamespace($stub);

$model = $this->option('model');

return $model ? $this->replaceModel($stub, $model) : $stub;
}

/**
* Replace the user model namespace for the given stub.
*
* @param string $stub
* @return string
*/
protected function replaceUserModelNamespace($stub)
{
if ($this->getDefaultUserNamespace() != $this->getRealUserNamespace()) {
return str_replace($this->getDefaultUserNamespace(), $this->getRealUserNamespace(), $stub);
}

return $stub;
}

/**
* Get the default namespace for the user model.
*
* @return string
*/
public function getDefaultUserNamespace()
{
return $this->rootNamespace().'User';
}

/**
* Get the real namespace for the user model.
*
* @return string
*/
public function getRealUserNamespace()
{
return config('auth.providers.users.model');
}

/**
* Replace the model for the given stub.
*
Expand Down