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

Jump to bottom

[5.5] Policy stub fixes: correct User model & var name for UserPolicy #21499

Merged
merged 1 commit into from Oct 2, 2017
Merged

[5.5] Policy stub fixes: correct User model & var name for UserPolicy #21499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/Illuminate/Foundation/Console/PolicyMakeCommand.php
View file
Open in desktop
Expand Up @@ -89,12 +89,16 @@ protected function replaceModel($stub, $model)
);

$model = class_basename(trim($model, '\\'));
$dummyModel = Str::camel($model) === 'user' ? 'model' : Str::camel($model);
$dummyUser = class_basename(config('auth.providers.users.model'));

$stub = str_replace('DummyModel', $model, $stub);

$stub = str_replace('dummyModel', Str::camel($model), $stub);
$stub = str_replace('dummyModel', $dummyModel, $stub);

return str_replace('dummyPluralModel', Str::plural(Str::camel($model)), $stub);
$stub = str_replace('DummyUser', $dummyUser, $stub);

return str_replace('dummyPluralModel', Str::plural($dummyModel), $stub);
}

/**
Expand Down
8 changes: 4 additions & 4 deletions src/Illuminate/Foundation/Console/stubs/policy.stub
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@ class DummyClass
* @param \NamespacedDummyModel $dummyModel
* @return mixed
*/
public function view(User $user, DummyModel $dummyModel)
public function view(DummyUser $user, DummyModel $dummyModel)
{
//
}
Expand All @@ -28,7 +28,7 @@ class DummyClass
* @param \NamespacedDummyUserModel $user
* @return mixed
*/
public function create(User $user)
public function create(DummyUser $user)
{
//
}
Expand All @@ -40,7 +40,7 @@ class DummyClass
* @param \NamespacedDummyModel $dummyModel
* @return mixed
*/
public function update(User $user, DummyModel $dummyModel)
public function update(DummyUser $user, DummyModel $dummyModel)
{
//
}
Expand All @@ -52,7 +52,7 @@ class DummyClass
* @param \NamespacedDummyModel $dummyModel
* @return mixed
*/
public function delete(User $user, DummyModel $dummyModel)
public function delete(DummyUser $user, DummyModel $dummyModel)
{
//
}
Expand Down