Merge pull request #2225 from spatie/revert-2098-fix_config

Revert "Avoid calling the config helper in the role/perm model constructor"
spatie · Oct 21, 2022 · 7ec0a46 · 7ec0a46
2 parents c90f54b + 6a4747d
commit 7ec0a46
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/Models/Permission.php b/src/Models/Permission.php
@@ -22,6 +22,8 @@ class Permission extends Model implements PermissionContract
 
     public function __construct(array $attributes = [])
     {
+        $attributes['guard_name'] = $attributes['guard_name'] ?? config('auth.defaults.guard');
+
         parent::__construct($attributes);
 
         $this->guarded[] = $this->primaryKey;

diff --git a/src/Models/Role.php b/src/Models/Role.php
@@ -22,6 +22,8 @@ class Role extends Model implements RoleContract
 
     public function __construct(array $attributes = [])
     {
+        $attributes['guard_name'] = $attributes['guard_name'] ?? config('auth.defaults.guard');
+
         parent::__construct($attributes);
 
         $this->guarded[] = $this->primaryKey;