fix duplicates on sync

spatie · Dec 7, 2023 · af544ac · af544ac
1 parent b6b9f4f
commit af544ac
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 2 deletions.
diff --git a/src/Traits/HasPermissions.php b/src/Traits/HasPermissions.php
@@ -372,7 +372,9 @@ private function collectPermissions(...$permissions): array
 
                 $this->ensureModelSharesGuard($permission);
 
-                $array[] = $permission->getKey();
+                if (! in_array($permission->getKey(), $array)) {
+                    $array[] = $permission->getKey();
+                }
 
                 return $array;
             }, []);

diff --git a/src/Traits/HasRoles.php b/src/Traits/HasRoles.php
@@ -131,7 +131,9 @@ private function collectRoles(...$roles): array
 
                 $this->ensureModelSharesGuard($role);
 
-                $array[] = $role->getKey();
+                if (! in_array($role->getKey(), $array)) {
+                    $array[] = $role->getKey();
+                }
 
                 return $array;
             }, []);

diff --git a/tests/HasPermissionsTest.php b/tests/HasPermissionsTest.php
@@ -541,6 +541,16 @@ public function it_can_sync_multiple_permissions()
         $this->assertFalse($this->testUser->hasDirectPermission('edit-news'));
     }
 
+    /** @test */
+    public function it_can_avoid_sync_duplicated_permissions()
+    {
+        $this->testUser->syncPermissions('edit-articles', 'edit-blog', 'edit-blog');
+
+        $this->assertTrue($this->testUser->hasDirectPermission('edit-articles'));
+
+        $this->assertTrue($this->testUser->hasDirectPermission('edit-blog'));
+    }
+
     /** @test */
     public function it_can_sync_multiple_permissions_by_id()
     {

diff --git a/tests/HasRolesTest.php b/tests/HasRolesTest.php
@@ -259,6 +259,16 @@ public function it_can_sync_roles_from_a_string_on_a_permission()
         $this->assertTrue($this->testUserPermission->hasRole('testRole2'));
     }
 
+    /** @test */
+    public function it_can_avoid_sync_duplicated_roles()
+    {
+        $this->testUser->syncRoles('testRole', 'testRole', 'testRole2');
+
+        $this->assertTrue($this->testUser->hasRole('testRole'));
+
+        $this->assertTrue($this->testUser->hasRole('testRole2'));
+    }
+
     /** @test */
     public function it_can_sync_multiple_roles()
     {