Skip to content

Commit ca0bba7

Browse files
ElinksTeamElinksTeam
authored
Merge pull request #4 from ElinksTeam/copilot/improve-variable-and-function-names
Refactor: Replace non-descriptive variable names with semantic identifiers
2 parents 2874ba3 + 07630fa commit ca0bba7

16 files changed

Lines changed: 104 additions & 104 deletions

‎app/Console/Commands/MigrateFromV2b.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -164,20 +164,20 @@ public function MigrateV2ConfigToV2Settings()
164164
Artisan::call('config:clear');
165165
$configValue = config('v2board') ?? [];
166166

167-
foreach ($configValue as $k => $v) {
167+
foreach ($configValue as $configKey => $configVal) {
168168
// 检查记录是否已存在
169-
$existingSetting = Setting::where('name', $k)->first();
169+
$existingSetting = Setting::where('name', $configKey)->first();
170170

171171
// 如果记录不存在，则插入
172172
if ($existingSetting) {
173-
$this->warn("配置 {$k} 在数据库已经存在， 忽略");
173+
$this->warn("配置 {$configKey} 在数据库已经存在， 忽略");
174174
continue;
175175
}
176176
Setting::create([
177-
'name' => $k,
178-
'value' => is_array($v)? json_encode($v) : $v,
177+
'name' => $configKey,
178+
'value' => is_array($configVal)? json_encode($configVal) : $configVal,
179179
]);
180-
$this->info("配置 {$k} 迁移成功");
180+
$this->info("配置 {$configKey} 迁移成功");
181181
}
182182
Artisan::call('config:cache');
183183

‎app/Http/Controllers/V1/Client/AppController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ public function getConfig(Request $request)
5353
}
5454

5555
$config['proxies'] = array_merge($config['proxies'] ? $config['proxies'] : [], $proxy);
56-
foreach ($config['proxy-groups'] as $k => $v) {
57-
$config['proxy-groups'][$k]['proxies'] = array_merge($config['proxy-groups'][$k]['proxies'], $proxies);
56+
foreach ($config['proxy-groups'] as $groupIndex => $proxyGroup) {
57+
$config['proxy-groups'][$groupIndex]['proxies'] = array_merge($config['proxy-groups'][$groupIndex]['proxies'], $proxies);
5858
}
5959
return(Yaml::dump($config));
6060
}

