jeremykenedy / laravel-roles

src/Traits/HasRoleAndPermission.php

Spacing +7 added lines, -7 removed lines

@@ -113,7 +113,7 @@ 
      */
     public function checkRole($role)
     {
-        return $this->getRoles()->contains(function ($value) use ($role) {
+        return $this->getRoles()->contains(function($value) use ($role) {
             return $role == $value->id || Str::is($role, $value->slug);
         });
     }
@@ -203,9 +203,9 @@ 
             return $permissionModel
                 ::select(['permissions.*', 'permission_role.created_at as pivot_created_at', 'permission_role.updated_at as pivot_updated_at'])
                 ->join('permission_role', 'permission_role.permission_id', '=', 'permissions.id')
-                ->join($roleTable, $roleTable . '.id', '=', 'permission_role.role_id')
-                ->whereIn($roleTable . '.id', $this->getRoles()->pluck('id')->toArray())
-                ->orWhere($roleTable . '.level', '<', $this->level())
+                ->join($roleTable, $roleTable.'.id', '=', 'permission_role.role_id')
+                ->whereIn($roleTable.'.id', $this->getRoles()->pluck('id')->toArray())
+                ->orWhere($roleTable.'.level', '<', $this->level())
                 ->groupBy(['permissions.id', 'permissions.name', 'permissions.slug', 'permissions.description', 'permissions.model', 'permissions.created_at', 'permissions.updated_at', 'permissions.deleted_at', 'pivot_created_at', 'pivot_updated_at']);
         } 
         else 
@@ -213,8 +213,8 @@ 
             return $permissionModel
                 ::select(['permissions.*', 'permission_role.created_at as pivot_created_at', 'permission_role.updated_at as pivot_updated_at'])
                 ->join('permission_role', 'permission_role.permission_id', '=', 'permissions.id')
-                ->join($roleTable, $roleTable . '.id', '=', 'permission_role.role_id')
-                ->whereIn($roleTable . '.id', $this->getRoles()->pluck('id')->toArray())
+                ->join($roleTable, $roleTable.'.id', '=', 'permission_role.role_id')
+                ->whereIn($roleTable.'.id', $this->getRoles()->pluck('id')->toArray())
                 ->groupBy(['permissions.id', 'permissions.name', 'permissions.slug', 'permissions.description', 'permissions.model', 'permissions.created_at', 'permissions.updated_at', 'permissions.deleted_at', 'pivot_created_at', 'pivot_updated_at']);
         }
     }
@@ -305,7 +305,7 @@ 
      */
     public function checkPermission($permission)
     {
-        return $this->getPermissions()->contains(function ($value) use ($permission) {
+        return $this->getPermissions()->contains(function($value) use ($permission) {
             return $permission == $value->id || Str::is($permission, $value->slug);
         });
     }

Braces +1 added lines, -2 removed lines

@@ -207,8 +207,7 @@
                 ->whereIn($roleTable . '.id', $this->getRoles()->pluck('id')->toArray())
                 ->orWhere($roleTable . '.level', '<', $this->level())
                 ->groupBy(['permissions.id', 'permissions.name', 'permissions.slug', 'permissions.description', 'permissions.model', 'permissions.created_at', 'permissions.updated_at', 'permissions.deleted_at', 'pivot_created_at', 'pivot_updated_at']);
-        } 
-        else 
+        } else 
         {
             return $permissionModel
                 ::select(['permissions.*', 'permission_role.created_at as pivot_created_at', 'permission_role.updated_at as pivot_updated_at'])