Always update the morph map when setting custom models or tables

Closes #378 Refs #306
JosephSilber · Jan 21, 2019 · 6370bce · 6370bce
1 parent 8cba56c
commit 6370bce
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 7 deletions.
diff --git a/src/BouncerServiceProvider.php b/src/BouncerServiceProvider.php
@@ -2,9 +2,7 @@
 
 namespace Silber\Bouncer;
 
-use Silber\Bouncer\Database\Role;
 use Silber\Bouncer\Database\Models;
-use Silber\Bouncer\Database\Ability;
 use Silber\Bouncer\Console\CleanCommand;
 
 use Illuminate\Cache\ArrayStore;
@@ -74,18 +72,15 @@ protected function registerCommands()
      */
     protected function registerMorphs()
     {
-        Relation::morphMap([
-            Models::classname(Role::class),
-            Models::classname(Ability::class),
-        ]);
+        Models::updateMorphMap();
     }
 
     /**
      * Set the table prefix for Bouncer's tables.
      *
      * @return void
-     */
     protected function setTablePrefix()
+     */
     {
         if ($prefix = $this->getTablePrefix()) {
             Models::setPrefix($prefix);

diff --git a/src/Database/Models.php b/src/Database/Models.php
@@ -6,6 +6,8 @@
 use App\User;
 use Illuminate\Database\Query\Builder;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\Relation;
+
 use Silber\Bouncer\Database\Scope\Scope;
 use Silber\Bouncer\Contracts\Scope as ScopeContract;
 
@@ -55,6 +57,8 @@ class Models
     public static function setAbilitiesModel($model)
     {
         static::$models[Ability::class] = $model;
+
+        static::updateMorphMap([$model]);
     }
 
     /**
@@ -66,6 +70,8 @@ public static function setAbilitiesModel($model)
     public static function setRolesModel($model)
     {
         static::$models[Role::class] = $model;
+
+        static::updateMorphMap([$model]);
     }
 
     /**
@@ -90,6 +96,8 @@ public static function setUsersModel($model)
     public static function setTables(array $map)
     {
         static::$tables = array_merge(static::$tables, $map);
+
+        static::updateMorphMap();
     }
 
     /**
@@ -162,6 +170,24 @@ public static function classname($model)
         return $model;
     }
 
+    /**
+     * Update Eloquent's morph map with the Bouncer models and tables.
+     *
+     * @param  array|null  $classNames
+     * @return void
+     */
+    public static function updateMorphMap($classNames = null)
+    {
+        if (is_null($classNames)) {
+            $classNames = [
+                static::classname(Role::class),
+                static::classname(Ability::class),
+            ];
+        }
+
+        Relation::morphMap($classNames);
+    }
+
     /**
      * Register an attribute/callback to determine if a model is owned by a given authority.
      *