Skip to content

Commit 44da675

Browse files
authored
Merge pull request cbdb-project#473 from frankslin/claude/upgrade-carbon-v2-015aRNtCQazSqwNobdTtdKxa
chore: 升級 Carbon 1.x → 2.x
2 parents 52a0551 + b09d5fe commit 44da675

10 files changed

Lines changed: 198 additions & 116 deletions

app/Console/Commands/WikiTaskManager.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@ private function cancelTask($taskId)
174174
$progress['status'] = 'cancelled';
175175
$progress['message'] = '管理員從命令行取消了導入任務';
176176
$progress['progress'] = 0;
177-
$progress['completed_at'] = Carbon::now()->toDateTimeString();
178-
$progress['updated_at'] = Carbon::now()->toDateTimeString();
177+
$progress['completed_at'] = Carbon::now()->format('Y-m-d H:i:s');
178+
$progress['updated_at'] = Carbon::now()->format('Y-m-d H:i:s');
179179

180180
Cache::put($cacheKey, $progress, now()->addHour());
181181

app/Http/Controllers/CbdbTableMaintenanceController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ protected function logOperation($operation, $tableName, $count = null, $addition
193193
'table_name' => $tableName,
194194
'user_id' => Auth::id(),
195195
'user_name' => Auth::user()->name,
196-
'timestamp' => Carbon::now()->toDateTimeString(),
196+
'timestamp' => Carbon::now()->format('Y-m-d H:i:s'),
197197
];
198198

