Merge branch 'master' into 8.x

Author: santigarcor

src/Traits/HasRolesAndPermissions.php

@@ -27,7 +27,7 @@ trait HasRolesAndPermissions
      * remove the many-to-many records when trying to delete.
      * Will NOT delete any records if the user model uses soft deletes.
      */
-    public static function bootLaratrustUserTrait(): void
+    public static function bootHasRolesAndPermissions(): void
     {
         $flushCache = function ($user) {
             $user->flushCache();

tests/Checkers/Model/LaratrustModelCheckerTestCase.php

@@ -22,14 +22,15 @@ protected function setUp(): void
         parent::setUp();
 
         $this->migrate();
-        $this->user = User::create(['name' => 'test', 'email' => 'test@test.com']);
-        $this->other = Other::create(['name' => 'test', 'email' => 'test@test.com']);
 
         $this->app['config']->set('laratrust.use_morph_map', true);
         $this->app['config']->set('laratrust.user_models', [
             'users' => 'Laratrust\Tests\Models\User',
             'others' => 'Laratrust\Tests\Models\Other'
         ]);
+
+        $this->user = User::create(['name' => 'test', 'email' => 'test@test.com']);
+        $this->other = Other::create(['name' => 'test', 'email' => 'test@test.com']);
     }
 
     public function modelDisableTheRolesAndPermissionsCachingAssertions()

tests/Models/Other.php

@@ -4,13 +4,12 @@
 
 namespace Laratrust\Tests\Models;
 
-use Illuminate\Database\Eloquent\Model;
-use Laratrust\Traits\LaratrustUserTrait;
+use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Laratrust\Contracts\LaratrustUser;
 use Laratrust\Traits\HasRolesAndPermissions;
 
-class Other extends Model implements LaratrustUser
+class Other extends Authenticatable implements LaratrustUser
 {
     use HasRolesAndPermissions;
     use SoftDeletes;

tests/UserTest.php

@@ -646,6 +646,42 @@ public function testAllPermissionsScopedOnTeams()
 
     }
 
+    public function testManyToManyRecordsAreRemoved()
+    {
+        /*
+        |------------------------------------------------------------
+        | Set
+        |------------------------------------------------------------
+        */
+        $roleA = Role::create(['name' => 'role_a']);
+        $permissionA = Permission::create(['name' => 'permission_a']);
+
+        $teamA = Team::create(['name' => 'team_a']);
+
+        $this->user->addRole($roleA, $teamA);
+        $this->user->givePermission($permissionA);
+
+        // force-deleting because the user model has soft-deletes enabled
+        $this->user->forceDelete();
+
+        /*
+        |------------------------------------------------------------
+        | Assertion
+        |------------------------------------------------------------
+        */
+        $this->assertModelMissing($this->user);
+
+        $this->assertDatabaseMissing(
+            $this->app['config']->get('laratrust.tables.role_user'),
+            ['user_id' => $this->user->id]
+        );
+
+        $this->assertDatabaseMissing(
+            $this->app['config']->get('laratrust.tables.permission_user'),
+            ['user_id' => $this->user->id]
+        );
+    }
+
     protected function assertWasAttached($objectName, $result)
     {
         $relationship = \Illuminate\Support\Str::plural($objectName);