🆙 Fix more errors php stan 🆙

Updated_Cms/app/Http/Controllers/Api/HotelApiController.php

@@ -10,7 +10,7 @@ use App\Services\User\UserApiService;
 
 class HotelApiController extends Controller
 {
-    public function __construct(private readonly UserApiService $userApiService) {}
+    public function __construct(private readonly UserApiService $userApiService): void {}
 
     public function fetchUser(string $username, array $columns = ['username', 'motto', 'look']): UserResource
     {

Updated_Cms/app/Http/Controllers/Articles/WebsiteArticleCommentsController.php

@@ -11,7 +11,7 @@ use Illuminate\Http\RedirectResponse;
 
 class WebsiteArticleCommentsController extends Controller
 {
-    public function __construct(public readonly CommentService $commentService) {}
+    public function __construct(public readonly CommentService $commentService): void {}
 
     public function store(WebsiteArticle $article, ArticleCommentFormRequest $request): RedirectResponse
     {

Updated_Cms/app/Http/Controllers/Community/LeaderboardController.php

@@ -13,7 +13,7 @@ class LeaderboardController extends Controller
 {
     protected array $staffIds = [];
 
-    public function __construct(private readonly StaffService $staffService)
+    public function __construct(private readonly StaffService $staffService): void
     {
         $this->staffIds = $this->staffService->fetchEmployeeIds();
     }
@@ -44,7 +44,7 @@ class LeaderboardController extends Controller
         ]);
     }
 
-    private function retrieveSettings($column)
+    private function retrieveSettings(string $column): \Illuminate\Database\Eloquent\Collection
     {
         return UserSetting::select('user_id', $column)
             ->whereNotIn('user_id', $this->staffIds)

Updated_Cms/app/Http/Controllers/Community/PhotosController.php

@@ -8,7 +8,7 @@ use Illuminate\View\View;
 
 class PhotosController extends Controller
 {
-    public function __construct(private readonly CameraService $cameraService) {}
+    public function __construct(private readonly CameraService $cameraService): void {}
 
     public function __invoke(): View
     {

Updated_Cms/app/Http/Controllers/Community/Staff/StaffApplicationsController.php

@@ -6,20 +6,21 @@ use App\Http\Controllers\Controller;
 use App\Http\Requests\StaffApplicationFormRequest;
 use App\Models\Community\Staff\WebsiteOpenPosition;
 use App\Services\Community\StaffApplicationService;
+use Illuminate\Contracts\View\View;
 use Illuminate\Http\RedirectResponse;
 
 class StaffApplicationsController extends Controller
 {
-    public function __construct(private readonly StaffApplicationService $staffApplicationService) {}
+    public function __construct(private readonly StaffApplicationService $staffApplicationService): void {}
 
-    public function index()
+    public function index(): View
     {
         return view('community.staff-applications', [
             'positions' => $this->staffApplicationService->fetchOpenPositions(),
         ]);
     }
 
-    public function show(WebsiteOpenPosition $position)
+    public function show(WebsiteOpenPosition $position): View
     {
         return view('community.staff-applications-apply', [
             'position' => $position->load('permission'),

Updated_Cms/app/Http/Controllers/Community/Staff/StaffController.php

@@ -8,7 +8,7 @@ use Illuminate\View\View;
 
 class StaffController extends Controller
 {
-    public function __construct(private readonly StaffService $staffService) {}
+    public function __construct(private readonly StaffService $staffService): void {}
 
     public function __invoke(): View
     {

Updated_Cms/app/Http/Controllers/Community/Staff/WebsiteTeamsController.php

@@ -8,7 +8,7 @@ use Illuminate\View\View;
 
 class WebsiteTeamsController extends Controller
 {
-    public function __construct(private readonly TeamService $teamService) {}
+    public function __construct(private readonly TeamService $teamService): void {}
 
     public function __invoke(): View
     {

Updated_Cms/app/Http/Controllers/Community/WebsiteRareValuesController.php

@@ -14,7 +14,7 @@ use Illuminate\View\View;
 
 class WebsiteRareValuesController extends Controller
 {
-    public function __construct(private readonly RareValueCategoriesService $valueCategoriesService) {}
+    public function __construct(private readonly RareValueCategoriesService $valueCategoriesService): void {}
 
     public function index(): View
     {

Updated_Cms/app/Http/Controllers/Help/HelpCenterController.php

@@ -4,10 +4,11 @@ namespace App\Http\Controllers\Help;
 
 use App\Http\Controllers\Controller;
 use App\Models\Help\WebsiteHelpCenterCategory;
+use Illuminate\Contracts\View\View;
 
 class HelpCenterController extends Controller
 {
-    public function __invoke()
+    public function __invoke(): View
     {
         return view('help-center.index', [
             'categories' => WebsiteHelpCenterCategory::orderBy('position')->get(),

Updated_Cms/app/Http/Controllers/Help/TicketController.php

@@ -6,11 +6,13 @@ use App\Http\Controllers\Controller;
 use App\Http\Requests\WebsiteTicketFormRequest;
 use App\Models\Help\WebsiteHelpCenterCategory;
 use App\Models\Help\WebsiteHelpCenterTicket;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Contracts\View\View;
 
 class TicketController extends Controller
 {
-    public function index()
+    public function index(): View|RedirectResponse
     {
         if (hasPermission('manage_website_tickets') === '' || hasPermission('manage_website_tickets') === '0') {
             return back()->with([
@@ -23,7 +25,7 @@ class TicketController extends Controller
         ]);
     }
 
-    public function create()
+    public function create(): View
     {
         return view('help-center.tickets.create', [
             'categories' => WebsiteHelpCenterCategory::get(),
@@ -31,14 +33,14 @@ class TicketController extends Controller
         ]);
     }
 
-    public function store(WebsiteTicketFormRequest $request)
+    public function store(WebsiteTicketFormRequest $request): RedirectResponse
     {
         Auth::user()->tickets()->create($request->validated());
 
         return back()->with('success', __('Ticket submitted!'));
     }
 
-    public function edit(WebsiteHelpCenterTicket $ticket)
+    public function edit(WebsiteHelpCenterTicket $ticket): View|RedirectResponse
     {
         if (! $ticket->canManageTicket()) {
             return back()->with([
@@ -59,7 +61,7 @@ class TicketController extends Controller
         ]);
     }
 
-    public function update(WebsiteHelpCenterTicket $ticket, WebsiteTicketFormRequest $request)
+    public function update(WebsiteHelpCenterTicket $ticket, WebsiteTicketFormRequest $request): RedirectResponse
     {
         if (! $ticket->canManageTicket()) {
             return back()->with([
@@ -72,7 +74,7 @@ class TicketController extends Controller
         return to_route('help-center.ticket.show', $ticket)->with('success', __('Ticket updated!'));
     }
 
-    public function show(WebsiteHelpCenterTicket $ticket)
+    public function show(WebsiteHelpCenterTicket $ticket): View|RedirectResponse
     {
         if (! $ticket->canManageTicket()) {
             return back()->with([
@@ -92,7 +94,7 @@ class TicketController extends Controller
         ]);
     }
 
-    public function destroy(WebsiteHelpCenterTicket $ticket)
+    public function destroy(WebsiteHelpCenterTicket $ticket): RedirectResponse
     {
         if (! $ticket->canDeleteTicket()) {
             return back()->with([
@@ -105,7 +107,7 @@ class TicketController extends Controller
         return to_route('me.show')->with('success', __('The ticket has been deleted!'));
     }
 
-    public function toggleTicketStatus(WebsiteHelpCenterTicket $ticket)
+    public function toggleTicketStatus(WebsiteHelpCenterTicket $ticket): RedirectResponse
     {
         if (! $ticket->canManageTicket()) {
             return back()->with([

Updated_Cms/app/Http/Controllers/Help/TicketReplyController.php

@@ -6,10 +6,11 @@ use App\Http\Controllers\Controller;
 use App\Http\Requests\WebsiteTicketReplyFormRequest;
 use App\Models\Help\WebsiteHelpCenterTicket;
 use App\Models\Help\WebsiteHelpCenterTicketReply;
+use Illuminate\Http\RedirectResponse;
 
 class TicketReplyController extends Controller
 {
-    public function store(WebsiteHelpCenterTicket $ticket, WebsiteTicketReplyFormRequest $request)
+    public function store(WebsiteHelpCenterTicket $ticket, WebsiteTicketReplyFormRequest $request): RedirectResponse
     {
         if (! $ticket->isOpen()) {
             return back()->with([
@@ -32,7 +33,7 @@ class TicketReplyController extends Controller
         return back()->with('success', __('The reply has been submitted!'));
     }
 
-    public function destroy(WebsiteHelpCenterTicketReply $reply)
+    public function destroy(WebsiteHelpCenterTicketReply $reply): RedirectResponse
     {
         if (! $reply->canDeleteReply()) {
             return back()->with([

Updated_Cms/app/Http/Controllers/Miscellaneous/InstallationController.php

@@ -7,18 +7,20 @@ use App\Models\Miscellaneous\WebsiteInstallation;
 use App\Models\Miscellaneous\WebsiteSetting;
 use App\Rules\ValidateInstallationKeyRule;
 use Exception;
+use Illuminate\Contracts\View\View;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Str;
 
 class InstallationController extends Controller
 {
-    public function index()
+    public function index(): View
     {
         return view('installation.index');
     }
 
-    public function storeInstallationKey(Request $request)
+    public function storeInstallationKey(Request $request): RedirectResponse
     {
         $request->validate([
             'installation_key' => ['required', 'string', 'max:255', new ValidateInstallationKeyRule],
@@ -32,16 +34,16 @@ class InstallationController extends Controller
         return to_route('installation.show-step', 1);
     }
 
-    public function showStep($currentStep)
+    public function showStep(int $currentStep): View
     {
-        $settings = $this->getSettingsForStep((int) $currentStep);
+        $settings = $this->getSettingsForStep($currentStep);
 
         return view('installation.step-' . $currentStep, [
             'settings' => $settings,
         ]);
     }
 
-    public function saveStepSettings(Request $request)
+    public function saveStepSettings(Request $request): RedirectResponse
     {
         $this->updateSettings($request);
 
@@ -50,14 +52,14 @@ class InstallationController extends Controller
         return to_route('installation.show-step', WebsiteInstallation::first()->step);
     }
 
-    public function previousStep()
+    public function previousStep(): RedirectResponse
     {
         WebsiteInstallation::decrement('step');
 
         return to_route('installation.show-step', WebsiteInstallation::first()->step);
     }
 
-    public function restartInstallation()
+    public function restartInstallation(): RedirectResponse
     {
         WebsiteInstallation::first()->update([
             'step' => 0,
@@ -72,7 +74,7 @@ class InstallationController extends Controller
         return to_route('installation.index');
     }
 
-    public function completeInstallation()
+    public function completeInstallation(): RedirectResponse
     {
         WebsiteInstallation::latest()->first()->update([
             'completed' => true,
@@ -89,7 +91,7 @@ class InstallationController extends Controller
         return to_route('welcome');
     }
 
-    private function updateSettings(Request $request)
+    private function updateSettings(Request $request): void
     {
         foreach ($request->except('_token') as $key => $value) {
             WebsiteSetting::where('key', '=', $key)->update([
@@ -98,7 +100,7 @@ class InstallationController extends Controller
         }
     }
 
-    private function getSettingsForStep(int $step)
+    private function getSettingsForStep(int $step): \Illuminate\Database\Eloquent\Collection
     {
         $settingsData = array_chunk(WebsiteSetting::all()->pluck('key')->toArray(), ceil(WebsiteSetting::count() / 4));
 
@@ -107,7 +109,7 @@ class InstallationController extends Controller
             2 => $settingsData[1] ?? [],
             3 => $settingsData[2] ?? [],
             4 => $settingsData[3] ?? [],
-            5 => [], // Completion step has no settings
+            5 => [],
             default => throw new Exception('Step does not exist'),
         };
 

Updated_Cms/app/Http/Controllers/Miscellaneous/LogoGeneratorController.php

@@ -4,11 +4,14 @@ namespace App\Http\Controllers\Miscellaneous;
 
 use App\Http\Controllers\Controller;
 use App\Models\Miscellaneous\WebsiteSetting;
+use Illuminate\Contracts\View\View;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 
 class LogoGeneratorController extends Controller
 {
-    public function index()
+    public function index(): View|RedirectResponse
     {
         if (hasPermission('generate_logo') === '' || hasPermission('generate_logo') === '0') {
             return to_route('me.show')->with([
@@ -19,7 +22,7 @@ class LogoGeneratorController extends Controller
         return view('logo-generator');
     }
 
-    public function store(Request $request)
+    public function store(Request $request): JsonResponse
     {
         $request->validate(['logo' => ['required', 'image']]);
         $file = $request->file('logo');
@@ -35,6 +38,5 @@ class LogoGeneratorController extends Controller
         ]);
 
         return response()->json(['success' => true, 'message' => 'Logo updated!']);
-
     }
 }

Updated_Cms/app/Http/Controllers/Shop/PaypalController.php

@@ -16,7 +16,7 @@ class PaypalController extends Controller
 
     private const string STATUS_COMPLETED = 'COMPLETED';
 
-    public function __construct(private PayPalClient $provider)
+    public function __construct(private PayPalClient $provider): void
     {
         $this->provider = new PayPalClient;
         $this->provider->setApiCredentials(config('habbo.paypal'));

Updated_Cms/app/Http/Controllers/Shop/ShopController.php

@@ -15,9 +15,9 @@ use Symfony\Component\HttpFoundation\Response;
 
 class ShopController extends Controller
 {
-    public function __construct(private readonly RconService $rconService) {}
+    public function __construct(private readonly RconService $rconService): void {}
 
-    public function __invoke(?WebsiteShopCategory $category)
+    public function __invoke(?WebsiteShopCategory $category): \Illuminate\Contracts\View\View
     {
         $packages = WebsiteShopArticle::orderBy('position');
 
@@ -31,7 +31,7 @@ class ShopController extends Controller
         ]);
     }
 
-    private function giveBadges(User $user, string $badges)
+    private function giveBadges(User $user, string $badges): void
     {
         $badgeList = explode(';', $badges);
         $ownedBadges = $user->badges()->pluck('badge_code')->toArray();

Updated_Cms/app/Http/Controllers/Shop/ShopVoucherController.php

@@ -5,10 +5,11 @@ namespace App\Http\Controllers\Shop;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\ShopVoucherFormRequest;
 use App\Models\Shop\WebsiteShopVoucher;
+use Illuminate\Http\RedirectResponse;
 
 class ShopVoucherController extends Controller
 {
-    public function __invoke(ShopVoucherFormRequest $request)
+    public function __invoke(ShopVoucherFormRequest $request): RedirectResponse
     {
         $user = $request->user();
         $voucher = WebsiteShopVoucher::where('code', $request->string('code'))->first();

Updated_Cms/app/Http/Controllers/User/AccountSettingsController.php

@@ -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
     {

Updated_Cms/app/Http/Controllers/User/ForgotPasswordController.php

@@ -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'],

Updated_Cms/app/Http/Controllers/User/GuestbookController.php

@@ -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]);
     }

Updated_Cms/app/Http/Controllers/User/UserReferralController.php

@@ -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();