diff --git a/app/Http/Controllers/Api/WorkOrder/ReplyController.php b/app/Http/Controllers/Api/ReplyController.php similarity index 93% rename from app/Http/Controllers/Api/WorkOrder/ReplyController.php rename to app/Http/Controllers/Api/ReplyController.php index 61c840a..a33fa96 100644 --- a/app/Http/Controllers/Api/WorkOrder/ReplyController.php +++ b/app/Http/Controllers/Api/ReplyController.php @@ -1,6 +1,6 @@ thisUser()->with(['user', 'module', 'host'])->simplePaginate(100); @@ -18,6 +19,9 @@ public function index(WorkOrder $workOrder) return $this->success($workOrder); } + /** + * @throws \Illuminate\Validation\ValidationException + */ public function store(Request $request) { $this->validate($request, [ @@ -46,7 +50,7 @@ public function store(Request $request) return $this->success($workOrder); } - public function show(WorkOrder $workOrder) + public function show(WorkOrder $workOrder): JsonResponse { if (auth()->id() !== $workOrder->user_id) { return $this->notFound('无法找到对应的工单。'); @@ -56,6 +60,9 @@ public function show(WorkOrder $workOrder) return $this->success($workOrder); } + /** + * @throws \Illuminate\Validation\ValidationException + */ public function update(Request $request, WorkOrder $workOrder) { diff --git a/app/Http/Controllers/Modules/Host/HostController.php b/app/Http/Controllers/Modules/HostController.php similarity index 85% rename from app/Http/Controllers/Modules/Host/HostController.php rename to app/Http/Controllers/Modules/HostController.php index 6da4c18..678af48 100644 --- a/app/Http/Controllers/Modules/Host/HostController.php +++ b/app/Http/Controllers/Modules/HostController.php @@ -1,6 +1,6 @@ validate($request, [ @@ -76,7 +78,7 @@ public function store(Request $request) * * @return JsonResponse */ - public function show(Host $host) + public function show(Host $host): JsonResponse { return $this->success($host); @@ -92,8 +94,9 @@ public function show(Host $host) * @param Host $host * * @return JsonResponse + * @throws \Illuminate\Validation\ValidationException */ - public function update(Request $request, Host $host) + public function update(Request $request, Host $host): JsonResponse { // $this->validate($request, [ @@ -134,16 +137,14 @@ public function update(Request $request, Host $host) * * @return JsonResponse */ - public function destroy($host) + public function destroy($host): JsonResponse { if ($host instanceof Host) { $host->delete(); } else { $host = Host::findOrFail($host); - if ($host) { - $host->delete(); - } + $host?->delete(); } return $this->deleted($host); diff --git a/app/Http/Controllers/Modules/WorkOrder/ReplyController.php b/app/Http/Controllers/Modules/ReplyController.php similarity index 84% rename from app/Http/Controllers/Modules/WorkOrder/ReplyController.php rename to app/Http/Controllers/Modules/ReplyController.php index 86a226f..4d9b84b 100644 --- a/app/Http/Controllers/Modules/WorkOrder/ReplyController.php +++ b/app/Http/Controllers/Modules/ReplyController.php @@ -1,6 +1,6 @@ route('work_order'))->simplePaginate(10); @@ -28,7 +28,7 @@ public function index(Request $request) * * @return JsonResponse */ - public function store(Request $request) + public function store(Request $request): JsonResponse { // diff --git a/app/Http/Controllers/Modules/Host/TaskController.php b/app/Http/Controllers/Modules/TaskController.php similarity index 80% rename from app/Http/Controllers/Modules/Host/TaskController.php rename to app/Http/Controllers/Modules/TaskController.php index bc3287a..3d54fbc 100644 --- a/app/Http/Controllers/Modules/Host/TaskController.php +++ b/app/Http/Controllers/Modules/TaskController.php @@ -1,6 +1,6 @@ assignId($request); @@ -34,8 +34,9 @@ public function index(Request $request) * @param Request $request * * @return JsonResponse + * @throws \Illuminate\Validation\ValidationException */ - public function store(Request $request) + public function store(Request $request): JsonResponse { // $this->validate($request, [ @@ -56,8 +57,9 @@ public function store(Request $request) * @param Task $task * * @return JsonResponse + * @throws \Illuminate\Validation\ValidationException */ - public function update(Request $request, Task $task) + public function update(Request $request, Task $task): JsonResponse { // $this->validate($request, [ diff --git a/app/Http/Controllers/Modules/WorkOrder/WorkOrderController.php b/app/Http/Controllers/Modules/WorkOrderController.php similarity index 81% rename from app/Http/Controllers/Modules/WorkOrder/WorkOrderController.php rename to app/Http/Controllers/Modules/WorkOrderController.php index 7e8861d..3840f18 100644 --- a/app/Http/Controllers/Modules/WorkOrder/WorkOrderController.php +++ b/app/Http/Controllers/Modules/WorkOrderController.php @@ -1,16 +1,17 @@ success($workOrder); } - public function update(WorkOrderRequest $request, WorkOrder $workOrder) + /** + * @throws \Illuminate\Validation\ValidationException + */ + public function update(WorkOrderRequest $request, WorkOrder $workOrder): JsonResponse { $this->validate($request, [ 'status' => 'nullable|sometimes|string|in:open,closed,on_hold,in_progress', diff --git a/routes/api.php b/routes/api.php index 11d4358..3b67174 100644 --- a/routes/api.php +++ b/routes/api.php @@ -4,11 +4,11 @@ use App\Http\Controllers\Api\ForumController; use App\Http\Controllers\Api\HostController; use App\Http\Controllers\Api\ModuleController; +use App\Http\Controllers\Api\ReplyController; use App\Http\Controllers\Api\ServerController; use App\Http\Controllers\Api\TaskController; use App\Http\Controllers\Api\UserController; -use App\Http\Controllers\Api\WorkOrder\ReplyController; -use App\Http\Controllers\Api\WorkOrder\WorkOrderController; +use App\Http\Controllers\Api\WorkOrderController; use Illuminate\Support\Facades\Route; Route::get('user', [UserController::class, 'index']); diff --git a/routes/modules.php b/routes/modules.php index 6c38080..cb4fc2e 100644 --- a/routes/modules.php +++ b/routes/modules.php @@ -1,12 +1,12 @@