Fix phpstan (#1532)

This commit is contained in:
Boy132 2025-07-18 13:49:26 +02:00 committed by GitHub
parent 4a9814f16c
commit 1f67054777
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 12 additions and 9 deletions

View File

@ -36,7 +36,7 @@ class DatabaseHostController extends ApplicationApiController
*/ */
public function index(GetDatabaseHostRequest $request): array public function index(GetDatabaseHostRequest $request): array
{ {
$databases = QueryBuilder::for(DatabaseHost::query()) $databases = QueryBuilder::for(DatabaseHost::class)
->allowedFilters(['name', 'host']) ->allowedFilters(['name', 'host'])
->allowedSorts(['id', 'name', 'host']) ->allowedSorts(['id', 'name', 'host'])
->paginate($request->query('per_page') ?? 10); ->paginate($request->query('per_page') ?? 10);

View File

@ -26,7 +26,7 @@ class MountController extends ApplicationApiController
*/ */
public function index(GetMountRequest $request): array public function index(GetMountRequest $request): array
{ {
$mounts = QueryBuilder::for(Mount::query()) $mounts = QueryBuilder::for(Mount::class)
->allowedFilters(['uuid', 'name']) ->allowedFilters(['uuid', 'name'])
->allowedSorts(['id', 'uuid']) ->allowedSorts(['id', 'uuid'])
->paginate($request->query('per_page') ?? 50); ->paginate($request->query('per_page') ?? 50);

View File

@ -39,7 +39,7 @@ class NodeController extends ApplicationApiController
*/ */
public function index(GetNodesRequest $request): array public function index(GetNodesRequest $request): array
{ {
$nodes = QueryBuilder::for(Node::query()) $nodes = QueryBuilder::for(Node::class)
->allowedFilters(['uuid', 'name', 'fqdn', 'daemon_token_id']) ->allowedFilters(['uuid', 'name', 'fqdn', 'daemon_token_id'])
->allowedSorts(['id', 'uuid', 'memory', 'disk', 'cpu']) ->allowedSorts(['id', 'uuid', 'memory', 'disk', 'cpu'])
->paginate($request->query('per_page') ?? 50); ->paginate($request->query('per_page') ?? 50);

View File

@ -25,7 +25,7 @@ class RoleController extends ApplicationApiController
*/ */
public function index(GetRoleRequest $request): array public function index(GetRoleRequest $request): array
{ {
$roles = QueryBuilder::for(Role::query()) $roles = QueryBuilder::for(Role::class)
->allowedFilters(['id', 'name']) ->allowedFilters(['id', 'name'])
->allowedSorts(['id', 'name']) ->allowedSorts(['id', 'name'])
->paginate($request->query('per_page') ?? 10); ->paginate($request->query('per_page') ?? 10);

View File

@ -38,7 +38,7 @@ class ServerController extends ApplicationApiController
*/ */
public function index(GetServersRequest $request): array 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']) ->allowedFilters(['uuid', 'uuid_short', 'name', 'description', 'image', 'external_id'])
->allowedSorts(['id', 'uuid']) ->allowedSorts(['id', 'uuid'])
->paginate($request->query('per_page') ?? 50); ->paginate($request->query('per_page') ?? 50);

View File

@ -41,7 +41,7 @@ class UserController extends ApplicationApiController
*/ */
public function index(GetUsersRequest $request): array public function index(GetUsersRequest $request): array
{ {
$users = QueryBuilder::for(User::query()) $users = QueryBuilder::for(User::class)
->allowedFilters(['email', 'uuid', 'username', 'external_id']) ->allowedFilters(['email', 'uuid', 'username', 'external_id'])
->allowedSorts(['id', 'uuid']) ->allowedSorts(['id', 'uuid'])
->paginate($request->query('per_page') ?? 50); ->paginate($request->query('per_page') ?? 50);

View File

@ -11,6 +11,8 @@ use App\Models\Filters\MultiFieldServerFilter;
use App\Transformers\Api\Client\ServerTransformer; use App\Transformers\Api\Client\ServerTransformer;
use App\Http\Requests\Api\Client\GetServersRequest; use App\Http\Requests\Api\Client\GetServersRequest;
use Dedoc\Scramble\Attributes\Group; use Dedoc\Scramble\Attributes\Group;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
#[Group('Base')] #[Group('Base')]
class ClientController extends ClientApiController class ClientController extends ClientApiController
@ -36,10 +38,11 @@ class ClientController extends ClientApiController
$user = $request->user(); $user = $request->user();
$transformer = $this->getTransformer(ServerTransformer::class); $transformer = $this->getTransformer(ServerTransformer::class);
/** @var Builder<Model> $query */
$query = Server::query()->with($this->getIncludesForTransformer($transformer, ['node']));
// Start the query builder and ensure we eager load any requested relationships from the request. // Start the query builder and ensure we eager load any requested relationships from the request.
$builder = QueryBuilder::for( $builder = QueryBuilder::for($query)->allowedFilters([
Server::query()->with($this->getIncludesForTransformer($transformer, ['node']))
)->allowedFilters([
'uuid', 'uuid',
'name', 'name',
'description', 'description',