Merge pull request #2411 from erikn69/patch-24

Fix call to an undefined method Role::getRoleClass
spatie · Apr 26, 2023 · 9e9190a · 9e9190a
2 parents a2ad839 + d595dff
commit 9e9190a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -1,7 +1,2 @@
 parameters:
 	ignoreErrors:
-		-
-			# PHPStan can't understand what's going on in context of Role class using Builder `when`
-			message: "#^Call to an undefined method Spatie\\\\Permission\\\\Models\\\\Role::getRoleClass\\(\\).$#"
-			count: 1
-			path: src\Traits\HasPermissions.php
diff --git a/src/Traits/HasPermissions.php b/src/Traits/HasPermissions.php
@@ -101,7 +101,7 @@ public function scopePermission(Builder $query, $permissions): Builder
 
         $permissionClass = $this->getPermissionClass();
         $permissionKey = (new $permissionClass())->getKeyName();
-        $roleClass = $this->getRoleClass();
+        $roleClass = is_a($this, Role::class) ? static::class : $this->getRoleClass();
         $roleKey = (new $roleClass())->getKeyName();
 
         $rolesWithPermissions = is_a($this, Role::class) ? [] : array_unique(