@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | * Store a newly created resource in storage. |
| 53 | 53 | * |
| 54 | 54 | * @param CreateUserRequest $request |
| 55 | - * @return \Illuminate\Http\Response |
|
| 55 | + * @return \Illuminate\Http\JsonResponse |
|
| 56 | 56 | */ |
| 57 | 57 | public function store(CreateUserRequest $request) |
| 58 | 58 | { |
@@ -95,7 +95,6 @@ discard block |
||
| 95 | 95 | * @param UpdateUserRequest|Request $request |
| 96 | 96 | * @param $user_id |
| 97 | 97 | * @param $type Type of update info|password|adddevice|removedevice|addpor|removeport |
| 98 | - * @param int $id |
|
| 99 | 98 | * @return \Illuminate\Http\Response |
| 100 | 99 | */ |
| 101 | 100 | public function update(UpdateUserRequest $request, $user_id) |
@@ -111,7 +110,7 @@ discard block |
||
| 111 | 110 | * Remove the specified resource from storage. |
| 112 | 111 | * |
| 113 | 112 | * @param int $user_id |
| 114 | - * @return \Illuminate\Http\Response |
|
| 113 | + * @return \Illuminate\Http\JsonResponse |
|
| 115 | 114 | */ |
| 116 | 115 | public function destroy(DeleteUserRequest $request, $user_id) |
| 117 | 116 | { |
@@ -55,7 +55,7 @@ |
||
| 55 | 55 | { |
| 56 | 56 | if ($this->input('password')) { |
| 57 | 57 | $rules = ['password' => 'required|min:5|max:255', |
| 58 | - 'password_confirmation' => 'required|same:password', |
|
| 58 | + 'password_confirmation' => 'required|same:password', |
|
| 59 | 59 | ]; |
| 60 | 60 | if (!Auth::user()->isAdmin()) { |
| 61 | 61 | $rules['current_password'] = 'required|password:user_id'; |