From 268c5bea79221fb5e4fc4ec49afc316a2487db0a Mon Sep 17 00:00:00 2001 From: "Justin K." Date: Fri, 26 Jun 2026 13:15:44 +0200 Subject: [PATCH 1/2] use Relation instead of Builder for TeamController https://glitchtip.vheart.net/vheart/issues/287 --- app/Http/Controllers/TeamController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/TeamController.php b/app/Http/Controllers/TeamController.php index 52380a10..32cb9eef 100644 --- a/app/Http/Controllers/TeamController.php +++ b/app/Http/Controllers/TeamController.php @@ -6,7 +6,7 @@ use App\Models\Role; use Illuminate\Contracts\View\View; -use Illuminate\Database\Eloquent\Builder; +use Illuminate\Database\Eloquent\Relations\Relation; use Illuminate\Http\Request; class TeamController extends Controller @@ -19,7 +19,7 @@ public function __invoke(Request $request): View ->orderBy('id') ->with([ // i think this is the fairest way to sort it - 'users' => fn (Builder $builder): Builder => $builder->orderBy('id')] + 'users' => fn (Relation $builder): Relation => $builder->orderBy('id')] ) ->get(); From 61ec5f0c6c6fec7e31243a37c40a39bc171527e9 Mon Sep 17 00:00:00 2001 From: "Justin K." Date: Fri, 26 Jun 2026 13:21:20 +0200 Subject: [PATCH 2/2] use mixed type for user widgets - https://glitchtip.vheart.net/vheart/issues/296 - https://glitchtip.vheart.net/vheart/issues/297 - https://glitchtip.vheart.net/vheart/issues/298 - https://glitchtip.vheart.net/vheart/issues/299 - https://glitchtip.vheart.net/vheart/issues/300 --- .../Resources/Users/Widgets/UserBroadcastedClipsWidget.php | 2 +- .../Resources/Users/Widgets/UserCreatedClipsWidget.php | 2 +- .../Resources/Users/Widgets/UserReportsCreatedWidget.php | 3 +-- .../Resources/Users/Widgets/UserReportsResolvedWidget.php | 3 +-- .../Resources/Users/Widgets/UserSubmittedClipsWidget.php | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/Filament/AdminPanel/Resources/Users/Widgets/UserBroadcastedClipsWidget.php b/app/Filament/AdminPanel/Resources/Users/Widgets/UserBroadcastedClipsWidget.php index e747d6d5..c99d69a7 100644 --- a/app/Filament/AdminPanel/Resources/Users/Widgets/UserBroadcastedClipsWidget.php +++ b/app/Filament/AdminPanel/Resources/Users/Widgets/UserBroadcastedClipsWidget.php @@ -53,7 +53,7 @@ protected function getData(): array 'fill' => true, 'tension' => 0.4, ]], - 'labels' => $results->map(fn (Clip $clip) => $labelFn($clip->date))->toArray(), + 'labels' => $results->map(fn (mixed $clip) => $labelFn($clip->date))->toArray(), ]; } diff --git a/app/Filament/AdminPanel/Resources/Users/Widgets/UserCreatedClipsWidget.php b/app/Filament/AdminPanel/Resources/Users/Widgets/UserCreatedClipsWidget.php index 81b2ec71..7647602d 100644 --- a/app/Filament/AdminPanel/Resources/Users/Widgets/UserCreatedClipsWidget.php +++ b/app/Filament/AdminPanel/Resources/Users/Widgets/UserCreatedClipsWidget.php @@ -53,7 +53,7 @@ protected function getData(): array 'fill' => true, 'tension' => 0.4, ]], - 'labels' => $results->map(fn (Clip $clip) => $labelFn($clip->date))->toArray(), + 'labels' => $results->map(fn (mixed $clip) => $labelFn($clip->date))->toArray(), ]; } diff --git a/app/Filament/AdminPanel/Resources/Users/Widgets/UserReportsCreatedWidget.php b/app/Filament/AdminPanel/Resources/Users/Widgets/UserReportsCreatedWidget.php index 562f3ea2..e516c4f6 100644 --- a/app/Filament/AdminPanel/Resources/Users/Widgets/UserReportsCreatedWidget.php +++ b/app/Filament/AdminPanel/Resources/Users/Widgets/UserReportsCreatedWidget.php @@ -6,7 +6,6 @@ use App\Enums\Permission; use App\Filament\AdminPanel\Widgets\Traits\HasBasicOverviewChartStuff; -use App\Models\Clip; use App\Models\Report; use App\Models\User; use Carbon\CarbonInterface; @@ -55,7 +54,7 @@ protected function getData(): array 'fill' => true, 'tension' => 0.4, ]], - 'labels' => $results->map(fn (Clip $clip) => $labelFn($clip->date))->toArray(), + 'labels' => $results->map(fn (mixed $clip) => $labelFn($clip->date))->toArray(), ]; } diff --git a/app/Filament/AdminPanel/Resources/Users/Widgets/UserReportsResolvedWidget.php b/app/Filament/AdminPanel/Resources/Users/Widgets/UserReportsResolvedWidget.php index 5430ea5a..c6cf2ee8 100644 --- a/app/Filament/AdminPanel/Resources/Users/Widgets/UserReportsResolvedWidget.php +++ b/app/Filament/AdminPanel/Resources/Users/Widgets/UserReportsResolvedWidget.php @@ -6,7 +6,6 @@ use App\Enums\Permission; use App\Filament\AdminPanel\Widgets\Traits\HasBasicOverviewChartStuff; -use App\Models\Clip; use App\Models\Report; use App\Models\User; use Carbon\CarbonInterface; @@ -55,7 +54,7 @@ protected function getData(): array 'fill' => true, 'tension' => 0.4, ]], - 'labels' => $results->map(fn (Clip $clip) => $labelFn($clip->date))->toArray(), + 'labels' => $results->map(fn (mixed $clip) => $labelFn($clip->date))->toArray(), ]; } diff --git a/app/Filament/AdminPanel/Resources/Users/Widgets/UserSubmittedClipsWidget.php b/app/Filament/AdminPanel/Resources/Users/Widgets/UserSubmittedClipsWidget.php index 91919016..19360f00 100644 --- a/app/Filament/AdminPanel/Resources/Users/Widgets/UserSubmittedClipsWidget.php +++ b/app/Filament/AdminPanel/Resources/Users/Widgets/UserSubmittedClipsWidget.php @@ -53,7 +53,7 @@ protected function getData(): array 'fill' => true, 'tension' => 0.4, ]], - 'labels' => $results->map(fn (Clip $clip) => $labelFn($clip->date))->toArray(), + 'labels' => $results->map(fn (mixed $clip) => $labelFn($clip->date))->toArray(), ]; }