@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | */ |
| 50 | 50 | public function store(UserRequest $request, User $model) |
| 51 | 51 | { |
| 52 | - $newUser = $model->create($request->merge(['password' => Hash::make($request->get('password'))])->all()); |
|
| 52 | + $newUser = $model->create($request->merge([ 'password' => Hash::make($request->get('password')) ])->all()); |
|
| 53 | 53 | $role = config('roles.models.role')::find($request->role); |
| 54 | 54 | $newUser->attachRole($role); |
| 55 | 55 | |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | */ |
| 66 | 66 | public function edit(User $user) |
| 67 | 67 | { |
| 68 | - $roles = []; |
|
| 68 | + $roles = [ ]; |
|
| 69 | 69 | $currentRole = ''; |
| 70 | 70 | $roles = config('roles.models.role')::all(); |
| 71 | 71 | |
@@ -93,9 +93,9 @@ discard block |
||
| 93 | 93 | public function update(UserRequest $request, User $user) |
| 94 | 94 | { |
| 95 | 95 | $user->update( |
| 96 | - $request->merge(['password' => Hash::make($request->get('password'))]) |
|
| 96 | + $request->merge([ 'password' => Hash::make($request->get('password')) ]) |
|
| 97 | 97 | ->except( |
| 98 | - [$request->get('password') ? '' : 'password'] |
|
| 98 | + [ $request->get('password') ? '' : 'password' ] |
|
| 99 | 99 | ) |
| 100 | 100 | ); |
| 101 | 101 | |