Upgrade to Laravel 9 (#4413)

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

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

@@ -15,49 +15,24 @@ use Pterodactyl\Services\Servers\ServerConfigurationStructureService;
 
 class ServerDetailsController extends Controller
 {
-    protected ConnectionInterface $connection;
-
-    /**
-     * @var \Pterodactyl\Services\Eggs\EggConfigurationService
-     */
-    private $eggConfigurationService;
-
-    /**
-     * @var \Pterodactyl\Repositories\Eloquent\ServerRepository
-     */
-    private $repository;
-
-    /**
-     * @var \Pterodactyl\Services\Servers\ServerConfigurationStructureService
-     */
-    private $configurationStructureService;
-
     /**
      * ServerConfigurationController constructor.
      */
     public function __construct(
-        ConnectionInterface $connection,
-        ServerRepository $repository,
-        ServerConfigurationStructureService $configurationStructureService,
-        EggConfigurationService $eggConfigurationService
+        protected ConnectionInterface $connection,
+        private ServerRepository $repository,
+        private ServerConfigurationStructureService $configurationStructureService,
+        private EggConfigurationService $eggConfigurationService
     ) {
-        $this->eggConfigurationService = $eggConfigurationService;
-        $this->repository = $repository;
-        $this->configurationStructureService = $configurationStructureService;
-        $this->connection = $connection;
     }
 
     /**
      * Returns details about the server that allows Wings to self-recover and ensure
      * that the state of the server matches the Panel at all times.
      *
-     * @param string $uuid
-     *
-     * @return \Illuminate\Http\JsonResponse
-     *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function __invoke(Request $request, $uuid)
+    public function __invoke(Request $request, string $uuid): JsonResponse
     {
         $server = $this->repository->getByUuid($uuid);
 
@@ -69,15 +44,13 @@ class ServerDetailsController extends Controller
 
     /**
      * Lists all servers with their configurations that are assigned to the requesting node.
-     *
-     * @return \Pterodactyl\Http\Resources\Wings\ServerConfigurationCollection
      */
-    public function list(Request $request)
+    public function list(Request $request): ServerConfigurationCollection
     {
         /** @var \Pterodactyl\Models\Node $node */
         $node = $request->attributes->get('node');
 
-        // Avoid run-away N+1 SQL queries by pre-loading the relationships that are used
+        // Avoid run-away N+1 SQL queries by preloading the relationships that are used
         // within each of the services called below.
         $servers = Server::query()->with('allocations', 'egg', 'mounts', 'variables', 'location')
             ->where('node_id', $node->id)
@@ -94,15 +67,13 @@ class ServerDetailsController extends Controller
      * do not get incorrectly stuck in installing/restoring from backup states since
      * a Wings reboot would completely stop those processes.
      *
-     * @return \Illuminate\Http\JsonResponse
-     *
      * @throws \Throwable
      */
-    public function resetState(Request $request)
+    public function resetState(Request $request): JsonResponse
     {
         $node = $request->attributes->get('node');
 
-        // Get all of the servers that are currently marked as restoring from a backup
+        // Get all the servers that are currently marked as restoring from a backup
         // on this node that do not have a failed backup tracked in the audit logs table
         // as well.
         //

app/Http/Controllers/Api/Remote/Servers/ServerInstallController.php

@@ -15,30 +15,16 @@ use Pterodactyl\Http\Requests\Api\Remote\InstallationDataRequest;
 
 class ServerInstallController extends Controller
 {
-    /**
-     * @var \Pterodactyl\Repositories\Eloquent\ServerRepository
-     */
-    private $repository;
-
-    /**
-     * @var \Illuminate\Contracts\Events\Dispatcher
-     */
-    private $eventDispatcher;
-
     /**
      * ServerInstallController constructor.
      */
-    public function __construct(ServerRepository $repository, EventDispatcher $eventDispatcher)
+    public function __construct(private ServerRepository $repository, private EventDispatcher $eventDispatcher)
     {
-        $this->repository = $repository;
-        $this->eventDispatcher = $eventDispatcher;
     }
 
     /**
      * Returns installation information for a server.
      *
-     * @return \Illuminate\Http\JsonResponse
-     *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function index(Request $request, string $uuid): JsonResponse
@@ -56,8 +42,6 @@ class ServerInstallController extends Controller
     /**
      * Updates the installation state of a server.
      *
-     * @return \Illuminate\Http\JsonResponse
-     *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      */
@@ -77,7 +61,7 @@ class ServerInstallController extends Controller
         $isInitialInstall = is_null($server->installed_at);
         if ($isInitialInstall && config()->get('pterodactyl.email.send_install_notification', true)) {
             $this->eventDispatcher->dispatch(new ServerInstalled($server));
-        } elseif (! $isInitialInstall && config()->get('pterodactyl.email.send_reinstall_notification', true)) {
+        } elseif (!$isInitialInstall && config()->get('pterodactyl.email.send_reinstall_notification', true)) {
             $this->eventDispatcher->dispatch(new ServerInstalled($server));
         }
 

app/Http/Controllers/Api/Remote/Servers/ServerTransferController.php

@@ -16,68 +16,28 @@ use Pterodactyl\Repositories\Eloquent\ServerRepository;
 use Pterodactyl\Repositories\Wings\DaemonServerRepository;
 use Pterodactyl\Repositories\Wings\DaemonTransferRepository;
 use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
-use Pterodactyl\Services\Servers\ServerConfigurationStructureService;
 
 class ServerTransferController extends Controller
 {
-    /**
-     * @var \Illuminate\Database\ConnectionInterface
-     */
-    private $connection;
-
-    /**
-     * @var \Pterodactyl\Repositories\Eloquent\ServerRepository
-     */
-    private $repository;
-
-    /**
-     * @var \Pterodactyl\Repositories\Wings\DaemonServerRepository
-     */
-    private $daemonServerRepository;
-
-    /**
-     * @var \Pterodactyl\Repositories\Wings\DaemonTransferRepository
-     */
-    private $daemonTransferRepository;
-
-    /**
-     * @var \Pterodactyl\Services\Servers\ServerConfigurationStructureService
-     */
-    private $configurationStructureService;
-
-    /**
-     * @var \Pterodactyl\Services\Nodes\NodeJWTService
-     */
-    private $jwtService;
-
     /**
      * ServerTransferController constructor.
      */
     public function __construct(
-        ConnectionInterface $connection,
-        ServerRepository $repository,
-        DaemonServerRepository $daemonServerRepository,
-        DaemonTransferRepository $daemonTransferRepository,
-        ServerConfigurationStructureService $configurationStructureService,
-        NodeJWTService $jwtService
+        private ConnectionInterface $connection,
+        private ServerRepository $repository,
+        private DaemonServerRepository $daemonServerRepository,
+        private DaemonTransferRepository $daemonTransferRepository,
+        private NodeJWTService $jwtService
     ) {
-        $this->connection = $connection;
-        $this->repository = $repository;
-        $this->daemonServerRepository = $daemonServerRepository;
-        $this->daemonTransferRepository = $daemonTransferRepository;
-        $this->configurationStructureService = $configurationStructureService;
-        $this->jwtService = $jwtService;
     }
 
     /**
      * The daemon notifies us about the archive status.
      *
-     * @return \Illuminate\Http\JsonResponse
-     *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      * @throws \Throwable
      */
-    public function archive(Request $request, string $uuid)
+    public function archive(Request $request, string $uuid): JsonResponse
     {
         $server = $this->repository->getByUuid($uuid);
 
@@ -114,11 +74,9 @@ class ServerTransferController extends Controller
     /**
      * The daemon notifies us about a transfer failure.
      *
-     * @return \Illuminate\Http\JsonResponse
-     *
      * @throws \Throwable
      */
-    public function failure(string $uuid)
+    public function failure(string $uuid): JsonResponse
     {
         $server = $this->repository->getByUuid($uuid);
 
@@ -168,14 +126,12 @@ class ServerTransferController extends Controller
     }
 
     /**
-     * Release all of the reserved allocations for this transfer and mark it as failed in
+     * Release all the reserved allocations for this transfer and mark it as failed in
      * the database.
      *
-     * @return \Illuminate\Http\JsonResponse
-     *
      * @throws \Throwable
      */
-    protected function processFailedTransfer(ServerTransfer $transfer)
+    protected function processFailedTransfer(ServerTransfer $transfer): JsonResponse
     {
         $this->connection->transaction(function () use (&$transfer) {
             $transfer->forceFill(['successful' => false])->saveOrFail();