Skip to content

Commit d1563b5

Browse files
SlimGeeSlimGee
authored
Merge pull request #16 from flixtechs-labs/dev
fix: collision in generating user policy
2 parents 8341bc6 + 7e4d15f commit d1563b5

File tree

4 files changed

+56
-55
lines changed

4 files changed

+56
-55
lines changed

‎composer.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@
2323
"symfony/filesystem": "^6.2.7"
2424
},
2525
"require-dev": {
26-
"laravel/pint": "^1.6.0",
26+
"larastan/larastan": "^2.7",
27+
"laravel/pint": "^1.13.7",
2728
"nunomaduro/collision": "^6.4.0",
28-
"nunomaduro/larastan": "^2.5.1",
29-
"orchestra/testbench": "^7.22.1",
30-
"pestphp/pest": "^1.22.5",
29+
"orchestra/testbench": "^7.37.0",
30+
"pestphp/pest": "^1.23.1",
3131
"pestphp/pest-plugin-laravel": "^1.4",
32-
"phpstan/extension-installer": "^1.2",
33-
"phpstan/phpstan-deprecation-rules": "^1.1.2",
34-
"phpstan/phpstan-phpunit": "^1.3.10",
35-
"phpunit/phpunit": "^9.6.4",
32+
"phpstan/extension-installer": "^1.3.1",
33+
"phpstan/phpstan-deprecation-rules": "^1.1.4",
34+
"phpstan/phpstan-phpunit": "^1.3.15",
35+
"phpunit/phpunit": "^9.6.15",
3636
"roave/security-advisories": "dev-latest"
3737
},
3838
"autoload": {

‎src/Commands/LaravelAuthorizerCommand.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public function handle(): int
5151
return self::SUCCESS;
5252
}
5353

54-
$this->generatePolicy($name, $model);
54+
$this->generatePolicy($name, ucfirst($model));
5555

5656
return self::SUCCESS;
5757
}
@@ -136,8 +136,8 @@ private function generatePolicy(string $name, string $model): void
136136
strtolower(
137137
Str::afterLast($this->getNamespacedUserModel(), '\\')
138138
)
139-
? $this->getStub()
140-
: $this->getUserPolicyPolicyStub()
139+
? $this->getUserPolicyPolicyStub()
140+
: $this->getStub()
141141
)
142142
);
143143

