Skip to content

Commit e921e6a

Browse files
authored
Larastan clean 3 (#37)
* Update UserActivityService.php - Parameter #2 $ttl of static method Illuminate\Support\Facades\Cache::remember() expects * Update FeedService.php - Match expression does not handle remaining value: mixed * Update AdminSetting.php - Expression on left side of ?? is not nullable. * Update SettingsController.php - Ternary operator condition is always true.
1 parent 6361013 commit e921e6a

4 files changed

Lines changed: 5 additions & 4 deletions

File tree

app/Http/Controllers/Api/SettingsController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function storeBio(UpdateProfileRequest $request)
3939
$originalData = $user->only(['name', 'bio']);
4040

4141
if ($request->filled('name')) {
42-
$name = $request->filled('name') ? $request->input('name') : AccountService::getDefaultDisplayName($user->profile_id);
42+
$name = $request->input('name') ?: AccountService::getDefaultDisplayName($user->profile_id);
4343
$profile->name = $this->purify($name);
4444
$user->name = $this->purify($name);
4545
$user->save();

app/Models/AdminSetting.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public static function set($key, $value, $type = 'object', $isPublic = false, $d
5959
'is_public' => $isPublic,
6060
'description' => $description,
6161
'updated_by' => auth()->id(),
62-
'version' => static::where('key', $key)->value('version') + 1 ?? 1,
62+
'version' => (static::where('key', $key)->value('version') ?? 0) + 1,
6363
]
6464
);
6565
}

app/Services/FeedService.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ public static function getAccountFeed($profileId, $limit, $sort)
1616
match ($sort) {
1717
'Latest' => $query->orderByDesc('id'),
1818
'Popular' => $query->orderByDesc('likes'),
19-
'Oldest' => $query->orderBy('created_at')
19+
'Oldest' => $query->orderBy('created_at'),
20+
default => $query->orderByDesc('id')
2021
};
2122
})
2223
->cursorPaginate(10);

app/Services/UserActivityService.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public function markActive(User $user, ?Carbon $ts = null): void
1515
$ymd = $ts->format('Ymd');
1616
$key = "ua:{$user->id}:{$ymd}";
1717

18-
$ttl = $ts->startOfDay()->addDay()->diffInSeconds($ts) + 5;
18+
$ttl = (int) ($ts->startOfDay()->addDay()->diffInSeconds($ts) + 5);
1919

2020
Cache::remember($key, $ttl, function () use ($ts, $user) {
2121
$user->forceFill(['last_active_at' => $ts])->saveQuietly();

0 commit comments

Comments
 (0)