Skip to content

Commit 07630fa

Browse files
CopilotElinksTeam
andcommitted
Refactor: Replace remaining single-letter closure and function parameters
Co-authored-by: ElinksTeam <233157977+ElinksTeam@users.noreply.github.com>
1 parent eb67da3 commit 07630fa

4 files changed

Lines changed: 24 additions & 24 deletions

File tree

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

Lines changed: 2 additions & 2 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
}

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/Jobs/StatUserJob.php

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -51,31 +51,31 @@ public function handle(): void
5151
? strtotime(date('Y-m-01'))
5252
: strtotime(date('Y-m-d'));
5353

54-
foreach ($this->data as $uid => $v) {
54+
foreach ($this->data as $uid => $trafficData) {
5555
try {
56-
$this->processUserStat($uid, $v, $recordAt);
56+
$this->processUserStat($uid, $trafficData, $recordAt);
5757
} catch (\Exception $e) {
5858
Log::error('StatUserJob failed for user ' . $uid . ': ' . $e->getMessage());
5959
throw $e;
6060
}
6161
}
6262
}
6363

64-
protected function processUserStat(int $uid, array $v, int $recordAt): void
64+
protected function processUserStat(int $uid, array $trafficData, int $recordAt): void
6565
{
6666
$driver = config('database.default');
6767
if ($driver === 'sqlite') {
68-
$this->processUserStatForSqlite($uid, $v, $recordAt);
68+
$this->processUserStatForSqlite($uid, $trafficData, $recordAt);
6969
} elseif ($driver === 'pgsql') {
70-
$this->processUserStatForPostgres($uid, $v, $recordAt);
70+
$this->processUserStatForPostgres($uid, $trafficData, $recordAt);
7171
} else {
72-
$this->processUserStatForOtherDatabases($uid, $v, $recordAt);
72+
$this->processUserStatForOtherDatabases($uid, $trafficData, $recordAt);
7373
}
7474
}
7575

76-
protected function processUserStatForSqlite(int $uid, array $v, int $recordAt): void
76+
protected function processUserStatForSqlite(int $uid, array $trafficData, int $recordAt): void
7777
{
78-
DB::transaction(function () use ($uid, $v, $recordAt) {
78+
DB::transaction(function () use ($uid, $trafficData, $recordAt) {
7979
$existingRecord = StatUser::where([
8080
'user_id' => $uid,
8181
'server_rate' => $this->server['rate'],
@@ -85,8 +85,8 @@ protected function processUserStatForSqlite(int $uid, array $v, int $recordAt):
8585

8686
if ($existingRecord) {
8787
$existingRecord->update([
88-
'u' => $existingRecord->u + ($v[0] * $this->server['rate']),
89-
'd' => $existingRecord->d + ($v[1] * $this->server['rate']),
88+
'u' => $existingRecord->u + ($trafficData[0] * $this->server['rate']),
89+
'd' => $existingRecord->d + ($trafficData[1] * $this->server['rate']),
9090
'updated_at' => time(),
9191
]);
9292
} else {
@@ -95,25 +95,25 @@ protected function processUserStatForSqlite(int $uid, array $v, int $recordAt):
9595
'server_rate' => $this->server['rate'],
9696
'record_at' => $recordAt,
9797
'record_type' => $this->recordType,
98-
'u' => ($v[0] * $this->server['rate']),
99-
'd' => ($v[1] * $this->server['rate']),
98+
'u' => ($trafficData[0] * $this->server['rate']),
99+
'd' => ($trafficData[1] * $this->server['rate']),
100100
'created_at' => time(),
101101
'updated_at' => time(),
102102
]);
103103
}
104104
}, 3);
105105
}
106106

107-
protected function processUserStatForOtherDatabases(int $uid, array $v, int $recordAt): void
107+
protected function processUserStatForOtherDatabases(int $uid, array $trafficData, int $recordAt): void
108108
{
109109
StatUser::upsert(
110110
[
111111
'user_id' => $uid,
112112
'server_rate' => $this->server['rate'],
113113
'record_at' => $recordAt,
114114
'record_type' => $this->recordType,
115-
'u' => ($v[0] * $this->server['rate']),
116-
'd' => ($v[1] * $this->server['rate']),
115+
'u' => ($trafficData[0] * $this->server['rate']),
116+
'd' => ($trafficData[1] * $this->server['rate']),
117117
'created_at' => time(),
118118
'updated_at' => time(),
119119
],
@@ -129,12 +129,12 @@ protected function processUserStatForOtherDatabases(int $uid, array $v, int $rec
129129
/**
130130
* PostgreSQL upsert with arithmetic increments using ON CONFLICT ... DO UPDATE
131131
*/
132-
protected function processUserStatForPostgres(int $uid, array $v, int $recordAt): void
132+
protected function processUserStatForPostgres(int $uid, array $trafficData, int $recordAt): void
133133
{
134134
$table = (new StatUser())->getTable();
135135
$now = time();
136-
$u = ($v[0] * $this->server['rate']);
137-
$d = ($v[1] * $this->server['rate']);
136+
$u = ($trafficData[0] * $this->server['rate']);
137+
$d = ($trafficData[1] * $this->server['rate']);
138138

139139
$sql = "INSERT INTO {$table} (user_id, server_rate, record_at, record_type, u, d, created_at, updated_at)
140140
VALUES (?, ?, ?, ?, ?, ?, ?, ?)

0 commit comments

Comments
 (0)