199199
if ($count !== null) {

app/Http/Controllers/CodesController.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ public function proposalUpdateExisting(Request $request, $table_name, $operation
479479
unset($meta['comment']);
480480
}
481481
unset($meta['cancelled_at'], $meta['cancelled_by'], $meta['cancelled_by_id'], $meta['cancel_reason']);
482-
$meta['updated_at'] = Carbon::now()->toDateTimeString();
482+
$meta['updated_at'] = Carbon::now()->format('Y-m-d H:i:s');
483483

484484
$newPayload = $data;
485485
$newPayload['__proposal_meta'] = $meta;
@@ -488,7 +488,7 @@ public function proposalUpdateExisting(Request $request, $table_name, $operation
488488

489489
$updates = [
490490
'resource_data' => json_encode($newPayload, JSON_UNESCAPED_UNICODE),
491-
'updated_at' => Carbon::now()->toDateTimeString(),
491+
'updated_at' => Carbon::now()->format('Y-m-d H:i:s'),
492492
];
493493

494494
if ($isCreate) {
@@ -522,14 +522,14 @@ public function proposalCancel(Request $request, $table_name, $operationId)
522522
$payload['__proposal_meta']['cancel_reason'] = $reason;
523523
}
524524

525-
$payload['__proposal_meta']['cancelled_at'] = Carbon::now()->toDateTimeString();
525+
$payload['__proposal_meta']['cancelled_at'] = Carbon::now()->format('Y-m-d H:i:s');
526526
$payload['__proposal_meta']['cancelled_by'] = Auth::user()->name ?? Auth::id();
527527
$payload['__proposal_meta']['cancelled_by_id'] = Auth::id();
528528
$this->markProposalCancelled($payload);
529529

530530
DB::table('operations')->where('id', $operation['id'])->update([
531531
'resource_data' => json_encode($payload, JSON_UNESCAPED_UNICODE),
532-
'updated_at' => Carbon::now()->toDateTimeString(),
532+
'updated_at' => Carbon::now()->format('Y-m-d H:i:s'),
533533
]);
534534

535535
flash('提案已撤回 @ '.Carbon::now(), 'info');
@@ -1139,7 +1139,7 @@ protected function buildProposalMeta(string $action, string $table, Request $req
11391139
'table' => $table,
11401140
'submitted_by' => $user ? ($user->name ?: $user->email ?: $user->id) : null,
11411141
'submitted_by_id' => $user ? $user->id : null,
1142-
'submitted_at' => Carbon::now()->toDateTimeString(),
1142+
'submitted_at' => Carbon::now()->format('Y-m-d H:i:s'),
11431143
];
11441144

11451145
$comment = trim((string) $request->input('__proposal_comment', ''));

app/Http/Controllers/OperationsProposalController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ protected function updateProposalStatus(Operation $proposal, string $status, str
232232
$payload['__review_status'] = $status;
233233
$payload['__reviewed_by'] = Auth::user()->name ?? Auth::id();
234234
$payload['__reviewed_by_id'] = Auth::id();
235-
$payload['__reviewed_at'] = Carbon::now()->toDateTimeString();
235+
$payload['__reviewed_at'] = Carbon::now()->format('Y-m-d H:i:s');
236236
if ($comment !== null && $comment !== '') {
237237
$payload['__review_comment'] = $comment;
238238
}

app/Http/Controllers/WikiMaintenanceController.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -473,8 +473,8 @@ private function initializeProgress($taskId, $sourceName)
473473
'progress' => 0,
474474
'message' => '準備開始導入...',
475475
'status' => 'running',
476-
'started_at' => Carbon::now()->toDateTimeString(),
477-
'updated_at' => Carbon::now()->toDateTimeString()
476+
'started_at' => Carbon::now()->format('Y-m-d H:i:s'),
477+
'updated_at' => Carbon::now()->format('Y-m-d H:i:s')
478478
];
479479

480480
cache([$cacheKey => $progressData], now()->addHour()); // 缓存1小时
@@ -488,10 +488,10 @@ private function updateProgress($taskId, $progress, $message, $status = 'running
488488
$progressData['progress'] = $progress;
489489
$progressData['message'] = $message;
490490
$progressData['status'] = $status;
491-
$progressData['updated_at'] = Carbon::now()->toDateTimeString();
491+
$progressData['updated_at'] = Carbon::now()->format('Y-m-d H:i:s');
492492

493493
if ($status === 'completed' || $status === 'error' || $status === 'cancelled') {
494-
$progressData['completed_at'] = Carbon::now()->toDateTimeString();
494+
$progressData['completed_at'] = Carbon::now()->format('Y-m-d H:i:s');
495495
}
496496

497497
cache([$cacheKey => $progressData], now()->addHour());
@@ -735,7 +735,7 @@ protected function logOperation($operation, $sourceId, $count = null, $additiona
735735
'source_id' => $sourceId,
736736
'user_id' => Auth::id(),
737737
'user_name' => Auth::user()->name,
738-
'timestamp' => Carbon::now()->toDateTimeString(),
738+
'timestamp' => Carbon::now()->format('Y-m-d H:i:s'),
739739
];
740740

741741
if ($count !== null) {

app/Services/NameFtsProgressService.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ public static function initialize(string $taskId, array $meta = []): void
1414
'progress' => 5,
1515
'message' => '已排程等待執行…',
1616
'status' => 'queued',
17-
'started_at' => Carbon::now()->toDateTimeString(),
18-
'updated_at' => Carbon::now()->toDateTimeString(),
17+
'started_at' => Carbon::now()->format('Y-m-d H:i:s'),
18+
'updated_at' => Carbon::now()->format('Y-m-d H:i:s'),
1919
]);
2020

2121
Cache::put(self::cacheKey($taskId), $data, now()->addHour());
@@ -30,10 +30,10 @@ public static function update(string $taskId, int $progress, string $message, st
3030
$data['progress'] = max(0, min(100, $progress));
3131
$data['message'] = $message;
3232
$data['status'] = $status;
33-
$data['updated_at'] = Carbon::now()->toDateTimeString();
33+
$data['updated_at'] = Carbon::now()->format('Y-m-d H:i:s');
3434

3535
if (in_array($status, ['completed', 'error'], true)) {
36-
$data['completed_at'] = Carbon::now()->toDateTimeString();
36+
$data['completed_at'] = Carbon::now()->format('Y-m-d H:i:s');
3737
}
3838

3939
Cache::put($key, $data, now()->addHour());

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"laravel/passport": "^7.0",
1414
"laravel/tinker": "^1.0",
1515
"naux/sendcloud": "^1.1",
16-
"nesbot/carbon": "^1.22"
16+
"nesbot/carbon": "^2.0"
1717
},
1818
"require-dev": {
1919
"fakerphp/faker": "^1.24",

0 commit comments

Comments
 (0)