From 1f67054777aea9af0b280305d739bea8b009730b Mon Sep 17 00:00:00 2001 From: Boy132 Date: Fri, 18 Jul 2025 13:49:26 +0200 Subject: [PATCH] Fix phpstan (#1532) --- .../Application/DatabaseHosts/DatabaseHostController.php | 2 +- .../Api/Application/Mounts/MountController.php | 2 +- .../Controllers/Api/Application/Nodes/NodeController.php | 2 +- .../Controllers/Api/Application/Roles/RoleController.php | 2 +- .../Api/Application/Servers/ServerController.php | 2 +- .../Controllers/Api/Application/Users/UserController.php | 2 +- app/Http/Controllers/Api/Client/ClientController.php | 9 ++++++--- 7 files changed, 12 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/Api/Application/DatabaseHosts/DatabaseHostController.php b/app/Http/Controllers/Api/Application/DatabaseHosts/DatabaseHostController.php index fe1b2860b..62165cf9b 100644 --- a/app/Http/Controllers/Api/Application/DatabaseHosts/DatabaseHostController.php +++ b/app/Http/Controllers/Api/Application/DatabaseHosts/DatabaseHostController.php @@ -36,7 +36,7 @@ class DatabaseHostController extends ApplicationApiController */ public function index(GetDatabaseHostRequest $request): array { - $databases = QueryBuilder::for(DatabaseHost::query()) + $databases = QueryBuilder::for(DatabaseHost::class) ->allowedFilters(['name', 'host']) ->allowedSorts(['id', 'name', 'host']) ->paginate($request->query('per_page') ?? 10); diff --git a/app/Http/Controllers/Api/Application/Mounts/MountController.php b/app/Http/Controllers/Api/Application/Mounts/MountController.php index 1536b8397..5f905d892 100644 --- a/app/Http/Controllers/Api/Application/Mounts/MountController.php +++ b/app/Http/Controllers/Api/Application/Mounts/MountController.php @@ -26,7 +26,7 @@ class MountController extends ApplicationApiController */ public function index(GetMountRequest $request): array { - $mounts = QueryBuilder::for(Mount::query()) + $mounts = QueryBuilder::for(Mount::class) ->allowedFilters(['uuid', 'name']) ->allowedSorts(['id', 'uuid']) ->paginate($request->query('per_page') ?? 50); diff --git a/app/Http/Controllers/Api/Application/Nodes/NodeController.php b/app/Http/Controllers/Api/Application/Nodes/NodeController.php index ba2539f7c..55852cf03 100644 --- a/app/Http/Controllers/Api/Application/Nodes/NodeController.php +++ b/app/Http/Controllers/Api/Application/Nodes/NodeController.php @@ -39,7 +39,7 @@ class NodeController extends ApplicationApiController */ public function index(GetNodesRequest $request): array { - $nodes = QueryBuilder::for(Node::query()) + $nodes = QueryBuilder::for(Node::class) ->allowedFilters(['uuid', 'name', 'fqdn', 'daemon_token_id']) ->allowedSorts(['id', 'uuid', 'memory', 'disk', 'cpu']) ->paginate($request->query('per_page') ?? 50); diff --git a/app/Http/Controllers/Api/Application/Roles/RoleController.php b/app/Http/Controllers/Api/Application/Roles/RoleController.php index 3ecf035f9..f707b29f8 100644 --- a/app/Http/Controllers/Api/Application/Roles/RoleController.php +++ b/app/Http/Controllers/Api/Application/Roles/RoleController.php @@ -25,7 +25,7 @@ class RoleController extends ApplicationApiController */ public function index(GetRoleRequest $request): array { - $roles = QueryBuilder::for(Role::query()) + $roles = QueryBuilder::for(Role::class) ->allowedFilters(['id', 'name']) ->allowedSorts(['id', 'name']) ->paginate($request->query('per_page') ?? 10); diff --git a/app/Http/Controllers/Api/Application/Servers/ServerController.php b/app/Http/Controllers/Api/Application/Servers/ServerController.php index 6d40af75d..851818299 100644 --- a/app/Http/Controllers/Api/Application/Servers/ServerController.php +++ b/app/Http/Controllers/Api/Application/Servers/ServerController.php @@ -38,7 +38,7 @@ class ServerController extends ApplicationApiController */ public function index(GetServersRequest $request): array { - $servers = QueryBuilder::for(Server::query()) + $servers = QueryBuilder::for(Server::class) ->allowedFilters(['uuid', 'uuid_short', 'name', 'description', 'image', 'external_id']) ->allowedSorts(['id', 'uuid']) ->paginate($request->query('per_page') ?? 50); diff --git a/app/Http/Controllers/Api/Application/Users/UserController.php b/app/Http/Controllers/Api/Application/Users/UserController.php index 30c495506..ab8cef199 100644 --- a/app/Http/Controllers/Api/Application/Users/UserController.php +++ b/app/Http/Controllers/Api/Application/Users/UserController.php @@ -41,7 +41,7 @@ class UserController extends ApplicationApiController */ public function index(GetUsersRequest $request): array { - $users = QueryBuilder::for(User::query()) + $users = QueryBuilder::for(User::class) ->allowedFilters(['email', 'uuid', 'username', 'external_id']) ->allowedSorts(['id', 'uuid']) ->paginate($request->query('per_page') ?? 50); diff --git a/app/Http/Controllers/Api/Client/ClientController.php b/app/Http/Controllers/Api/Client/ClientController.php index e307de220..c8426c776 100644 --- a/app/Http/Controllers/Api/Client/ClientController.php +++ b/app/Http/Controllers/Api/Client/ClientController.php @@ -11,6 +11,8 @@ use App\Models\Filters\MultiFieldServerFilter; use App\Transformers\Api\Client\ServerTransformer; use App\Http\Requests\Api\Client\GetServersRequest; use Dedoc\Scramble\Attributes\Group; +use Illuminate\Database\Eloquent\Builder; +use Illuminate\Database\Eloquent\Model; #[Group('Base')] class ClientController extends ClientApiController @@ -36,10 +38,11 @@ class ClientController extends ClientApiController $user = $request->user(); $transformer = $this->getTransformer(ServerTransformer::class); + /** @var Builder $query */ + $query = Server::query()->with($this->getIncludesForTransformer($transformer, ['node'])); + // Start the query builder and ensure we eager load any requested relationships from the request. - $builder = QueryBuilder::for( - Server::query()->with($this->getIncludesForTransformer($transformer, ['node'])) - )->allowedFilters([ + $builder = QueryBuilder::for($query)->allowedFilters([ 'uuid', 'name', 'description',