From a7b5c2ccb53f7f5d354b5215cffccc77ebccb4fe Mon Sep 17 00:00:00 2001 From: Refringe Date: Thu, 6 Feb 2025 10:00:24 -0500 Subject: [PATCH] Rector & PHPStan Changes --- app/Livewire/Mod/ModerationActionButton.php | 17 ++++++++++++----- app/Livewire/Mod/ModerationOptions.php | 6 +++++- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/app/Livewire/Mod/ModerationActionButton.php b/app/Livewire/Mod/ModerationActionButton.php index 638f843..c97d9ea 100644 --- a/app/Livewire/Mod/ModerationActionButton.php +++ b/app/Livewire/Mod/ModerationActionButton.php @@ -4,7 +4,11 @@ namespace App\Livewire\Mod; use App\Models\Mod; use App\Models\ModVersion; +use Illuminate\Contracts\View\Factory; +use Illuminate\Contracts\View\View as ContractView; +use Illuminate\Foundation\Application; use Illuminate\Support\Facades\Log; +use Illuminate\View\View; use Livewire\Attributes\On; use Livewire\Component; @@ -22,6 +26,9 @@ class ModerationActionButton extends Component public bool $isRunning = false; + /** + * @var array + */ protected $listeners = ['refreshComponent' => '$refresh']; public function mount(): void @@ -29,7 +36,7 @@ class ModerationActionButton extends Component $this->guid = uniqid('', true); } - public function render() + public function render(): Application|Factory|ContractView|View { $this->allowActions = ! $this->isRunning; @@ -45,7 +52,7 @@ class ModerationActionButton extends Component #[On('startAction.{guid}')] public function invokeAction(): void { - if ($this->moderatedObjectId == null || $this->moderatedObjectId == '') { + if (empty($this->moderatedObjectId)) { Log::info('Failed: no ID specified.'); return; @@ -61,11 +68,11 @@ class ModerationActionButton extends Component switch ($this->targetType) { case 'mod': - $moderatedObject = Mod::where('id', '=', $this->moderatedObjectId)->first(); + $moderatedObject = Mod::query()->where('id', '=', $this->moderatedObjectId)->first(); break; case 'modVersion': - $moderatedObject = ModVersion::where('id', '=', $this->moderatedObjectId)->first(); + $moderatedObject = ModVersion::query()->where('id', '=', $this->moderatedObjectId)->first(); break; default: @@ -74,7 +81,7 @@ class ModerationActionButton extends Component return; } - if ($moderatedObject == null) { + if ($moderatedObject === null) { Log::info('Failed: moderated object is null'); return; diff --git a/app/Livewire/Mod/ModerationOptions.php b/app/Livewire/Mod/ModerationOptions.php index 2a56948..453a916 100644 --- a/app/Livewire/Mod/ModerationOptions.php +++ b/app/Livewire/Mod/ModerationOptions.php @@ -2,6 +2,10 @@ namespace App\Livewire\Mod; +use Illuminate\Contracts\View\Factory; +use Illuminate\Contracts\View\View as ContractView; +use Illuminate\Foundation\Application; +use Illuminate\View\View; use Livewire\Component; class ModerationOptions extends Component @@ -18,7 +22,7 @@ class ModerationOptions extends Component public bool $showDisableDialog = false; - public function render() + public function render(): Application|Factory|ContractView|View { return view('livewire.mod.moderation-options'); }