Merge pull request #2851 from erikn69/revert-2840-remove-unnecessary-call

Revert "Remove `collectPermissions` that is not being assigned"

Author: drbyte

phpstan.neon.dist

@@ -17,3 +17,6 @@ parameters:
         # wildcard permissions:
         - '#Call to an undefined method Illuminate\\Database\\Eloquent\\Model::getWildcardClass#'
         - '#Call to an undefined method Illuminate\\Database\\Eloquent\\Model::getAllPermissions#'
+        # contract checks:
+        - '#Call to function is_a\(\) with (.*) and ''Spatie\\\\Permission\\\\Contracts\\\\Permission'' will always evaluate to true\.$#'
+        - '#Call to function is_a\(\) with (.*) and ''Spatie\\\\Permission\\\\Contracts\\\\Role'' will always evaluate to true\.$#'

src/Traits/HasPermissions.php

@@ -450,6 +450,7 @@ public function forgetWildcardPermissionIndex(): void
     public function syncPermissions(...$permissions)
     {
         if ($this->getModel()->exists) {
+            $this->collectPermissions($permissions);
             $this->permissions()->detach();
             $this->setRelation('permissions', collect());
         }

tests/HasPermissionsTest.php

@@ -611,6 +611,23 @@ public function it_can_avoid_sync_duplicated_permissions()
         $this->assertTrue($this->testUser->hasDirectPermission('edit-blog'));
     }
 
+    /** @test */
+    #[Test]
+    public function it_can_avoid_detach_on_permission_that_does_not_exist_sync()
+    {
+        $this->testUser->syncPermissions('edit-articles');
+
+        try {
+            $this->testUser->syncPermissions('permission-does-not-exist');
+            $this->fail('Expected PermissionDoesNotExist exception was not thrown.');
+        } catch (PermissionDoesNotExist $e){
+            //
+        }
+
+        $this->assertTrue($this->testUser->hasDirectPermission('edit-articles'));
+        $this->assertFalse($this->testUser->checkPermissionTo('permission-does-not-exist'));
+    }
+
     /** @test */
     #[Test]
     public function it_can_sync_multiple_permissions_by_id()

tests/HasRolesTest.php

@@ -318,6 +318,23 @@ public function it_can_avoid_sync_duplicated_roles()
         $this->assertTrue($this->testUser->hasRole('testRole2'));
     }
 
+    /** @test */
+    #[Test]
+    public function it_can_avoid_detach_on_role_that_does_not_exist_sync()
+    {
+        $this->testUser->syncRoles('testRole');
+
+        try {
+            $this->testUser->syncRoles('role-does-not-exist');
+            $this->fail('Expected RoleDoesNotExist exception was not thrown.');
+        } catch (RoleDoesNotExist $e){
+            //
+        }
+
+        $this->assertTrue($this->testUser->hasRole('testRole'));
+        $this->assertFalse($this->testUser->hasRole('role-does-not-exist'));
+    }
+
     /** @test */
     #[Test]
     public function it_can_sync_multiple_roles()