Merge pull request #146 from jeremykenedy/analysis-6416KP

Apply fixes from StyleCI
jeremykenedy · Jan 2, 2021 · 0d46018 · 0d46018
2 parents 9ddac0f + 563b8ff
commit 0d46018
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/src/Database/Seeders/publish/UsersTableSeeder.php b/src/Database/Seeders/publish/UsersTableSeeder.php
@@ -41,7 +41,6 @@ public function run()
                 'password' => bcrypt('password'),
             ]);
 
-            $newUser;
             $newUser->attachRole($userRole);
         }
     }

diff --git a/src/Traits/HasRoleAndPermission.php b/src/Traits/HasRoleAndPermission.php
@@ -203,18 +203,16 @@ public function rolePermissions()
             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 
-        {
+        } else {
             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']);
         }
     }