Merge branch 'develop' into feature/server-mounts

app/Services/Servers/BuildModificationService.php

@@ -71,8 +71,8 @@ class BuildModificationService
      * @return \Pterodactyl\Models\Server
      *
      * @throws \Pterodactyl\Exceptions\DisplayException
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      */
     public function handle(Server $server, array $data)
     {
@@ -91,7 +91,7 @@ class BuildModificationService
             }
         }
 
-        /** @var \Pterodactyl\Models\Server $server */
+        /* @var \Pterodactyl\Models\Server $server */
         $server = $this->repository->withFreshModel()->update($server->id, [
             'oom_disabled' => array_get($data, 'oom_disabled'),
             'memory' => array_get($data, 'memory'),

app/Services/Servers/ReinstallServerService.php

@@ -4,8 +4,8 @@ namespace Pterodactyl\Services\Servers;
 
 use Pterodactyl\Models\Server;
 use Illuminate\Database\ConnectionInterface;
+use Pterodactyl\Repositories\Eloquent\ServerRepository;
 use Pterodactyl\Repositories\Wings\DaemonServerRepository;
-use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 
 class ReinstallServerService
 {
@@ -17,27 +17,27 @@ class ReinstallServerService
     /**
      * @var \Illuminate\Database\ConnectionInterface
      */
-    private $database;
+    private $connection;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface
+     * @var \Pterodactyl\Repositories\Eloquent\ServerRepository
      */
     private $repository;
 
     /**
      * ReinstallService constructor.
      *
-     * @param \Illuminate\Database\ConnectionInterface $database
+     * @param \Illuminate\Database\ConnectionInterface $connection
      * @param \Pterodactyl\Repositories\Wings\DaemonServerRepository $daemonServerRepository
-     * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository
+     * @param \Pterodactyl\Repositories\Eloquent\ServerRepository $repository
      */
     public function __construct(
-        ConnectionInterface $database,
+        ConnectionInterface $connection,
         DaemonServerRepository $daemonServerRepository,
-        ServerRepositoryInterface $repository
+        ServerRepository $repository
     ) {
         $this->daemonServerRepository = $daemonServerRepository;
-        $this->database = $database;
+        $this->connection = $connection;
         $this->repository = $repository;
     }
 
@@ -51,14 +51,14 @@ class ReinstallServerService
      */
     public function reinstall(Server $server)
     {
-        $this->database->transaction(function () use ($server) {
-            $this->repository->withoutFreshModel()->update($server->id, [
+        return $this->connection->transaction(function () use ($server) {
+            $updated = $this->repository->update($server->id, [
                 'installed' => Server::STATUS_INSTALLING,
-            ]);
+            ], true, true);
 
             $this->daemonServerRepository->setServer($server)->reinstall();
-        });
 
-        return $server->refresh();
+            return $updated;
+        });
     }
 }

app/Services/Servers/ServerCreationService.php

@@ -310,8 +310,6 @@ class ServerCreationService
         return $allocation->node_id;
     }
 
-    /** @noinspection PhpDocMissingThrowsInspection */
-
     /**
      * Create a unique UUID and UUID-Short combo for a server.
      *
@@ -319,7 +317,6 @@ class ServerCreationService
      */
     private function generateUniqueUuidCombo(): string
     {
-        /** @noinspection PhpUnhandledExceptionInspection */
         $uuid = Uuid::uuid4()->toString();
 
         if (! $this->repository->isUniqueUuidCombo($uuid, substr($uuid, 0, 8))) {

app/Services/Servers/ServerDeletionService.php

@@ -2,6 +2,7 @@
 
 namespace Pterodactyl\Services\Servers;
 
+use Exception;
 use Psr\Log\LoggerInterface;
 use Pterodactyl\Models\Server;
 use Illuminate\Database\ConnectionInterface;
@@ -109,7 +110,15 @@ class ServerDeletionService
 
         $this->connection->transaction(function () use ($server) {
             $this->databaseRepository->setColumns('id')->findWhere([['server_id', '=', $server->id]])->each(function ($item) {
-                $this->databaseManagementService->delete($item->id);
+                try {
+                    $this->databaseManagementService->delete($item->id);
+                } catch (Exception $exception) {
+                    if ($this->force) {
+                        $this->writer->warning($exception);
+                    } else {
+                        throw $exception;
+                    }
+                }
             });
 
             $this->repository->delete($server->id);