remco/Epicnabbo-Catalogus-Updated-Daily
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🆙 Fixed all phpstan errors max 🆙

Browse Source
This commit is contained in:
Remco
2026-01-20 17:29:58 +01:00
parent 983bf11b4a
commit ba1831c507
2 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Updated_Cms/app/Filament/Resources/User/Users/Pages/EditUser.php
+26 -22
View File
@@ -69,8 +69,8 @@ class EditUser extends EditRecord
$rcon = app(RconService::class); $rcon = app(RconService::class);
if (! $user->online) { if (! $user->online) {
DB::transaction(function () use ($user, $data): void { DB::transaction(function () use ($user): void {
$this->treatChangedCurrenciesWithoutRcon($user, $data); $this->treatChangedCurrenciesWithoutRcon($user);
}); });
return; return;
@@ -86,23 +86,25 @@ class EditUser extends EditRecord
$this->halt(); $this->halt();
} }
DB::transaction(function () use ($user, $data, $rcon): void { DB::transaction(function () use ($user, $rcon): void {
$newCredits = is_numeric($data['credits'] ?? null) ? (int) $data['credits'] : $user->credits; $state = $this->form->getState();
$newCredits = is_numeric($state['credits'] ?? null) ? (int) $state['credits'] : $user->credits;
if ($newCredits !== $user->credits) { if ($newCredits !== $user->credits) {
$rcon->giveCredits($user, -$user->credits + $newCredits); $rcon->giveCredits($user, -$user->credits + $newCredits);
} }
$this->checkUsernameChangedPermission($user, $data, $rcon); $this->checkUsernameChangedPermission($user, $rcon);
$this->treatChangedCurrencies($user, $data); $this->treatChangedCurrencies($user);
$this->treatChangedUserRank($user, $data, $rcon); $this->treatChangedUserRank($user, $rcon);
$this->treatChangedUserMotto($user, $data, $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 { $state = $this->form->getState();
$updatedCurrencyAmount = $data["currency_{$currency->type}"] ?? $currency->amount; $user->currencies->each(function (UserCurrency $currency) use ($state, $user): void {
$updatedCurrencyAmount = $state["currency_{$currency->type}"] ?? $currency->amount;
if (! is_numeric($updatedCurrencyAmount)) { if (! is_numeric($updatedCurrencyAmount)) {
return; return;
} }
@@ -129,13 +131,14 @@ class EditUser extends EditRecord
}); });
if ($user->settings) { 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; return;
} }
@@ -151,14 +154,15 @@ class EditUser extends EditRecord
$rcon->disconnectUser($user); $rcon->disconnectUser($user);
if ($user->settings) { 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 { $state = $this->form->getState();
$updatedCurrencyAmount = $data["currency_{$currency->type}"] ?? $currency->amount; $user->currencies->each(function (UserCurrency $currency) use ($state, $user): void {
$updatedCurrencyAmount = $state["currency_{$currency->type}"] ?? $currency->amount;
if (! is_numeric($updatedCurrencyAmount)) { if (! is_numeric($updatedCurrencyAmount)) {
return; 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) { if ($newRank === $user->rank) {
return; return;
} }
@@ -213,9 +217,9 @@ class EditUser extends EditRecord
$rcon->setRank($user, $newRank); $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) { if ($newMotto === $user->motto) {
return; return;
} }
Updated_Cms/storage/logs/laravel.log
+1
View File
@@ -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: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: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: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