Apply fixes from StyleCI (pterodactyl#577)

Author: DaneEveritt

app/Exceptions/Handler.php

@@ -3,10 +3,10 @@
 namespace Pterodactyl\Exceptions;
 
 use Exception;
-use Illuminate\Auth\AuthenticationException;
-use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use Prologue\Alerts\Facades\Alert;
+use Illuminate\Auth\AuthenticationException;
 use Pterodactyl\Exceptions\Model\DataValidationException;
+use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 
 class Handler extends ExceptionHandler
 {

app/Extensions/DynamicDatabaseConnection.php

@@ -24,10 +24,10 @@
 
 namespace Pterodactyl\Extensions;
 
-use Pterodactyl\Contracts\Repository\DatabaseHostRepositoryInterface;
 use Pterodactyl\Models\DatabaseHost;
 use Illuminate\Contracts\Encryption\Encrypter;
 use Illuminate\Config\Repository as ConfigRepository;
+use Pterodactyl\Contracts\Repository\DatabaseHostRepositoryInterface;
 
 class DynamicDatabaseConnection
 {

app/Http/Controllers/API/User/ServerController.php

@@ -28,8 +28,8 @@
 use Illuminate\Http\Request;
 use Pterodactyl\Models\Server;
 use Pterodactyl\Http\Controllers\Controller;
-use Pterodactyl\Repositories\old_Daemon\PowerRepository;
 use Pterodactyl\Transformers\User\ServerTransformer;
+use Pterodactyl\Repositories\old_Daemon\PowerRepository;
 use Pterodactyl\Repositories\old_Daemon\CommandRepository;
 
 class ServerController extends Controller

app/Http/Controllers/Admin/LocationController.php

@@ -24,13 +24,13 @@
 
 namespace Pterodactyl\Http\Controllers\Admin;
 
-use Pterodactyl\Contracts\Repository\LocationRepositoryInterface;
 use Pterodactyl\Models\Location;
 use Prologue\Alerts\AlertsMessageBag;
+use Pterodactyl\Services\LocationService;
 use Pterodactyl\Exceptions\DisplayException;
 use Pterodactyl\Http\Controllers\Controller;
 use Pterodactyl\Http\Requests\Admin\LocationRequest;
-use Pterodactyl\Services\LocationService;
+use Pterodactyl\Contracts\Repository\LocationRepositoryInterface;
 
 class LocationController extends Controller
 {

app/Http/Controllers/Admin/NodesController.php

@@ -24,26 +24,25 @@
 
 namespace Pterodactyl\Http\Controllers\Admin;
 
-use Illuminate\Cache\Repository as CacheRepository;
-use Illuminate\Contracts\Translation\Translator;
 use Log;
 use Alert;
-use Cache;
 use Javascript;
-use Prologue\Alerts\AlertsMessageBag;
-use Pterodactyl\Contracts\Repository\LocationRepositoryInterface;
-use Pterodactyl\Contracts\Repository\NodeRepositoryInterface;
-use Pterodactyl\Http\Requests\Admin\NodeFormRequest;
-use Pterodactyl\Models\Allocation;
-use Pterodactyl\Models\Node;
 use Illuminate\Http\Request;
+use Pterodactyl\Models\Node;
+use Pterodactyl\Models\Allocation;
+use Prologue\Alerts\AlertsMessageBag;
 use Pterodactyl\Exceptions\DisplayException;
 use Pterodactyl\Http\Controllers\Controller;
 use Pterodactyl\Repositories\NodeRepository;
-use Pterodactyl\Exceptions\DisplayValidationException;
+use Pterodactyl\Services\Nodes\UpdateService;
 use Pterodactyl\Services\Nodes\CreationService;
 use Pterodactyl\Services\Nodes\DeletionService;
-use Pterodactyl\Services\Nodes\UpdateService;
+use Illuminate\Contracts\Translation\Translator;
+use Illuminate\Cache\Repository as CacheRepository;
+use Pterodactyl\Http\Requests\Admin\NodeFormRequest;
+use Pterodactyl\Exceptions\DisplayValidationException;
+use Pterodactyl\Contracts\Repository\NodeRepositoryInterface;
+use Pterodactyl\Contracts\Repository\LocationRepositoryInterface;
 
 class NodesController extends Controller
 {

app/Http/Controllers/Admin/ServersController.php

@@ -24,31 +24,30 @@
 
 namespace Pterodactyl\Http\Controllers\Admin;
 
-use Illuminate\Contracts\Config\Repository as ConfigRepository;
-use Alert;
 use Javascript;
-use Prologue\Alerts\AlertsMessageBag;
-use Pterodactyl\Contracts\Repository\AllocationRepositoryInterface;
-use Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface;
-use Pterodactyl\Contracts\Repository\LocationRepositoryInterface;
-use Pterodactyl\Contracts\Repository\NodeRepositoryInterface;
-use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
-use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface;
-use Pterodactyl\Http\Requests\Admin\ServerFormRequest;
-use Pterodactyl\Models\Server;
 use Illuminate\Http\Request;
+use Pterodactyl\Models\Server;
+use Prologue\Alerts\AlertsMessageBag;
 use Pterodactyl\Exceptions\DisplayException;
 use Pterodactyl\Http\Controllers\Controller;
-use Pterodactyl\Repositories\Eloquent\DatabaseHostRepository;
-use Pterodactyl\Services\Database\DatabaseManagementService;
-use Pterodactyl\Services\Servers\BuildModificationService;
-use Pterodactyl\Services\Servers\ContainerRebuildService;
 use Pterodactyl\Services\Servers\CreationService;
 use Pterodactyl\Services\Servers\DeletionService;
-use Pterodactyl\Services\Servers\DetailsModificationService;
 use Pterodactyl\Services\Servers\ReinstallService;
-use Pterodactyl\Services\Servers\StartupModificationService;
 use Pterodactyl\Services\Servers\SuspensionService;
+use Pterodactyl\Http\Requests\Admin\ServerFormRequest;
+use Pterodactyl\Services\Servers\ContainerRebuildService;
+use Pterodactyl\Services\Servers\BuildModificationService;
+use Pterodactyl\Services\Database\DatabaseManagementService;
+use Pterodactyl\Services\Servers\DetailsModificationService;
+use Pterodactyl\Services\Servers\StartupModificationService;
+use Pterodactyl\Contracts\Repository\NodeRepositoryInterface;
+use Pterodactyl\Repositories\Eloquent\DatabaseHostRepository;
+use Illuminate\Contracts\Config\Repository as ConfigRepository;
+use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
+use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface;
+use Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface;
+use Pterodactyl\Contracts\Repository\LocationRepositoryInterface;
+use Pterodactyl\Contracts\Repository\AllocationRepositoryInterface;
 
 class ServersController extends Controller
 {

app/Http/Controllers/Server/ServerController.php

@@ -32,8 +32,8 @@
 use Pterodactyl\Exceptions\DisplayException;
 use Pterodactyl\Http\Controllers\Controller;
 use Pterodactyl\Repositories\ServerRepository;
-use Pterodactyl\Repositories\old_Daemon\FileRepository;
 use Pterodactyl\Exceptions\DisplayValidationException;
+use Pterodactyl\Repositories\old_Daemon\FileRepository;
 
 class ServerController extends Controller
 {

app/Http/Requests/Admin/ServerFormRequest.php

@@ -24,8 +24,8 @@
 
 namespace Pterodactyl\Http\Requests\Admin;
 
-use Illuminate\Validation\Rule;
 use Pterodactyl\Models\Server;
+use Illuminate\Validation\Rule;
 
 class ServerFormRequest extends AdminFormRequest
 {

app/Models/DatabaseHost.php

@@ -80,11 +80,11 @@ class DatabaseHost extends Model implements ValidableContract
         'node_id' => 'sometimes|required',
     ];
 
-/**
- * Validation rules to assign to this model.
- *
- * @var array
- */
+    /**
+     * Validation rules to assign to this model.
+     *
+     * @var array
+     */
     // @todo the node_id field doesn't validate correctly if no node is provided in request
     protected static $dataIntegrityRules = [
         'name' => 'string|max:255',

app/Providers/RepositoryServiceProvider.php

@@ -25,34 +25,34 @@
 namespace Pterodactyl\Providers;
 
 use Illuminate\Support\ServiceProvider;
-use Pterodactyl\Contracts\Repository\AllocationRepositoryInterface;
+use Pterodactyl\Repositories\Eloquent\NodeRepository;
+use Pterodactyl\Repositories\Eloquent\UserRepository;
+use Pterodactyl\Repositories\Eloquent\ApiKeyRepository;
+use Pterodactyl\Repositories\Eloquent\ServerRepository;
+use Pterodactyl\Repositories\Eloquent\ServiceRepository;
+use Pterodactyl\Repositories\Eloquent\DatabaseRepository;
+use Pterodactyl\Repositories\Eloquent\LocationRepository;
+use Pterodactyl\Repositories\Eloquent\AllocationRepository;
+use Pterodactyl\Repositories\Daemon\ConfigurationRepository;
+use Pterodactyl\Contracts\Repository\NodeRepositoryInterface;
+use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
+use Pterodactyl\Repositories\Eloquent\DatabaseHostRepository;
+use Pterodactyl\Repositories\Eloquent\ApiPermissionRepository;
 use Pterodactyl\Contracts\Repository\ApiKeyRepositoryInterface;
-use Pterodactyl\Contracts\Repository\ApiPermissionRepositoryInterface;
-use Pterodactyl\Contracts\Repository\Daemon\ConfigurationRepositoryInterface;
-use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;
-use Pterodactyl\Contracts\Repository\DatabaseHostRepositoryInterface;
+use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
+use Pterodactyl\Repositories\Eloquent\OptionVariableRepository;
+use Pterodactyl\Repositories\Eloquent\ServerVariableRepository;
+use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface;
 use Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface;
 use Pterodactyl\Contracts\Repository\LocationRepositoryInterface;
-use Pterodactyl\Contracts\Repository\NodeRepositoryInterface;
+use Pterodactyl\Contracts\Repository\AllocationRepositoryInterface;
+use Pterodactyl\Contracts\Repository\DatabaseHostRepositoryInterface;
+use Pterodactyl\Contracts\Repository\ApiPermissionRepositoryInterface;
 use Pterodactyl\Contracts\Repository\OptionVariableRepositoryInterface;
-use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 use Pterodactyl\Contracts\Repository\ServerVariableRepositoryInterface;
-use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface;
-use Pterodactyl\Repositories\Daemon\ConfigurationRepository;
+use Pterodactyl\Contracts\Repository\Daemon\ConfigurationRepositoryInterface;
 use Pterodactyl\Repositories\Daemon\ServerRepository as DaemonServerRepository;
-use Pterodactyl\Repositories\Eloquent\AllocationRepository;
-use Pterodactyl\Repositories\Eloquent\ApiKeyRepository;
-use Pterodactyl\Repositories\Eloquent\ApiPermissionRepository;
-use Pterodactyl\Repositories\Eloquent\DatabaseHostRepository;
-use Pterodactyl\Repositories\Eloquent\DatabaseRepository;
-use Pterodactyl\Repositories\Eloquent\LocationRepository;
-use Pterodactyl\Repositories\Eloquent\NodeRepository;
-use Pterodactyl\Repositories\Eloquent\OptionVariableRepository;
-use Pterodactyl\Repositories\Eloquent\ServerRepository;
-use Pterodactyl\Repositories\Eloquent\ServerVariableRepository;
-use Pterodactyl\Repositories\Eloquent\ServiceRepository;
-use Pterodactyl\Repositories\Eloquent\UserRepository;
-use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
+use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;
 
 class RepositoryServiceProvider extends ServiceProvider
 {