Upgrade to Laravel 9 (#4413)

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

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

@@ -8,7 +8,6 @@ use Pterodactyl\Models\Database;
 use Illuminate\Http\JsonResponse;
 use Pterodactyl\Services\Databases\DatabasePasswordService;
 use Pterodactyl\Services\Databases\DatabaseManagementService;
-use Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface;
 use Pterodactyl\Transformers\Api\Application\ServerDatabaseTransformer;
 use Pterodactyl\Http\Controllers\Api\Application\ApplicationApiController;
 use Pterodactyl\Http\Requests\Api\Application\Servers\Databases\GetServerDatabaseRequest;
@@ -18,34 +17,14 @@ use Pterodactyl\Http\Requests\Api\Application\Servers\Databases\StoreServerDatab
 
 class DatabaseController extends ApplicationApiController
 {
-    /**
-     * @var \Pterodactyl\Services\Databases\DatabaseManagementService
-     */
-    private $databaseManagementService;
-
-    /**
-     * @var \Pterodactyl\Services\Databases\DatabasePasswordService
-     */
-    private $databasePasswordService;
-
-    /**
-     * @var \Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface
-     */
-    private $repository;
-
     /**
      * DatabaseController constructor.
      */
     public function __construct(
-        DatabaseManagementService $databaseManagementService,
-        DatabasePasswordService $databasePasswordService,
-        DatabaseRepositoryInterface $repository
+        private DatabaseManagementService $databaseManagementService,
+        private DatabasePasswordService $databasePasswordService
     ) {
         parent::__construct();
-
-        $this->databaseManagementService = $databaseManagementService;
-        $this->databasePasswordService = $databasePasswordService;
-        $this->repository = $repository;
     }
 
     /**

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

@@ -8,7 +8,6 @@ use Illuminate\Http\JsonResponse;
 use Spatie\QueryBuilder\QueryBuilder;
 use Pterodactyl\Services\Servers\ServerCreationService;
 use Pterodactyl\Services\Servers\ServerDeletionService;
-use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 use Pterodactyl\Transformers\Api\Application\ServerTransformer;
 use Pterodactyl\Http\Requests\Api\Application\Servers\GetServerRequest;
 use Pterodactyl\Http\Requests\Api\Application\Servers\GetServersRequest;
@@ -18,38 +17,18 @@ use Pterodactyl\Http\Controllers\Api\Application\ApplicationApiController;
 
 class ServerController extends ApplicationApiController
 {
-    /**
-     * @var \Pterodactyl\Services\Servers\ServerCreationService
-     */
-    private $creationService;
-
-    /**
-     * @var \Pterodactyl\Services\Servers\ServerDeletionService
-     */
-    private $deletionService;
-
-    /**
-     * @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface
-     */
-    private $repository;
-
     /**
      * ServerController constructor.
      */
     public function __construct(
-        ServerCreationService $creationService,
-        ServerDeletionService $deletionService,
-        ServerRepositoryInterface $repository
+        private ServerCreationService $creationService,
+        private ServerDeletionService $deletionService
     ) {
         parent::__construct();
-
-        $this->creationService = $creationService;
-        $this->deletionService = $deletionService;
-        $this->repository = $repository;
     }
 
     /**
-     * Return all of the servers that currently exist on the Panel.
+     * Return all the servers that currently exist on the Panel.
      */
     public function index(GetServersRequest $request): array
     {
@@ -94,6 +73,8 @@ class ServerController extends ApplicationApiController
     }
 
     /**
+     * Deletes a server.
+     *
      * @throws \Pterodactyl\Exceptions\DisplayException
      */
     public function delete(ServerWriteRequest $request, Server $server, string $force = ''): Response

app/Http/Controllers/Api/Application/Servers/ServerDetailsController.php

@@ -12,27 +12,14 @@ use Pterodactyl\Http\Requests\Api\Application\Servers\UpdateServerBuildConfigura
 
 class ServerDetailsController extends ApplicationApiController
 {
-    /**
-     * @var \Pterodactyl\Services\Servers\BuildModificationService
-     */
-    private $buildModificationService;
-
-    /**
-     * @var \Pterodactyl\Services\Servers\DetailsModificationService
-     */
-    private $detailsModificationService;
-
     /**
      * ServerDetailsController constructor.
      */
     public function __construct(
-        BuildModificationService $buildModificationService,
-        DetailsModificationService $detailsModificationService
+        private BuildModificationService $buildModificationService,
+        private DetailsModificationService $detailsModificationService
     ) {
         parent::__construct();
-
-        $this->buildModificationService = $buildModificationService;
-        $this->detailsModificationService = $detailsModificationService;
     }
 
     /**

app/Http/Controllers/Api/Application/Servers/ServerManagementController.php

@@ -12,26 +12,13 @@ use Pterodactyl\Http\Controllers\Api\Application\ApplicationApiController;
 class ServerManagementController extends ApplicationApiController
 {
     /**
-     * @var \Pterodactyl\Services\Servers\ReinstallServerService
-     */
-    private $reinstallServerService;
-
-    /**
-     * @var \Pterodactyl\Services\Servers\SuspensionService
-     */
-    private $suspensionService;
-
-    /**
-     * SuspensionController constructor.
+     * ServerManagementController constructor.
      */
     public function __construct(
-        ReinstallServerService $reinstallServerService,
-        SuspensionService $suspensionService
+        private ReinstallServerService $reinstallServerService,
+        private SuspensionService $suspensionService
     ) {
         parent::__construct();
-
-        $this->reinstallServerService = $reinstallServerService;
-        $this->suspensionService = $suspensionService;
     }
 
     /**
@@ -41,7 +28,7 @@ class ServerManagementController extends ApplicationApiController
      */
     public function suspend(ServerWriteRequest $request, Server $server): Response
     {
-        $this->suspensionService->toggle($server, SuspensionService::ACTION_SUSPEND);
+        $this->suspensionService->toggle($server);
 
         return $this->returnNoContent();
     }

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

@@ -11,19 +11,12 @@ use Pterodactyl\Http\Requests\Api\Application\Servers\UpdateServerStartupRequest
 
 class StartupController extends ApplicationApiController
 {
-    /**
-     * @var \Pterodactyl\Services\Servers\StartupModificationService
-     */
-    private $modificationService;
-
     /**
      * StartupController constructor.
      */
-    public function __construct(StartupModificationService $modificationService)
+    public function __construct(private StartupModificationService $modificationService)
     {
         parent::__construct();
-
-        $this->modificationService = $modificationService;
     }
 
     /**