‎app/Http/Controllers/V2/Admin/ConfigController.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -224,12 +224,12 @@ public function save(ConfigSave $request)
224224
{
225225
$data = $request->validated();
226226

227-
foreach ($data as $k => $v) {
228-
if ($k == 'frontend_theme') {
227+
foreach ($data as $configKey => $configValue) {
228+
if ($configKey == 'frontend_theme') {
229229
$themeService = app(ThemeService::class);
230-
$themeService->switch($v);
230+
$themeService->switch($configValue);
231231
}
232-
admin_setting([$k => $v]);
232+
admin_setting([$configKey => $configValue]);
233233
}
234234

235235
return $this->success(true);

‎app/Http/Controllers/V2/Admin/KnowledgeController.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ public function sort(Request $request)
8080
]);
8181
try {
8282
DB::beginTransaction();
83-
foreach ($request->input('ids') as $k => $v) {
84-
$knowledge = Knowledge::find($v);
83+
foreach ($request->input('ids') as $index => $knowledgeId) {
84+
$knowledge = Knowledge::find($knowledgeId);
8585
$knowledge->timestamps = false;
86-
$knowledge->update(['sort' => $k + 1]);
86+
$knowledge->update(['sort' => $index + 1]);
8787
}
8888
DB::commit();
8989
} catch (\Exception $e) {

‎app/Http/Controllers/V2/Admin/NoticeController.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ public function sort(Request $request)
8686

8787
try {
8888
DB::beginTransaction();
89-
foreach ($params['ids'] as $k => $v) {
90-
$notice = Notice::findOrFail($v);
91-
$notice->update(['sort' => $k + 1]);
89+
foreach ($params['ids'] as $index => $noticeId) {
90+
$notice = Notice::findOrFail($noticeId);
91+
$notice->update(['sort' => $index + 1]);
9292
}
9393
DB::commit();
9494
return $this->success(true);

‎app/Http/Controllers/V2/Admin/PaymentController.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ public function getPaymentMethods()
2626
public function fetch()
2727
{
2828
$payments = Payment::orderBy('sort', 'ASC')->get();
29-
foreach ($payments as $k => $v) {
30-
$notifyUrl = url("/api/v1/guest/payment/notify/{$v->payment}/{$v->uuid}");
31-
if ($v->notify_domain) {
29+
foreach ($payments as $index => $payment) {
30+
$notifyUrl = url("/api/v1/guest/payment/notify/{$payment->payment}/{$payment->uuid}");
31+
if ($payment->notify_domain) {
3232
$parseUrl = parse_url($notifyUrl);
33-
$notifyUrl = $v->notify_domain . $parseUrl['path'];
33+
$notifyUrl = $payment->notify_domain . $parseUrl['path'];
3434
}
35-
$payments[$k]['notify_url'] = $notifyUrl;
35+
$payments[$index]['notify_url'] = $notifyUrl;
3636
}
3737
return $this->success($payments);
3838
}
@@ -117,8 +117,8 @@ public function sort(Request $request)
117117
]);
118118
try {
119119
DB::beginTransaction();
120-
foreach ($request->input('ids') as $k => $v) {
121-
if (!Payment::find($v)->update(['sort' => $k + 1])) {
120+
foreach ($request->input('ids') as $index => $paymentId) {
121+
if (!Payment::find($paymentId)->update(['sort' => $index + 1])) {
122122
throw new \Exception();
123123
}
124124
}

‎app/Http/Controllers/V2/Admin/PlanController.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ public function fetch(Request $request)
2222
->withCount([
2323
'users',
2424
'users as active_users_count' => function ($query) {
25-
$query->where(function ($q) {
26-
$q->where('expired_at', '>', time())
25+
$query->where(function ($queryBuilder) {
26+
$queryBuilder->where('expired_at', '>', time())
2727
->orWhereNull('expired_at');
2828
});
2929
}
@@ -116,8 +116,8 @@ public function sort(Request $request)
116116

117117
try {
118118
DB::beginTransaction();
119-
foreach ($params['ids'] as $k => $v) {
120-
if (!Plan::find($v)->update(['sort' => $k + 1])) {
119+
foreach ($params['ids'] as $index => $planId) {
120+
if (!Plan::find($planId)->update(['sort' => $index + 1])) {
121121
throw new \Exception();
122122
}
123123
}

‎app/Http/Controllers/V2/Admin/SystemController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ public function getSystemLog(Request $request)
137137
return $query->where('level', strtoupper($level));
138138
})
139139
->when($keyword, function ($query) use ($keyword) {
140-
return $query->where(function ($q) use ($keyword) {
141-
$q->where('data', 'like', '%' . $keyword . '%')
140+
return $query->where(function ($queryBuilder) use ($keyword) {
141+
$queryBuilder->where('data', 'like', '%' . $keyword . '%')
142142
->orWhere('context', 'like', '%' . $keyword . '%')
143143
->orWhere('title', 'like', '%' . $keyword . '%')
144144
->orWhere('uri', 'like', '%' . $keyword . '%');

‎app/Http/Controllers/V2/Admin/TicketController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ private function fetchTickets(Request $request)
7676
$query->whereIn('reply_status', $request->input('reply_status'));
7777
})
7878
->when($request->has('email'), function ($query) use ($request) {
79-
$query->whereHas('user', function ($q) use ($request) {
80-
$q->where('email', $request->input('email'));
79+
$query->whereHas('user', function ($queryBuilder) use ($request) {
80+
$queryBuilder->where('email', $request->input('email'));
8181
});
8282
});
8383

‎app/Http/Controllers/V2/Admin/UserController.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,14 @@ private function buildFilterQuery(Builder $query, string $field, mixed $value):
8383
// 处理关联查询
8484
if (str_contains($field, '.')) {
8585
[$relation, $relationField] = explode('.', $field);
86-
$query->whereHas($relation, function ($q) use ($relationField, $value) {
86+
$query->whereHas($relation, function ($queryBuilder) use ($relationField, $value) {
8787
if (is_array($value)) {
88-
$q->whereIn($relationField, $value);
88+
$queryBuilder->whereIn($relationField, $value);
8989
} else if (is_string($value) && str_contains($value, ':')) {
9090
[$operator, $filterValue] = explode(':', $value, 2);
91-
$this->applyQueryCondition($q, $relationField, $operator, $filterValue);
91+
$this->applyQueryCondition($queryBuilder, $relationField, $operator, $filterValue);
9292
} else {
93-
$q->where($relationField, 'like', "%{$value}%");
93+
$queryBuilder->where($relationField, 'like', "%{$value}%");
9494
}
9595
});
9696
return;

0 commit comments

Comments
 (0)