Upgrade to Laravel 9 (#4413)

Co-authored-by: DaneEveritt <dane@daneeveritt.com>

app/Http/Controllers/Api/Client/AccountController.php

@@ -14,25 +14,12 @@ use Pterodactyl\Http\Requests\Api\Client\Account\UpdatePasswordRequest;
 
 class AccountController extends ClientApiController
 {
-    /**
-     * @var \Pterodactyl\Services\Users\UserUpdateService
-     */
-    private $updateService;
-
-    /**
-     * @var \Illuminate\Auth\AuthManager
-     */
-    private $manager;
-
     /**
      * AccountController constructor.
      */
-    public function __construct(AuthManager $manager, UserUpdateService $updateService)
+    public function __construct(private AuthManager $manager, private UserUpdateService $updateService)
     {
         parent::__construct();
-
-        $this->updateService = $updateService;
-        $this->manager = $manager;
     }
 
     public function index(Request $request): array

app/Http/Controllers/Api/Client/ApiKeyController.php

@@ -13,11 +13,9 @@ use Pterodactyl\Http\Requests\Api\Client\Account\StoreApiKeyRequest;
 class ApiKeyController extends ClientApiController
 {
     /**
-     * Returns all of the API keys that exist for the given client.
-     *
-     * @return array
+     * Returns all the API keys that exist for the given client.
      */
-    public function index(ClientApiRequest $request)
+    public function index(ClientApiRequest $request): array
     {
         return $this->fractal->collection($request->user()->apiKeys)
             ->transformWith($this->getTransformer(ApiKeyTransformer::class))
@@ -26,6 +24,8 @@ class ApiKeyController extends ClientApiController
 
     /**
      * Store a new API key for a user's account.
+     *
+     * @throws \Pterodactyl\Exceptions\DisplayException
      */
     public function store(StoreApiKeyRequest $request): array
     {
@@ -51,10 +51,8 @@ class ApiKeyController extends ClientApiController
 
     /**
      * Deletes a given API key.
-     *
-     * @return \Illuminate\Http\JsonResponse
      */
-    public function delete(ClientApiRequest $request, string $identifier)
+    public function delete(ClientApiRequest $request, string $identifier): JsonResponse
     {
         /** @var \Pterodactyl\Models\ApiKey $key */
         $key = $request->user()->apiKeys()

app/Http/Controllers/Api/Client/ClientApiController.php

@@ -10,10 +10,8 @@ abstract class ClientApiController extends ApplicationApiController
 {
     /**
      * Returns only the includes which are valid for the given transformer.
-     *
-     * @return string[]
      */
-    protected function getIncludesForTransformer(BaseClientTransformer $transformer, array $merge = [])
+    protected function getIncludesForTransformer(BaseClientTransformer $transformer, array $merge = []): array
     {
         $filtered = array_filter($this->parseIncludes(), function ($datum) use ($transformer) {
             return in_array($datum, $transformer->getAvailableIncludes());
@@ -24,10 +22,8 @@ abstract class ClientApiController extends ApplicationApiController
 
     /**
      * Returns the parsed includes for this request.
-     *
-     * @return string[]
      */
-    protected function parseIncludes()
+    protected function parseIncludes(): array
     {
         $includes = $this->request->query('include') ?? [];
 
@@ -49,7 +45,6 @@ abstract class ClientApiController extends ApplicationApiController
      *
      * @return T
      *
-     * @noinspection PhpUndefinedClassInspection
      * @noinspection PhpDocSignatureInspection
      */
     public function getTransformer(string $abstract)

app/Http/Controllers/Api/Client/ClientController.php

@@ -7,29 +7,21 @@ use Pterodactyl\Models\Permission;
 use Spatie\QueryBuilder\QueryBuilder;
 use Spatie\QueryBuilder\AllowedFilter;
 use Pterodactyl\Models\Filters\MultiFieldServerFilter;
-use Pterodactyl\Repositories\Eloquent\ServerRepository;
 use Pterodactyl\Transformers\Api\Client\ServerTransformer;
 use Pterodactyl\Http\Requests\Api\Client\GetServersRequest;
 
 class ClientController extends ClientApiController
 {
-    /**
-     * @var \Pterodactyl\Repositories\Eloquent\ServerRepository
-     */
-    private $repository;
-
     /**
      * ClientController constructor.
      */
-    public function __construct(ServerRepository $repository)
+    public function __construct()
     {
         parent::__construct();
-
-        $this->repository = $repository;
     }
 
     /**
-     * Return all of the servers available to the client making the API
+     * Return all the servers available to the client making the API
      * request, including servers the user has access to as a subuser.
      */
     public function index(GetServersRequest $request): array
@@ -49,8 +41,8 @@ class ClientController extends ClientApiController
         ]);
 
         $type = $request->input('type');
-        // Either return all of the servers the user has access to because they are an admin `?type=admin` or
-        // just return all of the servers the user has access to because they are the owner or a subuser of the
+        // Either return all the servers the user has access to because they are an admin `?type=admin` or
+        // just return all the servers the user has access to because they are the owner or a subuser of the
         // server. If ?type=admin-all is passed all servers on the system will be returned to the user, rather
         // than only servers they can see because they are an admin.
         if (in_array($type, ['admin', 'admin-all'])) {
@@ -75,11 +67,9 @@ class ClientController extends ClientApiController
     }
 
     /**
-     * Returns all of the subuser permissions available on the system.
-     *
-     * @return array
+     * Returns all the subuser permissions available on the system.
      */
-    public function permissions()
+    public function permissions(): array
     {
         return [
             'object' => 'system_permissions',

app/Http/Controllers/Api/Client/SSHKeyController.php

@@ -11,7 +11,7 @@ use Pterodactyl\Http\Requests\Api\Client\Account\StoreSSHKeyRequest;
 class SSHKeyController extends ClientApiController
 {
     /**
-     * Returns all of the SSH keys that have been configured for the logged in
+     * Returns all the SSH keys that have been configured for the logged-in
      * user account.
      */
     public function index(ClientApiRequest $request): array

app/Http/Controllers/Api/Client/Servers/BackupController.php

@@ -21,29 +21,17 @@ use Pterodactyl\Http\Requests\Api\Client\Servers\Backups\StoreBackupRequest;
 
 class BackupController extends ClientApiController
 {
-    private InitiateBackupService $initiateBackupService;
-    private DeleteBackupService $deleteBackupService;
-    private DownloadLinkService $downloadLinkService;
-    private DaemonBackupRepository $daemonRepository;
-    private BackupRepository $repository;
-
     /**
      * BackupController constructor.
      */
     public function __construct(
-        DaemonBackupRepository $daemonRepository,
-        DeleteBackupService $deleteBackupService,
-        InitiateBackupService $initiateBackupService,
-        DownloadLinkService $downloadLinkService,
-        BackupRepository $repository
+        private DaemonBackupRepository $daemonRepository,
+        private DeleteBackupService $deleteBackupService,
+        private InitiateBackupService $initiateBackupService,
+        private DownloadLinkService $downloadLinkService,
+        private BackupRepository $repository
     ) {
         parent::__construct();
-
-        $this->repository = $repository;
-        $this->initiateBackupService = $initiateBackupService;
-        $this->deleteBackupService = $deleteBackupService;
-        $this->downloadLinkService = $downloadLinkService;
-        $this->daemonRepository = $daemonRepository;
     }
 
     /**
@@ -194,9 +182,9 @@ class BackupController extends ClientApiController
      * to begin the process of finding (or downloading) the backup and unpacking it
      * over the server files.
      *
-     * If the "truncate" flag is passed through in this request then all of the
+     * If the "truncate" flag is passed through in this request then all the
      * files that currently exist on the server will be deleted before restoring.
-     * Otherwise the archive will simply be unpacked over the existing files.
+     * Otherwise, the archive will simply be unpacked over the existing files.
      *
      * @throws \Throwable
      */

app/Http/Controllers/Api/Client/Servers/CommandController.php

@@ -15,19 +15,12 @@ use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
 
 class CommandController extends ClientApiController
 {
-    /**
-     * @var \Pterodactyl\Repositories\Wings\DaemonCommandRepository
-     */
-    private $repository;
-
     /**
      * CommandController constructor.
      */
-    public function __construct(DaemonCommandRepository $repository)
+    public function __construct(private DaemonCommandRepository $repository)
     {
         parent::__construct();
-
-        $this->repository = $repository;
     }
 
     /**

app/Http/Controllers/Api/Client/Servers/DatabaseController.php

@@ -6,7 +6,6 @@ use Illuminate\Http\Response;
 use Pterodactyl\Models\Server;
 use Pterodactyl\Models\Database;
 use Pterodactyl\Facades\Activity;
-use Pterodactyl\Repositories\Eloquent\DatabaseRepository;
 use Pterodactyl\Services\Databases\DatabasePasswordService;
 use Pterodactyl\Transformers\Api\Client\DatabaseTransformer;
 use Pterodactyl\Services\Databases\DatabaseManagementService;
@@ -19,45 +18,19 @@ use Pterodactyl\Http\Requests\Api\Client\Servers\Databases\RotatePasswordRequest
 
 class DatabaseController extends ClientApiController
 {
-    /**
-     * @var \Pterodactyl\Services\Databases\DeployServerDatabaseService
-     */
-    private $deployDatabaseService;
-
-    /**
-     * @var \Pterodactyl\Repositories\Eloquent\DatabaseRepository
-     */
-    private $repository;
-
-    /**
-     * @var \Pterodactyl\Services\Databases\DatabaseManagementService
-     */
-    private $managementService;
-
-    /**
-     * @var \Pterodactyl\Services\Databases\DatabasePasswordService
-     */
-    private $passwordService;
-
     /**
      * DatabaseController constructor.
      */
     public function __construct(
-        DatabaseManagementService $managementService,
-        DatabasePasswordService $passwordService,
-        DatabaseRepository $repository,
-        DeployServerDatabaseService $deployDatabaseService
+        private DeployServerDatabaseService $deployDatabaseService,
+        private DatabaseManagementService $managementService,
+        private DatabasePasswordService $passwordService
     ) {
         parent::__construct();
-
-        $this->deployDatabaseService = $deployDatabaseService;
-        $this->repository = $repository;
-        $this->managementService = $managementService;
-        $this->passwordService = $passwordService;
     }
 
     /**
-     * Return all of the databases that belong to the given server.
+     * Return all the databases that belong to the given server.
      */
     public function index(GetDatabasesRequest $request, Server $server): array
     {
@@ -92,11 +65,9 @@ class DatabaseController extends ClientApiController
      * Rotates the password for the given server model and returns a fresh instance to
      * the caller.
      *
-     * @return array
-     *
      * @throws \Throwable
      */
-    public function rotatePassword(RotatePasswordRequest $request, Server $server, Database $database)
+    public function rotatePassword(RotatePasswordRequest $request, Server $server, Database $database): array
     {
         $this->passwordService->handle($database);
         $database->refresh();
@@ -126,6 +97,6 @@ class DatabaseController extends ClientApiController
             ->property('name', $database->database)
             ->log();
 
-        return Response::create('', Response::HTTP_NO_CONTENT);
+        return new Response('', Response::HTTP_NO_CONTENT);
     }
 }

app/Http/Controllers/Api/Client/Servers/FileController.php

@@ -25,27 +25,14 @@ use Pterodactyl\Http\Requests\Api\Client\Servers\Files\WriteFileContentRequest;
 
 class FileController extends ClientApiController
 {
-    /**
-     * @var \Pterodactyl\Repositories\Wings\DaemonFileRepository
-     */
-    private $fileRepository;
-
-    /**
-     * @var \Pterodactyl\Services\Nodes\NodeJWTService
-     */
-    private $jwtService;
-
     /**
      * FileController constructor.
      */
     public function __construct(
-        NodeJWTService $jwtService,
-        DaemonFileRepository $fileRepository
+        private NodeJWTService $jwtService,
+        private DaemonFileRepository $fileRepository
     ) {
         parent::__construct();
-
-        $this->fileRepository = $fileRepository;
-        $this->jwtService = $jwtService;
     }
 
     /**
@@ -85,11 +72,9 @@ class FileController extends ClientApiController
      * Generates a one-time token with a link that the user can use to
      * download a given file.
      *
-     * @return array
-     *
      * @throws \Throwable
      */
-    public function download(GetFileContentsRequest $request, Server $server)
+    public function download(GetFileContentsRequest $request, Server $server): array
     {
         $token = $this->jwtService
             ->setExpiresAt(CarbonImmutable::now()->addMinutes(15))

app/Http/Controllers/Api/Client/Servers/FileUploadController.php

@@ -12,28 +12,19 @@ use Pterodactyl\Http\Requests\Api\Client\Servers\Files\UploadFileRequest;
 
 class FileUploadController extends ClientApiController
 {
-    /**
-     * @var \Pterodactyl\Services\Nodes\NodeJWTService
-     */
-    private $jwtService;
-
     /**
      * FileUploadController constructor.
      */
     public function __construct(
-        NodeJWTService $jwtService
+        private NodeJWTService $jwtService
     ) {
         parent::__construct();
-
-        $this->jwtService = $jwtService;
     }
 
     /**
-     * Returns a url where files can be uploaded to.
-     *
-     * @return \Illuminate\Http\JsonResponse
+     * Returns an url where files can be uploaded to.
      */
-    public function __invoke(UploadFileRequest $request, Server $server)
+    public function __invoke(UploadFileRequest $request, Server $server): JsonResponse
     {
         return new JsonResponse([
             'object' => 'signed_url',
@@ -44,11 +35,9 @@ class FileUploadController extends ClientApiController
     }
 
     /**
-     * Returns a url where files can be uploaded to.
-     *
-     * @return string
+     * Returns an url where files can be uploaded to.
      */
-    protected function getUploadUrl(Server $server, User $user)
+    protected function getUploadUrl(Server $server, User $user): string
     {
         $token = $this->jwtService
             ->setExpiresAt(CarbonImmutable::now()->addMinutes(15))

app/Http/Controllers/Api/Client/Servers/NetworkAllocationController.php

@@ -8,7 +8,6 @@ use Pterodactyl\Facades\Activity;
 use Pterodactyl\Models\Allocation;
 use Pterodactyl\Exceptions\DisplayException;
 use Pterodactyl\Repositories\Eloquent\ServerRepository;
-use Pterodactyl\Repositories\Eloquent\AllocationRepository;
 use Pterodactyl\Transformers\Api\Client\AllocationTransformer;
 use Pterodactyl\Http\Controllers\Api\Client\ClientApiController;
 use Pterodactyl\Services\Allocations\FindAssignableAllocationService;
@@ -21,38 +20,18 @@ use Pterodactyl\Http\Requests\Api\Client\Servers\Network\SetPrimaryAllocationReq
 class NetworkAllocationController extends ClientApiController
 {
     /**
-     * @var \Pterodactyl\Repositories\Eloquent\AllocationRepository
-     */
-    private $repository;
-
-    /**
-     * @var \Pterodactyl\Repositories\Eloquent\ServerRepository
-     */
-    private $serverRepository;
-
-    /**
-     * @var \Pterodactyl\Services\Allocations\FindAssignableAllocationService
-     */
-    private $assignableAllocationService;
-
-    /**
-     * NetworkController constructor.
+     * NetworkAllocationController constructor.
      */
     public function __construct(
-        AllocationRepository $repository,
-        ServerRepository $serverRepository,
-        FindAssignableAllocationService $assignableAllocationService
+        private FindAssignableAllocationService $assignableAllocationService,
+        private ServerRepository $serverRepository
     ) {
         parent::__construct();
-
-        $this->repository = $repository;
-        $this->serverRepository = $serverRepository;
-        $this->assignableAllocationService = $assignableAllocationService;
     }
 
     /**
-     * Lists all of the allocations available to a server and wether or
-     * not they are currently assigned as the primary for this server.
+     * Lists all the allocations available to a server and whether
+     * they are currently assigned as the primary for this server.
      */
     public function index(GetNetworkRequest $request, Server $server): array
     {
@@ -132,11 +111,9 @@ class NetworkAllocationController extends ClientApiController
     /**
      * Delete an allocation from a server.
      *
-     * @return \Illuminate\Http\JsonResponse
-     *
      * @throws \Pterodactyl\Exceptions\DisplayException
      */
-    public function delete(DeleteAllocationRequest $request, Server $server, Allocation $allocation)
+    public function delete(DeleteAllocationRequest $request, Server $server, Allocation $allocation): JsonResponse
     {
         // Don't allow the deletion of allocations if the server does not have an
         // allocation limit set.

app/Http/Controllers/Api/Client/Servers/PowerController.php

@@ -11,19 +11,12 @@ use Pterodactyl\Http\Requests\Api\Client\Servers\SendPowerRequest;
 
 class PowerController extends ClientApiController
 {
-    /**
-     * @var \Pterodactyl\Repositories\Wings\DaemonPowerRepository
-     */
-    private $repository;
-
     /**
      * PowerController constructor.
      */
-    public function __construct(DaemonPowerRepository $repository)
+    public function __construct(private DaemonPowerRepository $repository)
     {
         parent::__construct();
-
-        $this->repository = $repository;
     }
 
     /**

app/Http/Controllers/Api/Client/Servers/ResourceUtilizationController.php

@@ -12,19 +12,12 @@ use Pterodactyl\Http\Requests\Api\Client\Servers\GetServerRequest;
 
 class ResourceUtilizationController extends ClientApiController
 {
-    private DaemonServerRepository $repository;
-
-    private Repository $cache;
-
     /**
      * ResourceUtilizationController constructor.
      */
-    public function __construct(Repository $cache, DaemonServerRepository $repository)
+    public function __construct(private Repository $cache, private DaemonServerRepository $repository)
     {
         parent::__construct();
-
-        $this->cache = $cache;
-        $this->repository = $repository;
     }
 
     /**
@@ -36,7 +29,7 @@ class ResourceUtilizationController extends ClientApiController
      */
     public function __invoke(GetServerRequest $request, Server $server): array
     {
-        $key = "resources:{$server->uuid}";
+        $key = "resources:$server->uuid";
         $stats = $this->cache->remember($key, Carbon::now()->addSeconds(20), function () use ($server) {
             return $this->repository->setServer($server)->getDetails();
         });

app/Http/Controllers/Api/Client/Servers/ScheduleController.php

@@ -25,33 +25,18 @@ use Pterodactyl\Http\Requests\Api\Client\Servers\Schedules\TriggerScheduleReques
 
 class ScheduleController extends ClientApiController
 {
-    /**
-     * @var \Pterodactyl\Repositories\Eloquent\ScheduleRepository
-     */
-    private $repository;
-
-    /**
-     * @var \Pterodactyl\Services\Schedules\ProcessScheduleService
-     */
-    private $service;
-
     /**
      * ScheduleController constructor.
      */
-    public function __construct(ScheduleRepository $repository, ProcessScheduleService $service)
+    public function __construct(private ScheduleRepository $repository, private ProcessScheduleService $service)
     {
         parent::__construct();
-
-        $this->repository = $repository;
-        $this->service = $service;
     }
 
     /**
-     * Returns all of the schedules belonging to a given server.
-     *
-     * @return array
+     * Returns all the schedules belonging to a given server.
      */
-    public function index(ViewScheduleRequest $request, Server $server)
+    public function index(ViewScheduleRequest $request, Server $server): array
     {
         $schedules = $server->schedules->loadMissing('tasks');
 
@@ -63,12 +48,10 @@ class ScheduleController extends ClientApiController
     /**
      * Store a new schedule for a server.
      *
-     * @return array
-     *
      * @throws \Pterodactyl\Exceptions\DisplayException
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      */
-    public function store(StoreScheduleRequest $request, Server $server)
+    public function store(StoreScheduleRequest $request, Server $server): array
     {
         /** @var \Pterodactyl\Models\Schedule $model */
         $model = $this->repository->create([
@@ -96,10 +79,8 @@ class ScheduleController extends ClientApiController
 
     /**
      * Returns a specific schedule for the server.
-     *
-     * @return array
      */
-    public function view(ViewScheduleRequest $request, Server $server, Schedule $schedule)
+    public function view(ViewScheduleRequest $request, Server $server, Schedule $schedule): array
     {
         if ($schedule->server_id !== $server->id) {
             throw new NotFoundHttpException();
@@ -115,13 +96,11 @@ class ScheduleController extends ClientApiController
     /**
      * Updates a given schedule with the new data provided.
      *
-     * @return array
-     *
      * @throws \Pterodactyl\Exceptions\DisplayException
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function update(UpdateScheduleRequest $request, Server $server, Schedule $schedule)
+    public function update(UpdateScheduleRequest $request, Server $server, Schedule $schedule): array
     {
         $active = (bool) $request->input('is_active');
 
@@ -161,11 +140,9 @@ class ScheduleController extends ClientApiController
      * Executes a given schedule immediately rather than waiting on it's normally scheduled time
      * to pass. This does not care about the schedule state.
      *
-     * @return \Illuminate\Http\JsonResponse
-     *
      * @throws \Throwable
      */
-    public function execute(TriggerScheduleRequest $request, Server $server, Schedule $schedule)
+    public function execute(TriggerScheduleRequest $request, Server $server, Schedule $schedule): JsonResponse
     {
         $this->service->handle($schedule, true);
 
@@ -176,10 +153,8 @@ class ScheduleController extends ClientApiController
 
     /**
      * Deletes a schedule and it's associated tasks.
-     *
-     * @return \Illuminate\Http\JsonResponse
      */
-    public function delete(DeleteScheduleRequest $request, Server $server, Schedule $schedule)
+    public function delete(DeleteScheduleRequest $request, Server $server, Schedule $schedule): JsonResponse
     {
         $this->repository->delete($schedule->id);
 

app/Http/Controllers/Api/Client/Servers/ScheduleTaskController.php

@@ -20,35 +20,25 @@ use Pterodactyl\Http\Requests\Api\Client\Servers\Schedules\StoreTaskRequest;
 
 class ScheduleTaskController extends ClientApiController
 {
-    /**
-     * @var \Pterodactyl\Repositories\Eloquent\TaskRepository
-     */
-    private $repository;
-
     /**
      * ScheduleTaskController constructor.
      */
-    public function __construct(TaskRepository $repository)
+    public function __construct(private TaskRepository $repository)
     {
         parent::__construct();
-
-        $this->repository = $repository;
     }
 
     /**
      * Create a new task for a given schedule and store it in the database.
      *
-     * @return array
-     *
-     * @throws \Pterodactyl\Exceptions\Model\HttpForbiddenException
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Service\ServiceLimitExceededException
      */
-    public function store(StoreTaskRequest $request, Server $server, Schedule $schedule)
+    public function store(StoreTaskRequest $request, Server $server, Schedule $schedule): array
     {
         $limit = config('pterodactyl.client_features.schedules.per_schedule_task_limit', 10);
         if ($schedule->tasks()->count() >= $limit) {
-            throw new ServiceLimitExceededException("Schedules may not have more than {$limit} tasks associated with them. Creating this task would put this schedule over the limit.");
+            throw new ServiceLimitExceededException("Schedules may not have more than $limit tasks associated with them. Creating this task would put this schedule over the limit.");
         }
 
         if ($server->backup_limit === 0 && $request->action === 'backup') {
@@ -81,13 +71,10 @@ class ScheduleTaskController extends ClientApiController
     /**
      * Updates a given task for a server.
      *
-     * @return array
-     *
-     * @throws \Pterodactyl\Exceptions\Model\HttpForbiddenException
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function update(StoreTaskRequest $request, Server $server, Schedule $schedule, Task $task)
+    public function update(StoreTaskRequest $request, Server $server, Schedule $schedule, Task $task): array
     {
         if ($schedule->id !== $task->schedule_id || $server->id !== $schedule->server_id) {
             throw new NotFoundHttpException();
@@ -118,11 +105,9 @@ class ScheduleTaskController extends ClientApiController
      * Delete a given task for a schedule. If there are subsequent tasks stored in the database
      * for this schedule their sequence IDs are decremented properly.
      *
-     * @return \Illuminate\Http\JsonResponse
-     *
      * @throws \Exception
      */
-    public function delete(ClientApiRequest $request, Server $server, Schedule $schedule, Task $task)
+    public function delete(ClientApiRequest $request, Server $server, Schedule $schedule, Task $task): JsonResponse
     {
         if ($task->schedule_id !== $schedule->id || $schedule->server_id !== $server->id) {
             throw new NotFoundHttpException();

app/Http/Controllers/Api/Client/Servers/ServerController.php

@@ -3,7 +3,6 @@
 namespace Pterodactyl\Http\Controllers\Api\Client\Servers;
 
 use Pterodactyl\Models\Server;
-use Pterodactyl\Repositories\Eloquent\SubuserRepository;
 use Pterodactyl\Transformers\Api\Client\ServerTransformer;
 use Pterodactyl\Services\Servers\GetUserPermissionsService;
 use Pterodactyl\Http\Controllers\Api\Client\ClientApiController;
@@ -11,25 +10,12 @@ use Pterodactyl\Http\Requests\Api\Client\Servers\GetServerRequest;
 
 class ServerController extends ClientApiController
 {
-    /**
-     * @var \Pterodactyl\Repositories\Eloquent\SubuserRepository
-     */
-    private $repository;
-
-    /**
-     * @var \Pterodactyl\Services\Servers\GetUserPermissionsService
-     */
-    private $permissionsService;
-
     /**
      * ServerController constructor.
      */
-    public function __construct(GetUserPermissionsService $permissionsService, SubuserRepository $repository)
+    public function __construct(private GetUserPermissionsService $permissionsService)
     {
         parent::__construct();
-
-        $this->repository = $repository;
-        $this->permissionsService = $permissionsService;
     }
 
     /**

app/Http/Controllers/Api/Client/Servers/SettingsController.php

@@ -16,38 +16,23 @@ use Pterodactyl\Http\Requests\Api\Client\Servers\Settings\ReinstallServerRequest
 
 class SettingsController extends ClientApiController
 {
-    /**
-     * @var \Pterodactyl\Repositories\Eloquent\ServerRepository
-     */
-    private $repository;
-
-    /**
-     * @var \Pterodactyl\Services\Servers\ReinstallServerService
-     */
-    private $reinstallServerService;
-
     /**
      * SettingsController constructor.
      */
     public function __construct(
-        ServerRepository $repository,
-        ReinstallServerService $reinstallServerService
+        private ServerRepository $repository,
+        private ReinstallServerService $reinstallServerService
     ) {
         parent::__construct();
-
-        $this->repository = $repository;
-        $this->reinstallServerService = $reinstallServerService;
     }
 
     /**
      * Renames a server.
      *
-     * @return \Illuminate\Http\JsonResponse
-     *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function rename(RenameServerRequest $request, Server $server)
+    public function rename(RenameServerRequest $request, Server $server): JsonResponse
     {
         $this->repository->update($server->id, [
             'name' => $request->input('name'),
@@ -65,11 +50,9 @@ class SettingsController extends ClientApiController
     /**
      * Reinstalls the server on the daemon.
      *
-     * @return \Illuminate\Http\JsonResponse
-     *
      * @throws \Throwable
      */
-    public function reinstall(ReinstallServerRequest $request, Server $server)
+    public function reinstall(ReinstallServerRequest $request, Server $server): JsonResponse
     {
         $this->reinstallServerService->handle($server);
 
@@ -81,11 +64,9 @@ class SettingsController extends ClientApiController
     /**
      * Changes the Docker image in use by the server.
      *
-     * @return \Illuminate\Http\JsonResponse
-     *
      * @throws \Throwable
      */
-    public function dockerImage(SetDockerImageRequest $request, Server $server)
+    public function dockerImage(SetDockerImageRequest $request, Server $server): JsonResponse
     {
         if (!in_array($server->image, array_values($server->egg->docker_images))) {
             throw new BadRequestHttpException('This server\'s Docker image has been manually set by an administrator and cannot be updated.');

app/Http/Controllers/Api/Client/Servers/StartupController.php

@@ -5,7 +5,6 @@ namespace Pterodactyl\Http\Controllers\Api\Client\Servers;
 use Pterodactyl\Models\Server;
 use Pterodactyl\Facades\Activity;
 use Pterodactyl\Services\Servers\StartupCommandService;
-use Pterodactyl\Services\Servers\VariableValidatorService;
 use Pterodactyl\Repositories\Eloquent\ServerVariableRepository;
 use Pterodactyl\Transformers\Api\Client\EggVariableTransformer;
 use Pterodactyl\Http\Controllers\Api\Client\ClientApiController;
@@ -15,41 +14,22 @@ use Pterodactyl\Http\Requests\Api\Client\Servers\Startup\UpdateStartupVariableRe
 
 class StartupController extends ClientApiController
 {
-    /**
-     * @var \Pterodactyl\Services\Servers\VariableValidatorService
-     */
-    private $service;
-
-    /**
-     * @var \Pterodactyl\Repositories\Eloquent\ServerVariableRepository
-     */
-    private $repository;
-
-    /**
-     * @var \Pterodactyl\Services\Servers\StartupCommandService
-     */
-    private $startupCommandService;
-
     /**
      * StartupController constructor.
      */
-    public function __construct(VariableValidatorService $service, StartupCommandService $startupCommandService, ServerVariableRepository $repository)
-    {
+    public function __construct(
+        private StartupCommandService $startupCommandService,
+        private ServerVariableRepository $repository
+    ) {
         parent::__construct();
-
-        $this->service = $service;
-        $this->repository = $repository;
-        $this->startupCommandService = $startupCommandService;
     }
 
     /**
-     * Returns the startup information for the server including all of the variables.
-     *
-     * @return array
+     * Returns the startup information for the server including all the variables.
      */
-    public function index(GetStartupRequest $request, Server $server)
+    public function index(GetStartupRequest $request, Server $server): array
     {
-        $startup = $this->startupCommandService->handle($server, false);
+        $startup = $this->startupCommandService->handle($server);
 
         return $this->fractal->collection(
             $server->variables()->where('user_viewable', true)->get()
@@ -66,13 +46,11 @@ class StartupController extends ClientApiController
     /**
      * Updates a single variable for a server.
      *
-     * @return array
-     *
      * @throws \Illuminate\Validation\ValidationException
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function update(UpdateStartupVariableRequest $request, Server $server)
+    public function update(UpdateStartupVariableRequest $request, Server $server): array
     {
         /** @var \Pterodactyl\Models\EggVariable $variable */
         $variable = $server->variables()->where('env_variable', $request->input('key'))->first();
@@ -97,7 +75,7 @@ class StartupController extends ClientApiController
         $variable = $variable->refresh();
         $variable->server_value = $request->input('value');
 
-        $startup = $this->startupCommandService->handle($server, false);
+        $startup = $this->startupCommandService->handle($server);
 
         if ($variable->env_variable !== $request->input('value')) {
             Activity::event('server:startup.edit')

app/Http/Controllers/Api/Client/Servers/SubuserController.php

@@ -21,42 +21,21 @@ use Pterodactyl\Http\Requests\Api\Client\Servers\Subusers\UpdateSubuserRequest;
 
 class SubuserController extends ClientApiController
 {
-    /**
-     * @var \Pterodactyl\Repositories\Eloquent\SubuserRepository
-     */
-    private $repository;
-
-    /**
-     * @var \Pterodactyl\Services\Subusers\SubuserCreationService
-     */
-    private $creationService;
-
-    /**
-     * @var \Pterodactyl\Repositories\Wings\DaemonServerRepository
-     */
-    private $serverRepository;
-
     /**
      * SubuserController constructor.
      */
     public function __construct(
-        SubuserRepository $repository,
-        SubuserCreationService $creationService,
-        DaemonServerRepository $serverRepository
+        private SubuserRepository $repository,
+        private SubuserCreationService $creationService,
+        private DaemonServerRepository $serverRepository
     ) {
         parent::__construct();
-
-        $this->repository = $repository;
-        $this->creationService = $creationService;
-        $this->serverRepository = $serverRepository;
     }
 
     /**
      * Return the users associated with this server instance.
-     *
-     * @return array
      */
-    public function index(GetSubuserRequest $request, Server $server)
+    public function index(GetSubuserRequest $request, Server $server): array
     {
         return $this->fractal->collection($server->subusers)
             ->transformWith($this->getTransformer(SubuserTransformer::class))
@@ -65,10 +44,8 @@ class SubuserController extends ClientApiController
 
     /**
      * Returns a single subuser associated with this server instance.
-     *
-     * @return array
      */
-    public function view(GetSubuserRequest $request)
+    public function view(GetSubuserRequest $request): array
     {
         $subuser = $request->attributes->get('subuser');
 
@@ -80,14 +57,12 @@ class SubuserController extends ClientApiController
     /**
      * Create a new subuser for the given server.
      *
-     * @return array
-     *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Service\Subuser\ServerSubuserExistsException
      * @throws \Pterodactyl\Exceptions\Service\Subuser\UserIsServerOwnerException
      * @throws \Throwable
      */
-    public function store(StoreSubuserRequest $request, Server $server)
+    public function store(StoreSubuserRequest $request, Server $server): array
     {
         $response = $this->creationService->handle(
             $server,
@@ -143,7 +118,7 @@ class SubuserController extends ClientApiController
                     $this->serverRepository->setServer($server)->revokeUserJTI($subuser->user_id);
                 } catch (DaemonConnectionException $exception) {
                     // Don't block this request if we can't connect to the Wings instance. Chances are it is
-                    // offline in this event and the token will be invalid anyways once Wings boots back.
+                    // offline and the token will be invalid once Wings boots back.
                     Log::warning($exception, ['user_id' => $subuser->user_id, 'server_id' => $server->id]);
 
                     $instance->property('revoked', false);
@@ -160,10 +135,8 @@ class SubuserController extends ClientApiController
 
     /**
      * Removes a subusers from a server's assignment.
-     *
-     * @return \Illuminate\Http\JsonResponse
      */
-    public function delete(DeleteSubuserRequest $request, Server $server)
+    public function delete(DeleteSubuserRequest $request, Server $server): JsonResponse
     {
         /** @var \Pterodactyl\Models\Subuser $subuser */
         $subuser = $request->attributes->get('subuser');

app/Http/Controllers/Api/Client/Servers/WebsocketController.php

@@ -14,38 +14,23 @@ use Pterodactyl\Http\Controllers\Api\Client\ClientApiController;
 
 class WebsocketController extends ClientApiController
 {
-    /**
-     * @var \Pterodactyl\Services\Nodes\NodeJWTService
-     */
-    private $jwtService;
-
-    /**
-     * @var \Pterodactyl\Services\Servers\GetUserPermissionsService
-     */
-    private $permissionsService;
-
     /**
      * WebsocketController constructor.
      */
     public function __construct(
-        NodeJWTService $jwtService,
-        GetUserPermissionsService $permissionsService
+        private NodeJWTService $jwtService,
+        private GetUserPermissionsService $permissionsService
     ) {
         parent::__construct();
-
-        $this->jwtService = $jwtService;
-        $this->permissionsService = $permissionsService;
     }
 
     /**
      * Generates a one-time token that is sent along in every websocket call to the Daemon.
-     * This is a signed JWT that the Daemon then uses the verify the user's identity, and
-     * allows us to continually renew this token and avoid users mainitaining sessions wrongly,
+     * This is a signed JWT that the Daemon then uses to verify the user's identity, and
+     * allows us to continually renew this token and avoid users maintaining sessions wrongly,
      * as well as ensure that user's only perform actions they're allowed to.
-     *
-     * @return \Illuminate\Http\JsonResponse
      */
-    public function __invoke(ClientApiRequest $request, Server $server)
+    public function __invoke(ClientApiRequest $request, Server $server): JsonResponse
     {
         $user = $request->user();
         if ($user->cannot(Permission::ACTION_WEBSOCKET_CONNECT, $server)) {

app/Http/Controllers/Api/Client/TwoFactorController.php

@@ -7,41 +7,22 @@ use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Http\JsonResponse;
 use Pterodactyl\Facades\Activity;
-use Illuminate\Contracts\Validation\Factory;
 use Pterodactyl\Services\Users\TwoFactorSetupService;
 use Pterodactyl\Services\Users\ToggleTwoFactorService;
+use Illuminate\Contracts\Validation\Factory as ValidationFactory;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 
 class TwoFactorController extends ClientApiController
 {
-    /**
-     * @var \Pterodactyl\Services\Users\TwoFactorSetupService
-     */
-    private $setupService;
-
-    /**
-     * @var \Illuminate\Contracts\Validation\Factory
-     */
-    private $validation;
-
-    /**
-     * @var \Pterodactyl\Services\Users\ToggleTwoFactorService
-     */
-    private $toggleTwoFactorService;
-
     /**
      * TwoFactorController constructor.
      */
     public function __construct(
-        ToggleTwoFactorService $toggleTwoFactorService,
-        TwoFactorSetupService $setupService,
-        Factory $validation
+        private ToggleTwoFactorService $toggleTwoFactorService,
+        private TwoFactorSetupService $setupService,
+        private ValidationFactory $validation
     ) {
         parent::__construct();
-
-        $this->setupService = $setupService;
-        $this->validation = $validation;
-        $this->toggleTwoFactorService = $toggleTwoFactorService;
     }
 
     /**
@@ -49,12 +30,10 @@ class TwoFactorController extends ClientApiController
      * it on their account. If two-factor is already enabled this endpoint
      * will return a 400 error.
      *
-     * @return \Illuminate\Http\JsonResponse
-     *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function index(Request $request)
+    public function index(Request $request): JsonResponse
     {
         if ($request->user()->use_totp) {
             throw new BadRequestHttpException('Two-factor authentication is already enabled on this account.');
@@ -68,12 +47,10 @@ class TwoFactorController extends ClientApiController
     /**
      * Updates a user's account to have two-factor enabled.
      *
-     * @return \Illuminate\Http\JsonResponse
-     *
      * @throws \Throwable
      * @throws \Illuminate\Validation\ValidationException
      */
-    public function store(Request $request)
+    public function store(Request $request): JsonResponse
     {
         $validator = $this->validation->make($request->all(), [
             'code' => ['required', 'string', 'size:6'],
@@ -101,10 +78,9 @@ class TwoFactorController extends ClientApiController
      * Disables two-factor authentication on an account if the password provided
      * is valid.
      *
-     * @return \Illuminate\Http\JsonResponse
      * @throws \Throwable
      */
-    public function delete(Request $request)
+    public function delete(Request $request): JsonResponse
     {
         if (!password_verify($request->input('password') ?? '', $request->user()->password)) {
             throw new BadRequestHttpException('The password provided was not valid.');