From ba1831c50792311e4c644f3afb378a0c44caf281 Mon Sep 17 00:00:00 2001 From: Remco Date: Tue, 20 Jan 2026 17:29:58 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=86=99=20Fixed=20all=20phpstan=20errors?= =?UTF-8?q?=20max=20=F0=9F=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resources/User/Users/Pages/EditUser.php | 48 ++++++++++--------- Updated_Cms/storage/logs/laravel.log | 1 + 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/Updated_Cms/app/Filament/Resources/User/Users/Pages/EditUser.php b/Updated_Cms/app/Filament/Resources/User/Users/Pages/EditUser.php index 2f705d0a9b..f32e3572c5 100644 --- a/Updated_Cms/app/Filament/Resources/User/Users/Pages/EditUser.php +++ b/Updated_Cms/app/Filament/Resources/User/Users/Pages/EditUser.php @@ -69,8 +69,8 @@ class EditUser extends EditRecord $rcon = app(RconService::class); if (! $user->online) { - DB::transaction(function () use ($user, $data): void { - $this->treatChangedCurrenciesWithoutRcon($user, $data); + DB::transaction(function () use ($user): void { + $this->treatChangedCurrenciesWithoutRcon($user); }); return; @@ -86,23 +86,25 @@ class EditUser extends EditRecord $this->halt(); } - DB::transaction(function () use ($user, $data, $rcon): void { - $newCredits = is_numeric($data['credits'] ?? null) ? (int) $data['credits'] : $user->credits; + DB::transaction(function () use ($user, $rcon): void { + $state = $this->form->getState(); + $newCredits = is_numeric($state['credits'] ?? null) ? (int) $state['credits'] : $user->credits; if ($newCredits !== $user->credits) { $rcon->giveCredits($user, -$user->credits + $newCredits); } - $this->checkUsernameChangedPermission($user, $data, $rcon); - $this->treatChangedCurrencies($user, $data); - $this->treatChangedUserRank($user, $data, $rcon); - $this->treatChangedUserMotto($user, $data, $rcon); + $this->checkUsernameChangedPermission($user, $rcon); + $this->treatChangedCurrencies($user); + $this->treatChangedUserRank($user, $rcon); + $this->treatChangedUserMotto($user, $rcon); }); } - private function treatChangedCurrenciesWithoutRcon(\App\Models\User $user, array $data): void + private function treatChangedCurrenciesWithoutRcon(\App\Models\User $user): void { - $user->currencies->each(function (UserCurrency $currency) use ($data, $user): void { - $updatedCurrencyAmount = $data["currency_{$currency->type}"] ?? $currency->amount; + $state = $this->form->getState(); + $user->currencies->each(function (UserCurrency $currency) use ($state, $user): void { + $updatedCurrencyAmount = $state["currency_{$currency->type}"] ?? $currency->amount; if (! is_numeric($updatedCurrencyAmount)) { return; } @@ -129,13 +131,14 @@ class EditUser extends EditRecord }); if ($user->settings) { - $user->settings->update(['can_change_name' => !empty($data['allow_change_username']) ? '1' : '0']); + $user->settings->update(['can_change_name' => !empty($state['allow_change_username'] ?? null) ? '1' : '0']); } } - private function checkUsernameChangedPermission(\App\Models\User $user, array $data, RconService $rcon): void + private function checkUsernameChangedPermission(\App\Models\User $user, RconService $rcon): void { - if ($user->settings && ($data['allow_change_username'] == $user->settings->can_change_name)) { + $allowChange = !empty($this->form->getState()['allow_change_username'] ?? null) ? '1' : '0'; + if ($user->settings && ($allowChange == $user->settings->can_change_name)) { return; } @@ -151,14 +154,15 @@ class EditUser extends EditRecord $rcon->disconnectUser($user); if ($user->settings) { - $user->settings->update(['can_change_name' => $data['allow_change_username'] ? '1' : '0']); + $user->settings->update(['can_change_name' => $allowChange]); } } - private function treatChangedCurrencies(\App\Models\User $user, array $data): void + private function treatChangedCurrencies(\App\Models\User $user): void { - $user->currencies->each(function (UserCurrency $currency) use ($data, $user): void { - $updatedCurrencyAmount = $data["currency_{$currency->type}"] ?? $currency->amount; + $state = $this->form->getState(); + $user->currencies->each(function (UserCurrency $currency) use ($state, $user): void { + $updatedCurrencyAmount = $state["currency_{$currency->type}"] ?? $currency->amount; if (! is_numeric($updatedCurrencyAmount)) { return; } @@ -178,9 +182,9 @@ class EditUser extends EditRecord }); } - private function treatChangedUserRank(\App\Models\User $user, array $data, RconService $rcon): void + private function treatChangedUserRank(\App\Models\User $user, RconService $rcon): void { - $newRank = is_numeric($data['rank'] ?? null) ? (int) $data['rank'] : $user->rank; + $newRank = is_numeric($this->form->getState()['rank'] ?? null) ? (int) $this->form->getState()['rank'] : $user->rank; if ($newRank === $user->rank) { return; } @@ -213,9 +217,9 @@ class EditUser extends EditRecord $rcon->setRank($user, $newRank); } - private function treatChangedUserMotto(\App\Models\User $user, array $data, RconService $rcon): void + private function treatChangedUserMotto(\App\Models\User $user, RconService $rcon): void { - $newMotto = is_string($data['motto'] ?? null) ? $data['motto'] : $user->motto; + $newMotto = is_string($this->form->getState()['motto'] ?? null) ? $this->form->getState()['motto'] : $user->motto; if ($newMotto === $user->motto) { return; } diff --git a/Updated_Cms/storage/logs/laravel.log b/Updated_Cms/storage/logs/laravel.log index eb0e8d2b9a..80e67961ba 100644 --- a/Updated_Cms/storage/logs/laravel.log +++ b/Updated_Cms/storage/logs/laravel.log @@ -84,3 +84,4 @@ [2026-01-20 16:26:06] production.ERROR: RCON connection failed: Kan geen verbinding maken omdat de doelcomputer de verbinding actief heeft geweigerd [2026-01-20 16:27:22] production.ERROR: RCON connection failed: Kan geen verbinding maken omdat de doelcomputer de verbinding actief heeft geweigerd [2026-01-20 16:27:49] production.ERROR: RCON connection failed: Kan geen verbinding maken omdat de doelcomputer de verbinding actief heeft geweigerd +[2026-01-20 16:29:29] production.ERROR: RCON connection failed: Kan geen verbinding maken omdat de doelcomputer de verbinding actief heeft geweigerd