Merge pull request #1548 from spatie/gettable

Declare table relations earlier to improve guarded/fillable detection accuracy
spatie · Aug 15, 2020 · 5c1cc46 · 5c1cc46
2 parents 20b9781 + bce7d9b
commit 5c1cc46
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/Models/Permission.php b/src/Models/Permission.php
@@ -26,8 +26,11 @@ public function __construct(array $attributes = [])
         $attributes['guard_name'] = $attributes['guard_name'] ?? config('auth.defaults.guard');
 
         parent::__construct($attributes);
+    }
 
-        $this->setTable(config('permission.table_names.permissions'));
+    public function getTable()
+    {
+        return config('permission.table_names.permissions', parent::getTable());
     }
 
     public static function create(array $attributes = [])

diff --git a/src/Models/Role.php b/src/Models/Role.php
@@ -25,8 +25,11 @@ public function __construct(array $attributes = [])
         $attributes['guard_name'] = $attributes['guard_name'] ?? config('auth.defaults.guard');
 
         parent::__construct($attributes);
+    }
 
-        $this->setTable(config('permission.table_names.roles'));
+    public function getTable()
+    {
+        return config('permission.table_names.roles', parent::getTable());
     }
 
     public static function create(array $attributes = [])