Merge branch 'develop' into dane/restore-backups

app/Http/Controllers/Admin/ServersController.php

@@ -9,14 +9,12 @@
 
 namespace Pterodactyl\Http\Controllers\Admin;
 
-use Illuminate\Support\Arr;
 use Illuminate\Http\Request;
 use Pterodactyl\Models\User;
 use Pterodactyl\Models\Mount;
 use Pterodactyl\Models\Server;
 use Pterodactyl\Models\MountServer;
 use Prologue\Alerts\AlertsMessageBag;
-use GuzzleHttp\Exception\RequestException;
 use Pterodactyl\Exceptions\DisplayException;
 use Pterodactyl\Http\Controllers\Controller;
 use Illuminate\Validation\ValidationException;
@@ -37,7 +35,6 @@ use Illuminate\Contracts\Config\Repository as ConfigRepository;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 use Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface;
 use Pterodactyl\Contracts\Repository\AllocationRepositoryInterface;
-use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
 use Pterodactyl\Services\Servers\ServerConfigurationStructureService;
 use Pterodactyl\Http\Requests\Admin\Servers\Databases\StoreServerDatabaseRequest;
 
@@ -135,25 +132,6 @@ class ServersController extends Controller
 
     /**
      * ServersController constructor.
-     *
-     * @param \Prologue\Alerts\AlertsMessageBag $alert
-     * @param \Pterodactyl\Contracts\Repository\AllocationRepositoryInterface $allocationRepository
-     * @param \Pterodactyl\Services\Servers\BuildModificationService $buildModificationService
-     * @param \Illuminate\Contracts\Config\Repository $config
-     * @param \Pterodactyl\Repositories\Wings\DaemonServerRepository $daemonServerRepository
-     * @param \Pterodactyl\Services\Databases\DatabaseManagementService $databaseManagementService
-     * @param \Pterodactyl\Services\Databases\DatabasePasswordService $databasePasswordService
-     * @param \Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface $databaseRepository
-     * @param \Pterodactyl\Repositories\Eloquent\DatabaseHostRepository $databaseHostRepository
-     * @param \Pterodactyl\Services\Servers\ServerDeletionService $deletionService
-     * @param \Pterodactyl\Services\Servers\DetailsModificationService $detailsModificationService
-     * @param \Pterodactyl\Services\Servers\ReinstallServerService $reinstallService
-     * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository
-     * @param \Pterodactyl\Repositories\Eloquent\MountRepository $mountRepository
-     * @param \Pterodactyl\Contracts\Repository\NestRepositoryInterface $nestRepository
-     * @param \Pterodactyl\Services\Servers\ServerConfigurationStructureService $serverConfigurationStructureService
-     * @param \Pterodactyl\Services\Servers\StartupModificationService $startupModificationService
-     * @param \Pterodactyl\Services\Servers\SuspensionService $suspensionService
      */
     public function __construct(
         AlertsMessageBag $alert,
@@ -198,8 +176,6 @@ class ServersController extends Controller
     /**
      * Update the details for a server.
      *
-     * @param \Illuminate\Http\Request $request
-     * @param \Pterodactyl\Models\Server $server
      * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
@@ -219,7 +195,6 @@ class ServersController extends Controller
     /**
      * Toggles the install status for a server.
      *
-     * @param \Pterodactyl\Models\Server $server
      * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Pterodactyl\Exceptions\DisplayException
@@ -244,7 +219,6 @@ class ServersController extends Controller
     /**
      * Reinstalls the server with the currently assigned service.
      *
-     * @param \Pterodactyl\Models\Server $server
      * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Pterodactyl\Exceptions\DisplayException
@@ -262,8 +236,6 @@ class ServersController extends Controller
     /**
      * Manage the suspension status for a server.
      *
-     * @param \Illuminate\Http\Request $request
-     * @param \Pterodactyl\Models\Server $server
      * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Pterodactyl\Exceptions\DisplayException
@@ -283,8 +255,6 @@ class ServersController extends Controller
     /**
      * Update the build configuration for a server.
      *
-     * @param \Illuminate\Http\Request $request
-     * @param \Pterodactyl\Models\Server $server
      * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Pterodactyl\Exceptions\DisplayException
@@ -311,8 +281,6 @@ class ServersController extends Controller
     /**
      * Start the server deletion process.
      *
-     * @param \Illuminate\Http\Request $request
-     * @param \Pterodactyl\Models\Server $server
      * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Pterodactyl\Exceptions\DisplayException
@@ -329,8 +297,6 @@ class ServersController extends Controller
     /**
      * Update the startup command as well as variables.
      *
-     * @param \Illuminate\Http\Request $request
-     * @param \Pterodactyl\Models\Server $server
      * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Illuminate\Validation\ValidationException
@@ -359,8 +325,6 @@ class ServersController extends Controller
     /**
      * Creates a new database assigned to a specific server.
      *
-     * @param \Pterodactyl\Http\Requests\Admin\Servers\Databases\StoreServerDatabaseRequest $request
-     * @param \Pterodactyl\Models\Server $server
      * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Throwable
@@ -380,8 +344,8 @@ class ServersController extends Controller
     /**
      * Resets the database password for a specific database on this server.
      *
-     * @param \Illuminate\Http\Request $request
      * @param int $server
+     *
      * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Throwable
@@ -403,6 +367,7 @@ class ServersController extends Controller
      *
      * @param int $server
      * @param int $database
+     *
      * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Exception
@@ -423,15 +388,13 @@ class ServersController extends Controller
     /**
      * Add a mount to a server.
      *
-     * @param Server $server
-     * @param \Pterodactyl\Models\Mount $mount
      * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Throwable
      */
     public function addMount(Server $server, Mount $mount)
     {
-        $mountServer = (new MountServer)->forceFill([
+        $mountServer = (new MountServer())->forceFill([
             'mount_id' => $mount->id,
             'server_id' => $server->id,
         ]);
@@ -446,8 +409,6 @@ class ServersController extends Controller
     /**
      * Remove a mount from a server.
      *
-     * @param Server $server
-     * @param \Pterodactyl\Models\Mount $mount
      * @return \Illuminate\Http\RedirectResponse
      */
     public function deleteMount(Server $server, Mount $mount)