‎src/Commands/stubs/policy.stub‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ class {{ class }}
1313
/**
1414
* Determine whether the user can view any models.
1515
*
16-
* @param \{{ namespacedUserModel }} $user
17-
* @return \Illuminate\Auth\Access\Response|bool
16+
* @param {{ model }} $user
17+
* @return bool
1818
*/
1919
public function viewAny({{ user }} $user): bool
2020
{
@@ -24,9 +24,9 @@ class {{ class }}
2424
/**
2525
* Determine whether the user can view the model.
2626
*
27-
* @param \{{ namespacedUserModel }} $user
28-
* @param \{{ namespacedModel }} ${{ modelVariable }}
29-
* @return \Illuminate\Auth\Access\Response|bool
27+
* @param {{ user }} $user
28+
* @param {{ model }} ${{ modelVariable }}
29+
* @return bool
3030
*/
3131
public function view({{ user }} $user, {{ model }} ${{ modelVariable }}): bool
3232
{
@@ -36,8 +36,8 @@ class {{ class }}
3636
/**
3737
* Determine whether the user can create models.
3838
*
39-
* @param \{{ namespacedUserModel }} $user
40-
* @return \Illuminate\Auth\Access\Response|bool
39+
* @param {{ user }} $user
40+
* @return bool
4141
*/
4242
public function create({{ user }} $user): bool
4343
{
@@ -47,9 +47,9 @@ class {{ class }}
4747
/**
4848
* Determine whether the user can update the model.
4949
*
50-
* @param \{{ namespacedUserModel }} $user
51-
* @param \{{ namespacedModel }} ${{ modelVariable }}
52-
* @return \Illuminate\Auth\Access\Response|bool
50+
* @param {{ user }} $user
51+
* @param {{ model }} ${{ modelVariable }}
52+
* @return bool
5353
*/
5454
public function update({{ user }} $user, {{ model }} ${{ modelVariable }}): bool
5555
{
@@ -59,9 +59,9 @@ class {{ class }}
5959
/**
6060
* Determine whether the user can delete the model.
6161
*
62-
* @param \{{ namespacedUserModel }} $user
63-
* @param \{{ namespacedModel }} ${{ modelVariable }}
64-
* @return \Illuminate\Auth\Access\Response|bool
62+
* @param {{ user }} $user
63+
* @param {{ model }} ${{ modelVariable }}
64+
* @return bool
6565
*/
6666
public function delete({{ user }} $user, {{ model }} ${{ modelVariable }}): bool
6767
{
@@ -71,9 +71,9 @@ class {{ class }}
7171
/**
7272
* Determine whether the user can restore the model.
7373
*
74-
* @param \{{ namespacedUserModel }} $user
75-
* @param \{{ namespacedModel }} ${{ modelVariable }}
76-
* @return \Illuminate\Auth\Access\Response|bool
74+
* @param {{ user }} $user
75+
* @param {{ model }} ${{ modelVariable }}
76+
* @return bool
7777
*/
7878
public function restore({{ user }} $user, {{ model }} ${{ modelVariable }}): bool
7979
{
@@ -83,9 +83,9 @@ class {{ class }}
8383
/**
8484
* Determine whether the user can permanently delete the model.
8585
*
86-
* @param \{{ namespacedUserModel }} $user
87-
* @param \{{ namespacedModel }} ${{ modelVariable }}
88-
* @return \Illuminate\Auth\Access\Response|bool
86+
* @param {{ user }} $user
87+
* @param {{ model }} ${{ modelVariable }}
88+
* @return bool
8989
*/
9090
public function forceDelete({{ user }} $user, {{ model }} ${{ modelVariable }}): bool
9191
{

‎src/Commands/stubs/policy.user.stub‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace {{ namespace }};
44

55
use Illuminate\Auth\Access\HandlesAuthorization;
6+
use Illuminate\Auth\Access\Response;
67
use {{ namespacedUserModel }};
78

89
class {{ class }}
@@ -12,8 +13,8 @@ class {{ class }}
1213
/**
1314
* Determine whether the user can view any models.
1415
*
15-
* @param \{{ namespacedUserModel }} $user
16-
* @return \Illuminate\Auth\Access\Response|bool
16+
* @param {{ model }} $user
17+
* @return Response|bool
1718
*/
1819
public function viewAny({{ user }} $user): bool
1920
{
@@ -23,20 +24,20 @@ class {{ class }}
2324
/**
2425
* Determine whether the user can view the model.
2526
*
26-
* @param \{{ namespacedUserModel }} $user
27-
* @param \{{ namespacedUserModel }} ${{ modelVariable }}
28-
* @return \Illuminate\Auth\Access\Response|bool
27+
* @param {{ model }} $user
28+
* @param {{ model }} $model
29+
* @return Response|bool
2930
*/
30-
public function view({{ user }} $user, {{ model }} ${{ modelVariable }}): bool
31+
public function view({{ user }} $user, {{ userModel }} $model): bool
3132
{
32-
return $user->can('view {{ modelSingularLowerCase }}', ${{ modelVariable }});
33+
return $user->can('view {{ modelSingularLowerCase }}', $model)
3334
}
3435

3536
/**
3637
* Determine whether the user can create models.
3738
*
38-
* @param \{{ namespacedUserModel }} $user
39-
* @return \Illuminate\Auth\Access\Response|bool
39+
* @param {{ model }} $user
40+
* @return Response|bool
4041
*/
4142
public function create({{ user }} $user): bool
4243
{
@@ -46,33 +47,33 @@ class {{ class }}
4647
/**
4748
* Determine whether the user can update the model.
4849
*
49-
* @param \{{ namespacedUserModel }} $user
50-
* @param \{{ namespacedUserModel }} ${{ modelVariable }}
51-
* @return \Illuminate\Auth\Access\Response|bool
50+
* @param {{ model }} $user
51+
* @param {{ model }} $model
52+
* @return Response|bool
5253
*/
53-
public function update({{ user }} $user, {{ model }} ${{ modelVariable }}): bool
54+
public function update({{ user }} $user, {{ model }} $model): bool
5455
{
55-
return $user->can('update {{ modelSingularLowerCase }}', ${{ modelVariable }});
56+
return $user->can('update {{ modelSingularLowerCase }}', $model);
5657
}
5758

5859
/**
5960
* Determine whether the user can delete the model.
6061
*
61-
* @param \{{ namespacedUserModel }} $user
62-
* @param \{{ namespacedUserModel }} ${{ modelVariable }}
63-
* @return \Illuminate\Auth\Access\Response|bool
62+
* @param {{ model }} $user
63+
* @param {{ model }} ${{ modelVariable }}
64+
* @return Response|bool
6465
*/
65-
public function delete({{ user }} $user, {{ model }} ${{ modelVariable }}): bool
66+
public function delete({{ user }} $user, {{ model }} $model): bool
6667
{
67-
return $user->can('delete {{ modelSingularLowerCase }}', ${{ modelVariable }});
68+
return $user->can('delete {{ modelSingularLowerCase }}', $model);
6869
}
6970

7071
/**
7172
* Determine whether the user can restore the model.
7273
*
73-
* @param \{{ namespacedUserModel }} $user
74-
* @param \{{ namespacedUserModel }} ${{ modelVariable }}
75-
* @return \Illuminate\Auth\Access\Response|bool
74+
* @param {{ model }} $user
75+
* @param {{ model }} ${{ modelVariable }}
76+
* @return Response|bool
7677
*/
7778
public function restore({{ user }} $user, {{ model }} ${{ modelVariable }}): bool
7879
{
@@ -82,9 +83,9 @@ class {{ class }}
8283
/**
8384
* Determine whether the user can permanently delete the model.
8485
*
85-
* @param \{{ namespacedUserModel }} $user
86-
* @param \{{ namespacedUserModel }} ${{ modelVariable }}
87-
* @return \Illuminate\Auth\Access\Response|bool
86+
* @param {{ model }} $user
87+
* @param {{ model }} ${{ modelVariable }}
88+
* @return Response|bool
8889
*/
8990
public function forceDelete({{ user }} $user, {{ model }} ${{ modelVariable }}): bool
9091
{

0 commit comments

Comments
 (0)