Change configuration file

Changed the config file structure to make reading and editing it easier
santigarcor · Jun 19, 2017 · 3e79320 · 3e79320
1 parent b00a6c2
commit 3e79320
Show file tree

Hide file tree

Showing 21 changed files with 212 additions and 227 deletions.
diff --git a/src/Laratrust/LaratrustPermission.php b/src/Laratrust/LaratrustPermission.php
@@ -35,6 +35,6 @@ class LaratrustPermission extends Model implements LaratrustPermissionInterface
     public function __construct(array $attributes = [])
     {
         parent::__construct($attributes);
-        $this->table = Config::get('laratrust.permissions_table');
+        $this->table = Config::get('laratrust.tables.permissions');
     }
 }
diff --git a/src/Laratrust/LaratrustRole.php b/src/Laratrust/LaratrustRole.php
@@ -35,6 +35,6 @@ class LaratrustRole extends Model implements LaratrustRoleInterface
     public function __construct(array $attributes = [])
     {
         parent::__construct($attributes);
-        $this->table = Config::get('laratrust.roles_table');
+        $this->table = Config::get('laratrust.tables.roles');
     }
 }
diff --git a/src/Laratrust/LaratrustTeam.php b/src/Laratrust/LaratrustTeam.php
@@ -35,6 +35,6 @@ class LaratrustTeam extends Model implements LaratrustTeamInterface
     public function __construct(array $attributes = [])
     {
         parent::__construct($attributes);
-        $this->table = Config::get('laratrust.teams_table');
+        $this->table = Config::get('laratrust.tables.teams');
     }
 }
