fix: resolve PHPStan static analysis warnings

This commit is contained in:
xboard
2025-05-07 19:48:19 +08:00
parent db235c10e8
commit 97e7ffccae
86 changed files with 2335 additions and 1206 deletions

View File

@@ -55,13 +55,10 @@ class TicketController extends Controller
if (!$ticket) {
return $this->fail([400202, '工单不存在']);
}
$ticket->user = UserController::transformUserData($ticket->user);
$ticket->messages->each(function ($message) use ($ticket) {
$message->is_me = $message->user_id !== $ticket->user_id;
$result = $ticket->toArray();
$result['user'] = UserController::transformUserData($ticket->user);
});
return $this->success($ticket);
return $this->success($result);
}
/**
@@ -91,12 +88,16 @@ class TicketController extends Controller
perPage: $request->integer('pageSize', 10),
page: $request->integer('current', 1)
);
$tickets->getCollection()->transform(function ($ticket) {
$ticket->user = UserController::transformUserData($ticket->user);
return $ticket;
});
// 获取items然后映射转换
$items = collect($tickets->items())->map(function ($ticket) {
$ticketData = $ticket->toArray();
$ticketData['user'] = UserController::transformUserData($ticket->user);
return $ticketData;
})->all();
return response([
'data' => $tickets->items(),
'data' => $items,
'total' => $tickets->total()
]);
}
@@ -137,4 +138,19 @@ class TicketController extends Controller
return $this->fail([500101, '关闭失败']);
}
}
public function show($ticketId)
{
$ticket = Ticket::with([
'user',
'messages' => function ($query) {
$query->with(['user']); // 如果需要用户信息
}
])->findOrFail($ticketId);
// 自动包含 is_me 属性
return response()->json([
'data' => $ticket
]);
}
}