Upgrade to Laravel 9 (#4413)

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

app/Services/Backups/DeleteBackupService.php

@@ -7,46 +7,17 @@ use Pterodactyl\Models\Backup;
 use GuzzleHttp\Exception\ClientException;
 use Illuminate\Database\ConnectionInterface;
 use Pterodactyl\Extensions\Backups\BackupManager;
-use Pterodactyl\Repositories\Eloquent\BackupRepository;
 use Pterodactyl\Repositories\Wings\DaemonBackupRepository;
 use Pterodactyl\Exceptions\Service\Backup\BackupLockedException;
 use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
 
 class DeleteBackupService
 {
-    /**
-     * @var \Pterodactyl\Repositories\Eloquent\BackupRepository
-     */
-    private $repository;
-
-    /**
-     * @var \Pterodactyl\Repositories\Wings\DaemonBackupRepository
-     */
-    private $daemonBackupRepository;
-
-    /**
-     * @var \Illuminate\Database\ConnectionInterface
-     */
-    private $connection;
-
-    /**
-     * @var \Pterodactyl\Extensions\Backups\BackupManager
-     */
-    private $manager;
-
-    /**
-     * DeleteBackupService constructor.
-     */
     public function __construct(
-        ConnectionInterface $connection,
-        BackupRepository $repository,
-        BackupManager $manager,
-        DaemonBackupRepository $daemonBackupRepository
+        private ConnectionInterface $connection,
+        private BackupManager $manager,
+        private DaemonBackupRepository $daemonBackupRepository
     ) {
-        $this->repository = $repository;
-        $this->daemonBackupRepository = $daemonBackupRepository;
-        $this->connection = $connection;
-        $this->manager = $manager;
     }
 
     /**
@@ -55,7 +26,7 @@ class DeleteBackupService
      *
      * @throws \Throwable
      */
-    public function handle(Backup $backup)
+    public function handle(Backup $backup): void
     {
         // If the backup is marked as failed it can still be deleted, even if locked
         // since the UI doesn't allow you to unlock a failed backup in the first place.
@@ -79,13 +50,13 @@ class DeleteBackupService
             } catch (DaemonConnectionException $exception) {
                 $previous = $exception->getPrevious();
                 // Don't fail the request if the Daemon responds with a 404, just assume the backup
-                // doesn't actually exist and remove it's reference from the Panel as well.
+                // doesn't actually exist and remove its reference from the Panel as well.
                 if (!$previous instanceof ClientException || $previous->getResponse()->getStatusCode() !== Response::HTTP_NOT_FOUND) {
                     throw $exception;
                 }
             }
 
-            $this->repository->delete($backup->id);
+            $backup->delete();
         });
     }
 
@@ -94,12 +65,12 @@ class DeleteBackupService
      *
      * @throws \Throwable
      */
-    protected function deleteFromS3(Backup $backup)
+    protected function deleteFromS3(Backup $backup): void
     {
         $this->connection->transaction(function () use ($backup) {
-            $this->repository->delete($backup->id);
+            $backup->delete();
 
-            /** @var \League\Flysystem\AwsS3v3\AwsS3Adapter $adapter */
+            /** @var \Pterodactyl\Extensions\Filesystem\S3Filesystem $adapter */
             $adapter = $this->manager->adapter(Backup::ADAPTER_AWS_S3);
 
             $adapter->getClient()->deleteObject([

app/Services/Backups/DownloadLinkService.php

@@ -10,23 +10,11 @@ use Pterodactyl\Extensions\Backups\BackupManager;
 
 class DownloadLinkService
 {
-    /**
-     * @var \Pterodactyl\Extensions\Backups\BackupManager
-     */
-    private $backupManager;
-
-    /**
-     * @var \Pterodactyl\Services\Nodes\NodeJWTService
-     */
-    private $jwtService;
-
     /**
      * DownloadLinkService constructor.
      */
-    public function __construct(BackupManager $backupManager, NodeJWTService $jwtService)
+    public function __construct(private BackupManager $backupManager, private NodeJWTService $jwtService)
     {
-        $this->backupManager = $backupManager;
-        $this->jwtService = $jwtService;
     }
 
     /**
@@ -54,12 +42,10 @@ class DownloadLinkService
     /**
      * Returns a signed URL that allows us to download a file directly out of a non-public
      * S3 bucket by using a signed URL.
-     *
-     * @return string
      */
-    protected function getS3BackupUrl(Backup $backup)
+    protected function getS3BackupUrl(Backup $backup): string
     {
-        /** @var \League\Flysystem\AwsS3v3\AwsS3Adapter $adapter */
+        /** @var \Pterodactyl\Extensions\Filesystem\S3Filesystem $adapter */
         $adapter = $this->backupManager->adapter(Backup::ADAPTER_AWS_S3);
 
         $request = $adapter->getClient()->createPresignedRequest(

app/Services/Backups/InitiateBackupService.php

@@ -16,65 +16,25 @@ use Symfony\Component\HttpKernel\Exception\TooManyRequestsHttpException;
 
 class InitiateBackupService
 {
-    /**
-     * @var string[]|null
-     */
-    private $ignoredFiles;
+    private ?array $ignoredFiles;
 
-    /**
-     * @var bool
-     */
-    private $isLocked = false;
-
-    /**
-     * @var \Pterodactyl\Repositories\Eloquent\BackupRepository
-     */
-    private $repository;
-
-    /**
-     * @var \Illuminate\Database\ConnectionInterface
-     */
-    private $connection;
-
-    /**
-     * @var \Pterodactyl\Repositories\Wings\DaemonBackupRepository
-     */
-    private $daemonBackupRepository;
-
-    /**
-     * @var \Pterodactyl\Extensions\Backups\BackupManager
-     */
-    private $backupManager;
-
-    /**
-     * @var \Pterodactyl\Services\Backups\DeleteBackupService
-     */
-    private $deleteBackupService;
+    private bool $isLocked = false;
 
     /**
      * InitiateBackupService constructor.
-     *
-     * @param \Pterodactyl\Services\Backups\DeleteBackupService $deleteBackupService
      */
     public function __construct(
-        BackupRepository $repository,
-        ConnectionInterface $connection,
-        DaemonBackupRepository $daemonBackupRepository,
-        DeleteBackupService $deleteBackupService,
-        BackupManager $backupManager
+        private BackupRepository $repository,
+        private ConnectionInterface $connection,
+        private DaemonBackupRepository $daemonBackupRepository,
+        private DeleteBackupService $deleteBackupService,
+        private BackupManager $backupManager
     ) {
-        $this->repository = $repository;
-        $this->connection = $connection;
-        $this->daemonBackupRepository = $daemonBackupRepository;
-        $this->backupManager = $backupManager;
-        $this->deleteBackupService = $deleteBackupService;
     }
 
     /**
      * Set if the backup should be locked once it is created which will prevent
      * its deletion by users or automated system processes.
-     *
-     * @return $this
      */
     public function setIsLocked(bool $isLocked): self
     {
@@ -87,10 +47,8 @@ class InitiateBackupService
      * Sets the files to be ignored by this backup.
      *
      * @param string[]|null $ignored
-     *
-     * @return $this
      */
-    public function setIgnoredFiles(?array $ignored)
+    public function setIgnoredFiles(?array $ignored): self
     {
         if (is_array($ignored)) {
             foreach ($ignored as $value) {