diff --git a/src/Laratrust/Middleware/LaratrustAbility.php b/src/Laratrust/Middleware/LaratrustAbility.php
@@ -55,8 +55,8 @@ public function handle($request, Closure $next, $roles, $permissions, $team = nu
         if ($this->auth->guest() ||
              !$request->user()->ability($roles, $permissions, $team, [ 'validate_all' => $validateAll ])) {
             return call_user_func(
-                Config::get('laratrust.middleware_handling', 'abort'),
-                Config::get('laratrust.middleware_params', '403')
+                Config::get('laratrust.middleware.handling', 'abort'),
+                Config::get('laratrust.middleware.params', '403')
             );
         }
 

diff --git a/src/Laratrust/Middleware/LaratrustPermission.php b/src/Laratrust/Middleware/LaratrustPermission.php
@@ -48,8 +48,8 @@ public function handle($request, Closure $next, $permissions, $team = null, $req
 
         if ($this->auth->guest() || !$request->user()->hasPermission($permissions, $team, $requireAll)) {
             return call_user_func(
-                Config::get('laratrust.middleware_handling', 'abort'),
-                Config::get('laratrust.middleware_params', '403')
+                Config::get('laratrust.middleware.handling', 'abort'),
+                Config::get('laratrust.middleware.params', '403')
             );
         }
 

diff --git a/src/Laratrust/Middleware/LaratrustRole.php b/src/Laratrust/Middleware/LaratrustRole.php
@@ -48,8 +48,8 @@ public function handle($request, Closure $next, $roles, $team = null, $requireAl
 
         if ($this->auth->guest() || !$request->user()->hasRole($roles, $team, $requireAll)) {
             return call_user_func(
-                Config::get('laratrust.middleware_handling', 'abort'),
-                Config::get('laratrust.middleware_params', '403')
+                Config::get('laratrust.middleware.handling', 'abort'),
+                Config::get('laratrust.middleware.params', '403')
             );
         }
 

diff --git a/src/Laratrust/Traits/LaratrustPermissionTrait.php b/src/Laratrust/Traits/LaratrustPermissionTrait.php
@@ -25,10 +25,10 @@ trait LaratrustPermissionTrait
     public function roles()
     {
         return $this->belongsToMany(
-            Config::get('laratrust.role'),
-            Config::get('laratrust.permission_role_table'),
-            Config::get('laratrust.permission_foreign_key'),
-            Config::get('laratrust.role_foreign_key')
+            Config::get('laratrust.models.role'),
+            Config::get('laratrust.tables.permission_role'),
+            Config::get('laratrust.foreign_keys.permission'),
+            Config::get('laratrust.foreign_keys.role')
         );
     }
 
@@ -43,9 +43,9 @@ public function getMorphByUserRelation($relationship)
         return $this->morphedByMany(
             Config::get('laratrust.user_models')[$relationship],
             'user',
-            Config::get('laratrust.permission_user_table'),
-            Config::get('laratrust.permission_foreign_key'),
-            Config::get('laratrust.user_foreign_key')
+            Config::get('laratrust.tables.permission_user'),
+            Config::get('laratrust.foreign_keys.permission'),
+            Config::get('laratrust.foreign_keys.user')
         );
     }
 
@@ -59,7 +59,7 @@ public function getMorphByUserRelation($relationship)
     public static function bootLaratrustPermissionTrait()
     {
         static::deleting(function ($permission) {
-            if (!method_exists(Config::get('laratrust.permission'), 'bootSoftDeletes')) {
+            if (!method_exists(Config::get('laratrust.models.permission'), 'bootSoftDeletes')) {
                 $permission->roles()->sync([]);
             }
         });

diff --git a/src/Laratrust/Traits/LaratrustRoleTrait.php b/src/Laratrust/Traits/LaratrustRoleTrait.php
@@ -46,9 +46,9 @@ public function getMorphByUserRelation($relationship)
         return $this->morphedByMany(
             Config::get('laratrust.user_models')[$relationship],
             'user',
-            Config::get('laratrust.role_user_table'),
-            Config::get('laratrust.role_foreign_key'),
-            Config::get('laratrust.user_foreign_key')
+            Config::get('laratrust.tables.role_user'),
+            Config::get('laratrust.foreign_keys.role'),
+            Config::get('laratrust.foreign_keys.user')
         );
     }
 
@@ -60,10 +60,10 @@ public function getMorphByUserRelation($relationship)
     public function permissions()
     {
         return $this->belongsToMany(
-            Config::get('laratrust.permission'),
-            Config::get('laratrust.permission_role_table'),
-            Config::get('laratrust.role_foreign_key'),
-            Config::get('laratrust.permission_foreign_key')
+            Config::get('laratrust.models.permission'),
+            Config::get('laratrust.tables.permission_role'),
+            Config::get('laratrust.foreign_keys.role'),
+            Config::get('laratrust.foreign_keys.permission')
         );
     }
 

diff --git a/src/Laratrust/Traits/LaratrustTeamTrait.php b/src/Laratrust/Traits/LaratrustTeamTrait.php
@@ -28,9 +28,9 @@ public function getMorphByUserRelation($relationship)
         return $this->morphedByMany(
             Config::get('laratrust.user_models')[$relationship],
             'user',
-            Config::get('laratrust.role_user_table'),
-            Config::get('laratrust.team_foreign_key'),
-            Config::get('laratrust.user_foreign_key')
+            Config::get('laratrust.tables.role_user'),
+            Config::get('laratrust.foreign_keys.team'),
+            Config::get('laratrust.foreign_keys.user')
         );
     }
 

diff --git a/src/Laratrust/Traits/LaratrustUserTrait.php b/src/Laratrust/Traits/LaratrustUserTrait.php
@@ -58,15 +58,15 @@ public function cachedPermissions()
     public function roles()
     {
         $roles = $this->morphToMany(
-            Config::get('laratrust.role'),
+            Config::get('laratrust.models.role'),
             'user',
-            Config::get('laratrust.role_user_table'),
-            Config::get('laratrust.user_foreign_key'),
-            Config::get('laratrust.role_foreign_key')
+            Config::get('laratrust.tables.role_user'),
+            Config::get('laratrust.foreign_keys.user'),
+            Config::get('laratrust.foreign_keys.role')
         );
 
         if (Config::get('laratrust.use_teams')) {
-            $roles->withPivot(Config::get('laratrust.team_foreign_key'));
+            $roles->withPivot(Config::get('laratrust.foreign_keys.team'));
         }
 
         return $roles;
@@ -80,15 +80,15 @@ public function roles()
     public function permissions()
     {
         $permissions = $this->morphToMany(
-            Config::get('laratrust.permission'),
+            Config::get('laratrust.models.permission'),
             'user',
-            Config::get('laratrust.permission_user_table'),
-            Config::get('laratrust.user_foreign_key'),
-            Config::get('laratrust.permission_foreign_key')
+            Config::get('laratrust.tables.permission_user'),
+            Config::get('laratrust.foreign_keys.user'),
+            Config::get('laratrust.foreign_keys.permission')
         );
 
         if (Config::get('laratrust.use_teams')) {
-            $permissions->withPivot(Config::get('laratrust.team_foreign_key'));
+            $permissions->withPivot(Config::get('laratrust.foreign_keys.team'));
         }
 
         return $permissions;
@@ -339,7 +339,7 @@ private function attachModel($relationship, $objectType, $object, $team)
             if (
                     $this->$relationship()
                     ->wherePivot($this->teamForeignKey(), $team)
-                    ->wherePivot(Config::get("laratrust.{$objectType}_foreign_key"), $object)
+                    ->wherePivot(Config::get("laratrust.foreign_keys.{$objectType}"), $object)
                     ->count()
                 ) {
                 return $this;
@@ -695,7 +695,7 @@ private function getIdFor($object, $type)
             return $object;
         } elseif (is_string($object)) {
             return call_user_func_array([
-                Config::get("laratrust.{$type}"), 'where'
+                Config::get("laratrust.models.{$type}"), 'where'
             ], ['name', $object])->firstOrFail()->getKey();
         }
 
@@ -711,7 +711,7 @@ private function getIdFor($object, $type)
      */
     private function teamForeignKey()
     {
-        return Config::get('laratrust.team_foreign_key');
+        return Config::get('laratrust.foreign_keys.team');
     }
 
     /**
@@ -744,7 +744,7 @@ private function fetchTeam($team = null)
         }
 
         $team = call_user_func_array(
-                    [Config::get('laratrust.team'), 'where'],
+                    [Config::get('laratrust.models.team'), 'where'],
                     ['name', $team]
                 )->first();
         return is_null($team) ? $team : $team->getKey();

diff --git a/src/commands/MakePermissionCommand.php b/src/commands/MakePermissionCommand.php
@@ -63,7 +63,7 @@ protected function getStub()
      */
     protected function getNameInput()
     {
-        return Config::get('laratrust.permission', 'Permission');
+        return Config::get('laratrust.models.permission', 'Permission');
     }
 
     /**

diff --git a/src/commands/MakeRoleCommand.php b/src/commands/MakeRoleCommand.php
@@ -63,7 +63,7 @@ protected function getStub()
      */
     protected function getNameInput()
     {
-        return Config::get('laratrust.role', 'Role');
+        return Config::get('laratrust.models.role', 'Role');
     }
 
     /**

diff --git a/src/commands/MakeSeederCommand.php b/src/commands/MakeSeederCommand.php
@@ -57,10 +57,10 @@ public function fire()
      */
     protected function createSeeder()
     {
-        $permission = Config::get('laratrust.permission', 'App\Permission');
-        $role = Config::get('laratrust.role', 'App\Role');
-        $rolePermissions = Config::get('laratrust.permission_role_table');
-        $roleUsers = Config::get('laratrust.role_user_table');
+        $permission = Config::get('laratrust.models.permission', 'App\Permission');
+        $role = Config::get('laratrust.models.role', 'App\Role');
+        $rolePermissions = Config::get('laratrust.tables.permission_role');
+        $roleUsers = Config::get('laratrust.tables.role_user');
         $user = new Collection(Config::get('laratrust.user_models', ['App\User']));
         $user = $user->first();
 

diff --git a/src/commands/MakeTeamCommand.php b/src/commands/MakeTeamCommand.php
@@ -63,7 +63,7 @@ protected function getStub()
      */
     protected function getNameInput()
     {
-        return Config::get('laratrust.team', 'Team');
+        return Config::get('laratrust.models.team', 'Team');
     }
 
     /**