Merge pull request #167 from jeremykenedy/analysis-0gJweE

Apply fixes from StyleCI
jeremykenedy · Nov 25, 2021 · 2d7d3fd · 2d7d3fd
2 parents 5fec2a3 + cbe3f79
commit 2d7d3fd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/src/Traits/HasRoleAndPermission.php b/src/Traits/HasRoleAndPermission.php
@@ -201,20 +201,18 @@ public function rolePermissions()
         }
 
         if (config('roles.inheritance')) {
-            return $permissionModel
-                ::select([$permissionTable . '.*', 'permission_role.created_at as pivot_created_at', 'permission_role.updated_at as pivot_updated_at'])
-                ->join('permission_role', 'permission_role.permission_id', '=', $permissionTable .'.id')
+            return $permissionModel::select([$permissionTable.'.*', 'permission_role.created_at as pivot_created_at', 'permission_role.updated_at as pivot_updated_at'])
+                ->join('permission_role', 'permission_role.permission_id', '=', $permissionTable.'.id')
                 ->join($roleTable, $roleTable.'.id', '=', 'permission_role.role_id')
                 ->whereIn($roleTable.'.id', $this->getRoles()->pluck('id')->toArray())
                 ->orWhere($roleTable.'.level', '<', $this->level())
-                ->groupBy([$permissionTable . '.id', $permissionTable .'.name', $permissionTable .'.slug', $permissionTable .'.description', $permissionTable .'.model', $permissionTable .'.created_at', 'permissions.updated_at', $permissionTable .'.deleted_at', 'pivot_created_at', 'pivot_updated_at']);
+                ->groupBy([$permissionTable.'.id', $permissionTable.'.name', $permissionTable.'.slug', $permissionTable.'.description', $permissionTable.'.model', $permissionTable.'.created_at', 'permissions.updated_at', $permissionTable.'.deleted_at', 'pivot_created_at', 'pivot_updated_at']);
         } else {
-            return $permissionModel
-                ::select([$permissionTable .'.*', 'permission_role.created_at as pivot_created_at', 'permission_role.updated_at as pivot_updated_at'])
-                ->join('permission_role', 'permission_role.permission_id', '=', $permissionTable .'.id')
+            return $permissionModel::select([$permissionTable.'.*', 'permission_role.created_at as pivot_created_at', 'permission_role.updated_at as pivot_updated_at'])
+                ->join('permission_role', 'permission_role.permission_id', '=', $permissionTable.'.id')
                 ->join($roleTable, $roleTable.'.id', '=', 'permission_role.role_id')
                 ->whereIn($roleTable.'.id', $this->getRoles()->pluck('id')->toArray())
-                ->groupBy([$permissionTable . '.id', $permissionTable .'.name', $permissionTable .'.slug', $permissionTable .'.description', $permissionTable .'.model', $permissionTable .'.created_at', $permissionTable .'.updated_at', $permissionTable .'.deleted_at', 'pivot_created_at', 'pivot_updated_at']);
+                ->groupBy([$permissionTable.'.id', $permissionTable.'.name', $permissionTable.'.slug', $permissionTable.'.description', $permissionTable.'.model', $permissionTable.'.created_at', $permissionTable.'.updated_at', $permissionTable.'.deleted_at', 'pivot_created_at', 'pivot_updated_at']);
         }
     }
 

diff --git a/src/config/roles.php b/src/config/roles.php
@@ -19,7 +19,7 @@
     'permissionsTable'      => env('ROLES_PERMISSIONS_DATABASE_TABLE', 'permissions'),
     'permissionsRoleTable'  => env('ROLES_PERMISSION_ROLE_DATABASE_TABLE', 'permission_role'),
     'permissionsUserTable'  => env('ROLES_PERMISSION_USER_DATABASE_TABLE', 'permission_user'),
-    
+
     /*
     |--------------------------------------------------------------------------
     | GUI routes custom prefix