🆙 Fix more errors php stan 🆙

This commit is contained in:
Remco
2026-01-19 17:50:34 +01:00
parent 521f9c884c
commit 649f9f311d
26 changed files with 210 additions and 68 deletions
@@ -14,7 +14,11 @@ use Illuminate\View\View;
class AccountSettingsController extends Controller
{
public function __construct(private readonly SessionService $sessionService, private readonly UserService $userService, private readonly RconService $rconService) {}
public function __construct(
private readonly SessionService $sessionService,
private readonly UserService $userService,
private readonly RconService $rconService
): void {}
public function edit(): View
{
@@ -6,24 +6,25 @@ use App\Http\Controllers\Controller;
use App\Models\PasswordResetToken;
use App\Models\User;
use Carbon\Carbon;
use Illuminate\Contracts\View\View;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Str;
use Mail;
class ForgotPasswordController extends Controller
{
public function __invoke()
public function __invoke(): View
{
return view('auth.passwords.forget');
}
public function submitForgetPassword(Request $request)
public function submitForgetPassword(Request $request): RedirectResponse
{
$request->validate([
'mail' => ['required', 'email'],
]);
// Do not tell the user that this email does not exist to prevent possible attacks
if (User::where('mail', $request->mail)->exists()) {
$token = Str::uuid();
PasswordResetToken::create([
@@ -40,14 +41,14 @@ class ForgotPasswordController extends Controller
return back()->with('success', __('We have e-mailed your password reset link!'));
}
public function showResetPassword(Request $request, string $token)
public function showResetPassword(Request $request, string $token): View|RedirectResponse
{
$prt = PasswordResetToken::select('token', 'created_at')->where('token', $token)->first();
if ($prt === null) {
return to_route('forgot.password.get')->withErrors('message', __('This token has expired!'));
}
$tokenExpiration = \Illuminate\Support\Facades\Date::now()->subMinutes(config('habbo.password_reset_token_time'));
if ($prt->created_at->gte($tokenExpiration)) { // gte = greater than or equals
if ($prt->created_at->gte($tokenExpiration)) {
$prt->delete();
return to_route('forgot.password.get')->withErrors('message', __('This token has expired!'));
@@ -58,7 +59,7 @@ class ForgotPasswordController extends Controller
]);
}
public function submitResetPassword(Request $request, string $token)
public function submitResetPassword(Request $request, string $token): RedirectResponse
{
$request->validate([
'password' => ['required', 'min:8', 'confirmed'],
@@ -6,13 +6,17 @@ use App\Http\Controllers\Controller;
use App\Http\Requests\GuestbookFormRequest;
use App\Models\User;
use App\Models\User\WebsiteUserGuestbook;
use Illuminate\Http\RedirectResponse;
use Illuminate\Support\Facades\Auth;
class GuestbookController extends Controller
{
public function store(User $user, GuestbookFormRequest $request)
public function store(User $user, GuestbookFormRequest $request): RedirectResponse
{
$this->validateGuestbookPost($user, $request);
$validation = $this->validateGuestbookPost($user, $request);
if ($validation !== null) {
return $validation;
}
$user->profileGuestbook()->create([
'user_id' => Auth::id(),
@@ -22,7 +26,7 @@ class GuestbookController extends Controller
return back()->with('success', __('Your message has been posted.'));
}
public function destroy(User $user, WebsiteUserGuestbook $guestbook)
public function destroy(User $user, WebsiteUserGuestbook $guestbook): RedirectResponse
{
if ($guestbook->user_id !== Auth::id() && $guestbook->profile_id !== $user->id && Auth::user()->rank < (int) setting('min_staff_rank')) {
return back()->withErrors([
@@ -35,7 +39,7 @@ class GuestbookController extends Controller
return back()->with('success', __('Your message has been deleted.'));
}
private function validateGuestbookPost(User $user, GuestbookFormRequest $request)
private function validateGuestbookPost(User $user, GuestbookFormRequest $request): ?RedirectResponse
{
if ($user->id === $request->user()->id) {
return $this->redirectWithError(__('You cannot post a message on your own profile.'));
@@ -45,9 +49,11 @@ class GuestbookController extends Controller
if ($user->profileGuestbook()->where('user_id', $request->user()->id)->count() >= $maxAllowedPostCount) {
return $this->redirectWithError(__('You have already posted :count messages on this profile.', ['count' => $maxAllowedPostCount]));
}
return null;
}
private function redirectWithError($message)
private function redirectWithError(string $message): RedirectResponse
{
return back()->withErrors(['message' => $message]);
}
@@ -4,10 +4,11 @@ namespace App\Http\Controllers\User;
use App\Http\Controllers\Controller;
use App\Models\User;
use Illuminate\Contracts\View\View;
class UserReferralController extends Controller
{
public function __invoke(string $referralCode)
public function __invoke(string $referralCode): View
{
User::where('referral_code', '=', $referralCode)->firstOrFail();