Apply fixes from StyleCI (#607)

tests/Unit/Repositories/Eloquent/AllocationRepositoryTest.php

@@ -24,11 +24,11 @@
 
 namespace Tests\Unit\Repositories\Eloquent;
 
-use Illuminate\Database\Eloquent\Builder;
 use Mockery as m;
-use Pterodactyl\Models\Allocation;
-use Pterodactyl\Repositories\Eloquent\AllocationRepository;
 use Tests\TestCase;
+use Pterodactyl\Models\Allocation;
+use Illuminate\Database\Eloquent\Builder;
+use Pterodactyl\Repositories\Eloquent\AllocationRepository;
 
 class AllocationRepositoryTest extends TestCase
 {

tests/Unit/Repositories/Eloquent/ApiKeyRepositoryTest.php

@@ -24,11 +24,11 @@
 
 namespace Tests\Unit\Repositories\Eloquent;
 
-use Illuminate\Database\Eloquent\Builder;
 use Mockery as m;
-use Pterodactyl\Models\APIKey;
-use Pterodactyl\Repositories\Eloquent\ApiKeyRepository;
 use Tests\TestCase;
+use Pterodactyl\Models\APIKey;
+use Illuminate\Database\Eloquent\Builder;
+use Pterodactyl\Repositories\Eloquent\ApiKeyRepository;
 
 class ApiKeyRepositoryTest extends TestCase
 {

tests/Unit/Repositories/Eloquent/ApiPermissionRepositoryTest.php

@@ -24,11 +24,11 @@
 
 namespace Tests\Unit\Repositories\Eloquent;
 
-use Illuminate\Database\Eloquent\Builder;
 use Mockery as m;
-use Pterodactyl\Models\APIPermission;
-use Pterodactyl\Repositories\Eloquent\ApiPermissionRepository;
 use Tests\TestCase;
+use Pterodactyl\Models\APIPermission;
+use Illuminate\Database\Eloquent\Builder;
+use Pterodactyl\Repositories\Eloquent\ApiPermissionRepository;
 
 class ApiPermissionRepositoryTest extends TestCase
 {

tests/Unit/Repositories/Eloquent/DatabaseHostRepositoryTest.php

@@ -24,11 +24,11 @@
 
 namespace Tests\Unit\Repositories\Eloquent;
 
-use Illuminate\Database\Eloquent\Builder;
 use Mockery as m;
-use Pterodactyl\Models\DatabaseHost;
-use Pterodactyl\Repositories\Eloquent\DatabaseHostRepository;
 use Tests\TestCase;
+use Pterodactyl\Models\DatabaseHost;
+use Illuminate\Database\Eloquent\Builder;
+use Pterodactyl\Repositories\Eloquent\DatabaseHostRepository;
 
 class DatabaseHostRepositoryTest extends TestCase
 {

tests/Unit/Repositories/Eloquent/DatabaseRepositoryTest.php

@@ -24,13 +24,13 @@
 
 namespace Tests\Unit\Repositories\Eloquent;
 
-use Illuminate\Database\Eloquent\Builder;
 use Mockery as m;
-use Pterodactyl\Exceptions\DisplayException;
-use Pterodactyl\Exceptions\Repository\DuplicateDatabaseNameException;
-use Pterodactyl\Models\Database;
-use Pterodactyl\Repositories\Eloquent\DatabaseRepository;
 use Tests\TestCase;
+use Pterodactyl\Models\Database;
+use Illuminate\Database\Eloquent\Builder;
+use Pterodactyl\Exceptions\DisplayException;
+use Pterodactyl\Repositories\Eloquent\DatabaseRepository;
+use Pterodactyl\Exceptions\Repository\DuplicateDatabaseNameException;
 
 class DatabaseRepositoryTest extends TestCase
 {

tests/Unit/Repositories/Eloquent/LocationRepositoryTest.php

@@ -24,11 +24,11 @@
 
 namespace Tests\Unit\Repositories\Eloquent;
 
-use Illuminate\Database\Eloquent\Builder;
 use Mockery as m;
-use Pterodactyl\Models\Location;
-use Pterodactyl\Repositories\Eloquent\LocationRepository;
 use Tests\TestCase;
+use Pterodactyl\Models\Location;
+use Illuminate\Database\Eloquent\Builder;
+use Pterodactyl\Repositories\Eloquent\LocationRepository;
 
 class LocationRepositoryTest extends TestCase
 {

tests/Unit/Services/Database/DatabaseHostServiceTest.php

@@ -25,13 +25,13 @@
 namespace Tests\Unit\Services\Administrative;
 
 use Mockery as m;
-use Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface;
-use Pterodactyl\Exceptions\DisplayException;
 use Tests\TestCase;
 use Illuminate\Database\DatabaseManager;
+use Pterodactyl\Exceptions\DisplayException;
 use Illuminate\Contracts\Encryption\Encrypter;
 use Pterodactyl\Extensions\DynamicDatabaseConnection;
 use Pterodactyl\Services\Database\DatabaseHostService;
+use Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface;
 use Pterodactyl\Contracts\Repository\DatabaseHostRepositoryInterface;
 
 class DatabaseHostServiceTest extends TestCase

tests/Unit/Services/Helpers/SoftwareVersionServiceTest.php

@@ -25,10 +25,10 @@
 namespace Tests\Unit\Services\Helpers;
 
 use Closure;
-use GuzzleHttp\Client;
 use Mockery as m;
-use Pterodactyl\Services\Helpers\SoftwareVersionService;
 use Tests\TestCase;
+use GuzzleHttp\Client;
+use Pterodactyl\Services\Helpers\SoftwareVersionService;
 use Illuminate\Contracts\Cache\Repository as CacheRepository;
 use Illuminate\Contracts\Config\Repository as ConfigRepository;
 
@@ -64,7 +64,7 @@ class SoftwareVersionServiceTest extends TestCase
     protected $service;
 
     /**
-     * Setup tests
+     * Setup tests.
      */
     public function setUp()
     {

tests/Unit/Services/Packs/ExportPackServiceTest.php

@@ -24,14 +24,14 @@
 
 namespace Tests\Unit\Services\Packs;
 
-use Illuminate\Contracts\Filesystem\Factory;
-use Mockery as m;
-use phpmock\phpunit\PHPMock;
-use Pterodactyl\Contracts\Repository\PackRepositoryInterface;
-use Pterodactyl\Models\Pack;
-use Pterodactyl\Services\Packs\ExportPackService;
-use Tests\TestCase;
 use ZipArchive;
+use Mockery as m;
+use Tests\TestCase;
+use phpmock\phpunit\PHPMock;
+use Pterodactyl\Models\Pack;
+use Illuminate\Contracts\Filesystem\Factory;
+use Pterodactyl\Services\Packs\ExportPackService;
+use Pterodactyl\Contracts\Repository\PackRepositoryInterface;
 
 class ExportPackServiceTest extends TestCase
 {

tests/Unit/Services/Packs/PackCreationServiceTest.php

@@ -25,16 +25,16 @@
 namespace Tests\Unit\Services\Packs;
 
 use Exception;
-use Illuminate\Contracts\Filesystem\Factory;
-use Illuminate\Http\UploadedFile;
 use Mockery as m;
-use Illuminate\Database\ConnectionInterface;
-use Pterodactyl\Contracts\Repository\PackRepositoryInterface;
-use Pterodactyl\Exceptions\Service\Pack\InvalidFileMimeTypeException;
-use Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException;
-use Pterodactyl\Models\Pack;
-use Pterodactyl\Services\Packs\PackCreationService;
 use Tests\TestCase;
+use Pterodactyl\Models\Pack;
+use Illuminate\Http\UploadedFile;
+use Illuminate\Contracts\Filesystem\Factory;
+use Illuminate\Database\ConnectionInterface;
+use Pterodactyl\Services\Packs\PackCreationService;
+use Pterodactyl\Contracts\Repository\PackRepositoryInterface;
+use Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException;
+use Pterodactyl\Exceptions\Service\Pack\InvalidFileMimeTypeException;
 
 class PackCreationServiceTest extends TestCase
 {

tests/Unit/Services/Packs/PackDeletionServiceTest.php

@@ -25,15 +25,15 @@
 namespace Tests\Unit\Services\Packs;
 
 use Exception;
+use Mockery as m;
+use Tests\TestCase;
+use Pterodactyl\Models\Pack;
 use Illuminate\Contracts\Filesystem\Factory;
 use Illuminate\Database\ConnectionInterface;
-use Mockery as m;
-use Pterodactyl\Contracts\Repository\PackRepositoryInterface;
-use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
-use Pterodactyl\Exceptions\Service\HasActiveServersException;
-use Pterodactyl\Models\Pack;
 use Pterodactyl\Services\Packs\PackDeletionService;
-use Tests\TestCase;
+use Pterodactyl\Contracts\Repository\PackRepositoryInterface;
+use Pterodactyl\Exceptions\Service\HasActiveServersException;
+use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 
 class PackDeletionServiceTest extends TestCase
 {

tests/Unit/Services/Packs/PackUpdateServiceTest.php

@@ -25,12 +25,12 @@
 namespace Tests\Unit\Services\Packs;
 
 use Mockery as m;
-use Pterodactyl\Contracts\Repository\PackRepositoryInterface;
-use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
-use Pterodactyl\Exceptions\Service\HasActiveServersException;
+use Tests\TestCase;
 use Pterodactyl\Models\Pack;
 use Pterodactyl\Services\Packs\PackUpdateService;
-use Tests\TestCase;
+use Pterodactyl\Contracts\Repository\PackRepositoryInterface;
+use Pterodactyl\Exceptions\Service\HasActiveServersException;
+use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 
 class PackUpdateServiceTest extends TestCase
 {

tests/Unit/Services/Packs/TemplateUploadServiceTest.php

@@ -24,18 +24,18 @@
 
 namespace Tests\Unit\Services\Packs;
 
-use Illuminate\Http\UploadedFile;
+use ZipArchive;
 use Mockery as m;
-use Pterodactyl\Exceptions\Service\Pack\InvalidFileMimeTypeException;
-use Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException;
-use Pterodactyl\Exceptions\Service\Pack\InvalidPackArchiveFormatException;
-use Pterodactyl\Exceptions\Service\Pack\UnreadableZipArchiveException;
-use Pterodactyl\Exceptions\Service\Pack\ZipExtractionException;
+use Tests\TestCase;
 use Pterodactyl\Models\Pack;
+use Illuminate\Http\UploadedFile;
 use Pterodactyl\Services\Packs\PackCreationService;
 use Pterodactyl\Services\Packs\TemplateUploadService;
-use Tests\TestCase;
-use ZipArchive;
+use Pterodactyl\Exceptions\Service\Pack\ZipExtractionException;
+use Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException;
+use Pterodactyl\Exceptions\Service\Pack\InvalidFileMimeTypeException;
+use Pterodactyl\Exceptions\Service\Pack\UnreadableZipArchiveException;
+use Pterodactyl\Exceptions\Service\Pack\InvalidPackArchiveFormatException;
 
 class TemplateUploadServiceTest extends TestCase
 {

tests/Unit/Services/Subusers/PermissionCreationServiceTest.php

@@ -25,9 +25,9 @@
 namespace Tests\Unit\Services\Subusers;
 
 use Mockery as m;
-use Pterodactyl\Contracts\Repository\PermissionRepositoryInterface;
-use Pterodactyl\Services\Subusers\PermissionCreationService;
 use Tests\TestCase;
+use Pterodactyl\Services\Subusers\PermissionCreationService;
+use Pterodactyl\Contracts\Repository\PermissionRepositoryInterface;
 
 class PermissionCreationServiceTest extends TestCase
 {

tests/Unit/Services/Subusers/SubuserCreationServiceTest.php

@@ -24,23 +24,23 @@
 
 namespace Tests\Unit\Services\Subusers;
 
-use Illuminate\Database\ConnectionInterface;
-use Illuminate\Log\Writer;
 use Mockery as m;
+use Tests\TestCase;
+use Illuminate\Log\Writer;
 use phpmock\phpunit\PHPMock;
-use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
-use Pterodactyl\Contracts\Repository\SubuserRepositoryInterface;
-use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
-use Pterodactyl\Exceptions\DisplayException;
-use Pterodactyl\Exceptions\Service\Subuser\ServerSubuserExistsException;
-use Pterodactyl\Exceptions\Service\Subuser\UserIsServerOwnerException;
+use Pterodactyl\Models\User;
 use Pterodactyl\Models\Server;
 use Pterodactyl\Models\Subuser;
-use Pterodactyl\Models\User;
-use Pterodactyl\Services\Subusers\PermissionCreationService;
-use Pterodactyl\Services\Subusers\SubuserCreationService;
+use Illuminate\Database\ConnectionInterface;
+use Pterodactyl\Exceptions\DisplayException;
 use Pterodactyl\Services\Users\CreationService;
-use Tests\TestCase;
+use Pterodactyl\Services\Subusers\SubuserCreationService;
+use Pterodactyl\Services\Subusers\PermissionCreationService;
+use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
+use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
+use Pterodactyl\Contracts\Repository\SubuserRepositoryInterface;
+use Pterodactyl\Exceptions\Service\Subuser\UserIsServerOwnerException;
+use Pterodactyl\Exceptions\Service\Subuser\ServerSubuserExistsException;
 use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;
 
 class SubuserCreationServiceTest extends TestCase
@@ -200,7 +200,7 @@ class SubuserCreationServiceTest extends TestCase
     }
 
     /**
-     * Test that an exception gets thrown if the subuser is actually the server owner
+     * Test that an exception gets thrown if the subuser is actually the server owner.
      */
     public function testExceptionIsThrownIfUserIsServerOwner()
     {
@@ -237,6 +237,5 @@ class SubuserCreationServiceTest extends TestCase
             $this->assertInstanceOf(ServerSubuserExistsException::class, $exception);
             $this->assertEquals(trans('admin/exceptions.subusers.subuser_exists'), $exception->getMessage());
         }
-
     }
 }

tests/Unit/Services/Subusers/SubuserDeletionServiceTest.php

@@ -24,16 +24,16 @@
 
 namespace Tests\Unit\Services\Subusers;
 
-use GuzzleHttp\Exception\RequestException;
-use Illuminate\Database\ConnectionInterface;
-use Illuminate\Log\Writer;
 use Mockery as m;
-use Pterodactyl\Contracts\Repository\SubuserRepositoryInterface;
-use Pterodactyl\Exceptions\DisplayException;
+use Tests\TestCase;
+use Illuminate\Log\Writer;
 use Pterodactyl\Models\Server;
 use Pterodactyl\Models\Subuser;
+use GuzzleHttp\Exception\RequestException;
+use Illuminate\Database\ConnectionInterface;
+use Pterodactyl\Exceptions\DisplayException;
 use Pterodactyl\Services\Subusers\SubuserDeletionService;
-use Tests\TestCase;
+use Pterodactyl\Contracts\Repository\SubuserRepositoryInterface;
 use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;
 
 class SubuserDeletionServiceTest extends TestCase
@@ -135,5 +135,4 @@ class SubuserDeletionServiceTest extends TestCase
             $this->assertEquals(trans('admin/exceptions.daemon_connection_failed', ['code' => 'E_CONN_REFUSED']), $exception->getMessage());
         }
     }
-
 }

tests/Unit/Services/Subusers/SubuserUpdateServiceTest.php

@@ -24,18 +24,18 @@
 
 namespace Tests\Unit\Services\Subusers;
 
-use GuzzleHttp\Exception\RequestException;
-use Illuminate\Database\ConnectionInterface;
-use Illuminate\Log\Writer;
 use Mockery as m;
-use Pterodactyl\Contracts\Repository\PermissionRepositoryInterface;
-use Pterodactyl\Contracts\Repository\SubuserRepositoryInterface;
-use Pterodactyl\Exceptions\DisplayException;
+use Tests\TestCase;
+use Illuminate\Log\Writer;
 use Pterodactyl\Models\Server;
 use Pterodactyl\Models\Subuser;
-use Pterodactyl\Services\Subusers\PermissionCreationService;
+use GuzzleHttp\Exception\RequestException;
+use Illuminate\Database\ConnectionInterface;
+use Pterodactyl\Exceptions\DisplayException;
 use Pterodactyl\Services\Subusers\SubuserUpdateService;
-use Tests\TestCase;
+use Pterodactyl\Services\Subusers\PermissionCreationService;
+use Pterodactyl\Contracts\Repository\SubuserRepositoryInterface;
+use Pterodactyl\Contracts\Repository\PermissionRepositoryInterface;
 use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;
 
 class SubuserUpdateServiceTest extends TestCase