@@ -170,10 +170,11 @@ |
||
| 170 | 170 | |
| 171 | 171 | $rolesRepo->updateOne($role, $data); |
| 172 | 172 | |
| 173 | - if (empty($permissions = $data['permissions'] ?: [])) |
|
| 174 | - $rolesRepo->detachAllPermissions($role); |
|
| 175 | - else |
|
| 176 | - $rolesRepo->syncPermissionsByUuids($role, $permissions); |
|
| 173 | + if (empty($permissions = $data['permissions'] ?: [])) { |
|
| 174 | + $rolesRepo->detachAllPermissions($role); |
|
| 175 | + } else { |
|
| 176 | + $rolesRepo->syncPermissionsByUuids($role, $permissions); |
|
| 177 | + } |
|
| 177 | 178 | |
| 178 | 179 | return redirect()->route('admin::authorization.roles.show', [$role]); |
| 179 | 180 | } |
@@ -31,8 +31,9 @@ |
||
| 31 | 31 | */ |
| 32 | 32 | public function handle($request, Closure $next, $guard = null) |
| 33 | 33 | { |
| 34 | - if (Auth::guard($guard)->check()) |
|
| 35 | - Auth::guard($guard)->user()->updateLastActivity(); |
|
| 34 | + if (Auth::guard($guard)->check()) { |
|
| 35 | + Auth::guard($guard)->user()->updateLastActivity(); |
|
| 36 | + } |
|
| 36 | 37 | |
| 37 | 38 | return $next($request); |
| 38 | 39 | } |
@@ -98,8 +98,9 @@ discard block |
||
| 98 | 98 | { |
| 99 | 99 | $session = $this->findSession($sessionId); |
| 100 | 100 | |
| 101 | - if (is_null($session)) |
|
| 102 | - return ''; |
|
| 101 | + if (is_null($session)) { |
|
| 102 | + return ''; |
|
| 103 | + } |
|
| 103 | 104 | |
| 104 | 105 | if ($session->hasExpired()) { |
| 105 | 106 | $this->exists = true; |
@@ -148,8 +149,7 @@ discard block |
||
| 148 | 149 | |
| 149 | 150 | try { |
| 150 | 151 | return $this->repo->newModelInstance($attributes)->save(); |
| 151 | - } |
|
| 152 | - catch (QueryException $e) { |
|
| 152 | + } catch (QueryException $e) { |
|
| 153 | 153 | $this->performUpdate($sessionId, $attributes); |
| 154 | 154 | } |
| 155 | 155 | |
@@ -72,8 +72,9 @@ discard block |
||
| 72 | 72 | */ |
| 73 | 73 | private static function getAuthProviderKey($notifiable): string |
| 74 | 74 | { |
| 75 | - if ($notifiable instanceof Administrator) |
|
| 76 | - return 'admins'; |
|
| 75 | + if ($notifiable instanceof Administrator) { |
|
| 76 | + return 'admins'; |
|
| 77 | + } |
|
| 77 | 78 | |
| 78 | 79 | return 'users'; |
| 79 | 80 | } |
@@ -87,8 +88,9 @@ discard block |
||
| 87 | 88 | */ |
| 88 | 89 | protected static function getPasswordResetRoute($authProviderKey): string |
| 89 | 90 | { |
| 90 | - if ($authProviderKey === 'admins') |
|
| 91 | - return 'admin::auth.password.reset'; |
|
| 91 | + if ($authProviderKey === 'admins') { |
|
| 92 | + return 'admin::auth.password.reset'; |
|
| 93 | + } |
|
| 92 | 94 | |
| 93 | 95 | return 'auth::password.reset'; |
| 94 | 96 | } |
@@ -197,8 +197,9 @@ discard block |
||
| 197 | 197 | */ |
| 198 | 198 | public function activate(Administrator $administrator, User $user = null) |
| 199 | 199 | { |
| 200 | - if ( ! is_null($user) && $user->isActive()) |
|
| 201 | - return false; |
|
| 200 | + if ( ! is_null($user) && $user->isActive()) { |
|
| 201 | + return false; |
|
| 202 | + } |
|
| 202 | 203 | } |
| 203 | 204 | |
| 204 | 205 | /** |
@@ -211,8 +212,9 @@ discard block |
||
| 211 | 212 | */ |
| 212 | 213 | public function deactivate(Administrator $administrator, User $user = null) |
| 213 | 214 | { |
| 214 | - if ( ! is_null($user) && ! $user->isActive()) |
|
| 215 | - return false; |
|
| 215 | + if ( ! is_null($user) && ! $user->isActive()) { |
|
| 216 | + return false; |
|
| 217 | + } |
|
| 216 | 218 | } |
| 217 | 219 | |
| 218 | 220 | /** |
@@ -225,8 +227,9 @@ discard block |
||
| 225 | 227 | */ |
| 226 | 228 | public function delete(Administrator $administrator, User $user = null) |
| 227 | 229 | { |
| 228 | - if ( ! is_null($user)) |
|
| 229 | - return $user->isDeletable(); |
|
| 230 | + if ( ! is_null($user)) { |
|
| 231 | + return $user->isDeletable(); |
|
| 232 | + } |
|
| 230 | 233 | } |
| 231 | 234 | |
| 232 | 235 | /** |
@@ -239,8 +242,9 @@ discard block |
||
| 239 | 242 | */ |
| 240 | 243 | public function forceDelete(Administrator $administrator, User $user = null) |
| 241 | 244 | { |
| 242 | - if ( ! is_null($user)) |
|
| 243 | - return $user->isDeletable(); |
|
| 245 | + if ( ! is_null($user)) { |
|
| 246 | + return $user->isDeletable(); |
|
| 247 | + } |
|
| 244 | 248 | } |
| 245 | 249 | |
| 246 | 250 | /** |
@@ -109,7 +109,8 @@ |
||
| 109 | 109 | */ |
| 110 | 110 | public function detachRole(Administrator $administrator, Permission $permission = null, Role $role = null) |
| 111 | 111 | { |
| 112 | - if ( ! is_null($role)) |
|
| 113 | - return ! $role->isLocked(); |
|
| 112 | + if ( ! is_null($role)) { |
|
| 113 | + return ! $role->isLocked(); |
|
| 114 | + } |
|
| 114 | 115 | } |
| 115 | 116 | } |
@@ -147,8 +147,9 @@ discard block |
||
| 147 | 147 | */ |
| 148 | 148 | public function show(Administrator $administrator, Administrator $model = null) |
| 149 | 149 | { |
| 150 | - if ($model && $model->isSuperAdmin() && ! $administrator->isSuperAdmin()) |
|
| 151 | - return false; |
|
| 150 | + if ($model && $model->isSuperAdmin() && ! $administrator->isSuperAdmin()) { |
|
| 151 | + return false; |
|
| 152 | + } |
|
| 152 | 153 | } |
| 153 | 154 | |
| 154 | 155 | /** |
@@ -186,14 +187,17 @@ discard block |
||
| 186 | 187 | */ |
| 187 | 188 | public function activate(Administrator $administrator, Administrator $model = null) |
| 188 | 189 | { |
| 189 | - if ( ! is_null($model) && $model->isActive()) |
|
| 190 | - return false; |
|
| 190 | + if ( ! is_null($model) && $model->isActive()) { |
|
| 191 | + return false; |
|
| 192 | + } |
|
| 191 | 193 | |
| 192 | - if ($administrator->is($model)) |
|
| 193 | - return false; |
|
| 194 | + if ($administrator->is($model)) { |
|
| 195 | + return false; |
|
| 196 | + } |
|
| 194 | 197 | |
| 195 | - if ( ! is_null($model) && $model->isSuperAdmin()) |
|
| 196 | - return false; |
|
| 198 | + if ( ! is_null($model) && $model->isSuperAdmin()) { |
|
| 199 | + return false; |
|
| 200 | + } |
|
| 197 | 201 | } |
| 198 | 202 | |
| 199 | 203 | /** |
@@ -206,14 +210,17 @@ discard block |
||
| 206 | 210 | */ |
| 207 | 211 | public function deactivate(Administrator $administrator, Administrator $model = null) |
| 208 | 212 | { |
| 209 | - if ( ! is_null($model) && ! $model->isActive()) |
|
| 210 | - return false; |
|
| 213 | + if ( ! is_null($model) && ! $model->isActive()) { |
|
| 214 | + return false; |
|
| 215 | + } |
|
| 211 | 216 | |
| 212 | - if ($administrator->is($model)) |
|
| 213 | - return false; |
|
| 217 | + if ($administrator->is($model)) { |
|
| 218 | + return false; |
|
| 219 | + } |
|
| 214 | 220 | |
| 215 | - if ( ! is_null($model) && $model->isSuperAdmin()) |
|
| 216 | - return false; |
|
| 221 | + if ( ! is_null($model) && $model->isSuperAdmin()) { |
|
| 222 | + return false; |
|
| 223 | + } |
|
| 217 | 224 | } |
| 218 | 225 | |
| 219 | 226 | /** |
@@ -226,11 +233,13 @@ discard block |
||
| 226 | 233 | */ |
| 227 | 234 | public function delete(Administrator $administrator, Administrator $model = null) |
| 228 | 235 | { |
| 229 | - if ($administrator->is($model)) |
|
| 230 | - return false; |
|
| 236 | + if ($administrator->is($model)) { |
|
| 237 | + return false; |
|
| 238 | + } |
|
| 231 | 239 | |
| 232 | - if ( ! is_null($model)) |
|
| 233 | - return $model->isDeletable(); |
|
| 240 | + if ( ! is_null($model)) { |
|
| 241 | + return $model->isDeletable(); |
|
| 242 | + } |
|
| 234 | 243 | } |
| 235 | 244 | |
| 236 | 245 | /** |
@@ -243,8 +252,9 @@ discard block |
||
| 243 | 252 | */ |
| 244 | 253 | public function forceDelete(Administrator $administrator, Administrator $model = null) |
| 245 | 254 | { |
| 246 | - if ( ! is_null($model)) |
|
| 247 | - return $model->isDeletable(); |
|
| 255 | + if ( ! is_null($model)) { |
|
| 256 | + return $model->isDeletable(); |
|
| 257 | + } |
|
| 248 | 258 | } |
| 249 | 259 | |
| 250 | 260 | /** |
@@ -257,7 +267,8 @@ discard block |
||
| 257 | 267 | */ |
| 258 | 268 | public function restore(Administrator $administrator, Administrator $model = null) |
| 259 | 269 | { |
| 260 | - if ( ! is_null($model)) |
|
| 261 | - return $model->trashed(); |
|
| 270 | + if ( ! is_null($model)) { |
|
| 271 | + return $model->trashed(); |
|
| 272 | + } |
|
| 262 | 273 | } |
| 263 | 274 | } |
@@ -129,8 +129,9 @@ discard block |
||
| 129 | 129 | */ |
| 130 | 130 | public function show(Administrator $administrator, Role $role = null) |
| 131 | 131 | { |
| 132 | - if ($role && $role->isAdministrator() && ! $administrator->isSuperAdmin()) |
|
| 133 | - return false; |
|
| 132 | + if ($role && $role->isAdministrator() && ! $administrator->isSuperAdmin()) { |
|
| 133 | + return false; |
|
| 134 | + } |
|
| 134 | 135 | } |
| 135 | 136 | |
| 136 | 137 | /** |
@@ -155,8 +156,9 @@ discard block |
||
| 155 | 156 | */ |
| 156 | 157 | public function update(Administrator $administrator, Role $role = null) |
| 157 | 158 | { |
| 158 | - if (static::isRoleLocked($role)) |
|
| 159 | - return false; |
|
| 159 | + if (static::isRoleLocked($role)) { |
|
| 160 | + return false; |
|
| 161 | + } |
|
| 160 | 162 | } |
| 161 | 163 | |
| 162 | 164 | /** |
@@ -169,11 +171,13 @@ discard block |
||
| 169 | 171 | */ |
| 170 | 172 | public function activate(Administrator $administrator, Role $role = null) |
| 171 | 173 | { |
| 172 | - if (static::isRoleLocked($role)) |
|
| 173 | - return false; |
|
| 174 | + if (static::isRoleLocked($role)) { |
|
| 175 | + return false; |
|
| 176 | + } |
|
| 174 | 177 | |
| 175 | - if ( ! is_null($role) && $role->isActive()) |
|
| 176 | - return false; |
|
| 178 | + if ( ! is_null($role) && $role->isActive()) { |
|
| 179 | + return false; |
|
| 180 | + } |
|
| 177 | 181 | } |
| 178 | 182 | |
| 179 | 183 | /** |
@@ -186,11 +190,13 @@ discard block |
||
| 186 | 190 | */ |
| 187 | 191 | public function deactivate(Administrator $administrator, Role $role = null) |
| 188 | 192 | { |
| 189 | - if (static::isRoleLocked($role)) |
|
| 190 | - return false; |
|
| 193 | + if (static::isRoleLocked($role)) { |
|
| 194 | + return false; |
|
| 195 | + } |
|
| 191 | 196 | |
| 192 | - if ( ! is_null($role) && ! $role->isActive()) |
|
| 193 | - return false; |
|
| 197 | + if ( ! is_null($role) && ! $role->isActive()) { |
|
| 198 | + return false; |
|
| 199 | + } |
|
| 194 | 200 | } |
| 195 | 201 | |
| 196 | 202 | /** |
@@ -203,8 +209,9 @@ discard block |
||
| 203 | 209 | */ |
| 204 | 210 | public function delete(Administrator $administrator, Role $role = null) |
| 205 | 211 | { |
| 206 | - if ( ! is_null($role)) |
|
| 207 | - return $role->isDeletable(); |
|
| 212 | + if ( ! is_null($role)) { |
|
| 213 | + return $role->isDeletable(); |
|
| 214 | + } |
|
| 208 | 215 | } |
| 209 | 216 | |
| 210 | 217 | /** |
@@ -218,8 +225,9 @@ discard block |
||
| 218 | 225 | */ |
| 219 | 226 | public function detachAdministrator(Administrator $administrator, Role $role = null, Administrator $model = null) |
| 220 | 227 | { |
| 221 | - if ( ! $administrator->isSuperAdmin() && $model->isSuperAdmin()) |
|
| 222 | - return false; |
|
| 228 | + if ( ! $administrator->isSuperAdmin() && $model->isSuperAdmin()) { |
|
| 229 | + return false; |
|
| 230 | + } |
|
| 223 | 231 | } |
| 224 | 232 | |
| 225 | 233 | /** |
@@ -233,8 +241,9 @@ discard block |
||
| 233 | 241 | */ |
| 234 | 242 | public function detachPermission(Administrator $administrator, Role $role = null, Permission $model = null) |
| 235 | 243 | { |
| 236 | - if (static::isRoleLocked($role)) |
|
| 237 | - return false; |
|
| 244 | + if (static::isRoleLocked($role)) { |
|
| 245 | + return false; |
|
| 246 | + } |
|
| 238 | 247 | } |
| 239 | 248 | |
| 240 | 249 | /* ----------------------------------------------------------------- |
@@ -28,8 +28,9 @@ |
||
| 28 | 28 | */ |
| 29 | 29 | public function setPasswordAttribute($password) |
| 30 | 30 | { |
| 31 | - if (is_null($password)) |
|
| 32 | - return; |
|
| 31 | + if (is_null($password)) { |
|
| 32 | + return; |
|
| 33 | + } |
|
| 33 | 34 | |
| 34 | 35 | $this->attributes['password'] = Hash::make($password); |
| 35 | 36 | } |