Fix StyleCI issues

Author: matthewpi

app/Http/Controllers/Admin/Servers/ServerTransferController.php

@@ -3,16 +3,16 @@
 namespace Pterodactyl\Http\Controllers\Admin\Servers;
 
 use Illuminate\Http\Request;
-use Prologue\Alerts\AlertsMessageBag;
-use Pterodactyl\Contracts\Repository\AllocationRepositoryInterface;
-use Pterodactyl\Http\Controllers\Controller;
 use Pterodactyl\Models\Server;
+use Prologue\Alerts\AlertsMessageBag;
 use Pterodactyl\Models\ServerTransfer;
+use Pterodactyl\Http\Controllers\Controller;
+use Pterodactyl\Services\Servers\TransferService;
+use Pterodactyl\Services\Servers\SuspensionService;
+use Pterodactyl\Repositories\Eloquent\NodeRepository;
 use Pterodactyl\Repositories\Eloquent\ServerRepository;
 use Pterodactyl\Repositories\Eloquent\LocationRepository;
-use Pterodactyl\Repositories\Eloquent\NodeRepository;
-use Pterodactyl\Services\Servers\SuspensionService;
-use Pterodactyl\Services\Servers\TransferService;
+use Pterodactyl\Contracts\Repository\AllocationRepositoryInterface;
 
 class ServerTransferController extends Controller
 {

app/Http/Controllers/Admin/Servers/ServerViewController.php

@@ -10,10 +10,10 @@
 use Pterodactyl\Exceptions\DisplayException;
 use Pterodactyl\Http\Controllers\Controller;
 use Pterodactyl\Repositories\Eloquent\NestRepository;
-use Pterodactyl\Repositories\Eloquent\LocationRepository;
 use Pterodactyl\Repositories\Eloquent\NodeRepository;
 use Pterodactyl\Repositories\Eloquent\ServerRepository;
 use Pterodactyl\Traits\Controllers\JavascriptInjection;
+use Pterodactyl\Repositories\Eloquent\LocationRepository;
 use Pterodactyl\Repositories\Eloquent\DatabaseHostRepository;
 
 class ServerViewController extends Controller

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

@@ -3,22 +3,22 @@
 namespace Pterodactyl\Http\Controllers\Api\Remote\Servers;
 
 use Cake\Chronos\Chronos;
-use Illuminate\Database\ConnectionInterface;
-use Illuminate\Http\JsonResponse;
+use Lcobucci\JWT\Builder;
 use Illuminate\Http\Request;
+use Lcobucci\JWT\Signer\Key;
 use Illuminate\Http\Response;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Log;
-use Lcobucci\JWT\Builder;
 use Lcobucci\JWT\Signer\Hmac\Sha256;
-use Lcobucci\JWT\Signer\Key;
-use Pterodactyl\Contracts\Repository\AllocationRepositoryInterface;
-use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
+use Illuminate\Database\ConnectionInterface;
 use Pterodactyl\Http\Controllers\Controller;
-use Pterodactyl\Repositories\Eloquent\ServerRepository;
+use Pterodactyl\Services\Servers\SuspensionService;
 use Pterodactyl\Repositories\Eloquent\NodeRepository;
+use Pterodactyl\Repositories\Eloquent\ServerRepository;
 use Pterodactyl\Repositories\Wings\DaemonTransferRepository;
+use Pterodactyl\Contracts\Repository\AllocationRepositoryInterface;
+use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
 use Pterodactyl\Services\Servers\ServerConfigurationStructureService;
-use Pterodactyl\Services\Servers\SuspensionService;
 
 class ServerTransferController extends Controller
 {
@@ -102,7 +102,7 @@ public function archive(Request $request, string $uuid)
         $server = $this->repository->getByUuid($uuid);
 
         // Unsuspend the server and don't continue the transfer.
-        if (!$request->input('successful')) {
+        if (! $request->input('successful')) {
             $this->suspensionService->toggle($server, 'unsuspend');
             return JsonResponse::create([], Response::HTTP_NO_CONTENT);
         }

app/Models/Node.php

@@ -244,7 +244,8 @@ public function allocations()
      * @param int $disk
      * @return bool
      */
-    public function isViable(int $memory, int $disk): bool {
+    public function isViable(int $memory, int $disk): bool
+    {
         $memoryLimit = $this->memory * (1 + ($this->memory_overallocate / 100));
         $diskLimit = $this->disk * (1 + ($this->disk_overallocate / 100));
 

app/Repositories/Wings/DaemonTransferRepository.php

@@ -17,7 +17,8 @@ class DaemonTransferRepository extends DaemonRepository
      *
      * @throws DaemonConnectionException
      */
-    public function notify(Server $server, array $data, Node $node, string $token): void {
+    public function notify(Server $server, array $data, Node $node, string $token): void
+    {
         try {
             $this->getHttpClient()->post('/api/transfer', [
                 'json' => [
@@ -27,7 +28,7 @@ public function notify(Server $server, array $data, Node $node, string $token):
                     'server' => $data,
                 ],
             ]);
-        } catch(TransferException $exception) {
+        } catch (TransferException $exception) {
             throw new DaemonConnectionException($exception);
         }
     }

app/Services/Servers/SuspensionService.php

@@ -2,7 +2,6 @@
 
 namespace Pterodactyl\Services\Servers;
 
-use Illuminate\Support\Facades\Log;
 use Psr\Log\LoggerInterface;
 use Webmozart\Assert\Assert;
 use Pterodactyl\Models\Server;
@@ -74,14 +73,10 @@ public function toggle(Server $server, $action = self::ACTION_SUSPEND)
             return;
         }
 
-        Log::debug('SuspensionService: ' . $action);
-
         $this->connection->transaction(function () use ($action, $server) {
             $this->repository->withoutFreshModel()->update($server->id, [
                 'suspended' => $action === self::ACTION_SUSPEND,
             ]);
-            Log::debug('Server suspended: ' . ($action === self::ACTION_SUSPEND) ? 'true' : 'false');
-            Log::debug('Daemon unsuspended: ' . ($action === self::ACTION_UNSUSPEND)  ? 'true' : 'false');
 
             $this->daemonServerRepository->setServer($server)->suspend($action === self::ACTION_UNSUSPEND);
         });

app/Services/Servers/TransferService.php

@@ -2,11 +2,9 @@
 
 namespace Pterodactyl\Services\Servers;
 
-use Illuminate\Database\ConnectionInterface;
-use Psr\Log\LoggerInterface;
-use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 use Pterodactyl\Models\Server;
 use Pterodactyl\Repositories\Wings\DaemonServerRepository;
+use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 
 class TransferService
 {

database/migrations/2020_04_04_172331_add_successful_column_to_server_transfers.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
 
 class AddSuccessfulColumnToServerTransfers extends Migration
 {

routes/api-remote.php

@@ -15,5 +15,3 @@
     Route::get('/transfer/failure', 'Servers\ServerTransferController@failure');
     Route::get('/transfer/success', 'Servers\ServerTransferController@success');
 });
-
-