Merge branch 'master' into 8.x

santigarcor · Jan 16, 2025 · 1c1b404 · 1c1b404
2 parents 9c87ac0 + a35abe7
commit 1c1b404
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [8.1, 8.2, 8.3]
+        php: [8.1, 8.2, 8.3, 8.4]
         laravel: [10.*, 11.*]
         stability: [prefer-lowest, prefer-stable]
         include:

diff --git a/docs/docs/8.x/the-basics/models/user.md b/docs/docs/8.x/the-basics/models/user.md
@@ -2,11 +2,11 @@
 
 ```php
 <?php
-
+use Illuminate\Foundation\Auth\User as Authenticatable;
 use Laratrust\Contracts\LaratrustUser;
 use Laratrust\Traits\HasRolesAndPermissions;
 
-class User extends Model implements LaratrustUser
+class User extends Authenticatable implements LaratrustUser
 {
     use HasRolesAndPermissions; // add this trait to your user model
 

diff --git a/docs/docs/8.x/usage/querying-relationships.md b/docs/docs/8.x/usage/querying-relationships.md
@@ -87,5 +87,5 @@ To retrive all the users that don't have any roles or permissions you can use:
 ```php
 User::whereDoesntHaveRoles()->get();
 
-User::whereDoesntHavePermission()->get();
+User::whereDoesntHavePermissions()->get();
 ```
diff --git a/resources/views/setup-teams.blade.php b/resources/views/setup-teams.blade.php
@@ -2,6 +2,7 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class LaratrustSetupTeams extends Migration
 {

diff --git a/src/Contracts/LaratrustUser.php b/src/Contracts/LaratrustUser.php
@@ -150,5 +150,5 @@ public function syncPermissions(
      *
      * @return Collection<\Laratrust\Contracts\Permission>
      */
-    public function allPermissions(array $columns = null, $team = false): Collection;
+    public function allPermissions(?array $columns = null, mixed $team = false): Collection;
 }
diff --git a/src/Http/Controllers/PermissionsController.php b/src/Http/Controllers/PermissionsController.php
@@ -35,7 +35,7 @@ public function create()
     public function store(Request $request)
     {
         $data = $request->validate([
-            'name' => 'required|string|unique:'.config('laratrust.tables.roles', 'roles').',name',
+            'name' => 'required|string|unique:'.config('laratrust.tables.permissions', 'permissions').',name',
             'display_name' => 'nullable|string',
             'description' => 'nullable|string',
         ]);

diff --git a/src/Traits/HasRolesAndPermissions.php b/src/Traits/HasRolesAndPermissions.php
@@ -498,7 +498,7 @@ public function syncPermissionsWithoutDetaching(
      *
      * @return Collection<\Laratrust\Contracts\Permission>
      */
-    public function allPermissions(array $columns = null, $team = false): Collection
+    public function allPermissions(?array $columns = null, mixed $team = false): Collection
     {
         $columns = is_array($columns) ? $columns : null;
         if ($columns) {