diff --git a/app/Http/Controllers/Admin/OptionController.php b/app/Http/Controllers/Admin/OptionController.php index 184f90f9d..46403e08d 100644 --- a/app/Http/Controllers/Admin/OptionController.php +++ b/app/Http/Controllers/Admin/OptionController.php @@ -30,6 +30,7 @@ use Prologue\Alerts\AlertsMessageBag; use Pterodactyl\Models\ServiceOption; use Pterodactyl\Http\Controllers\Controller; use Pterodactyl\Http\Requests\Admin\Service\EditOptionScript; +use Pterodactyl\Exceptions\Services\HasActiveServersException; use Pterodactyl\Services\Services\Options\OptionUpdateService; use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface; use Pterodactyl\Services\Services\Options\OptionCreationService; @@ -38,7 +39,6 @@ use Pterodactyl\Http\Requests\Admin\Service\ServiceOptionFormRequest; use Pterodactyl\Services\Services\Options\InstallScriptUpdateService; use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface; use Pterodactyl\Exceptions\Services\ServiceOption\InvalidCopyFromException; -use Pterodactyl\Exceptions\Services\HasActiveServersException; use Pterodactyl\Exceptions\Services\ServiceOption\NoParentConfigurationFoundException; class OptionController extends Controller diff --git a/app/Services/Services/Options/OptionDeletionService.php b/app/Services/Services/Options/OptionDeletionService.php index 8afd6e2e4..b489b7a43 100644 --- a/app/Services/Services/Options/OptionDeletionService.php +++ b/app/Services/Services/Options/OptionDeletionService.php @@ -24,9 +24,9 @@ namespace Pterodactyl\Services\Services\Options; +use Pterodactyl\Exceptions\Services\HasActiveServersException; use Pterodactyl\Contracts\Repository\ServerRepositoryInterface; use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface; -use Pterodactyl\Exceptions\Services\HasActiveServersException; class OptionDeletionService { diff --git a/tests/Unit/Http/Controllers/Admin/DatabaseControllerTest.php b/tests/Unit/Http/Controllers/Admin/DatabaseControllerTest.php index d930b2fff..03402adb5 100644 --- a/tests/Unit/Http/Controllers/Admin/DatabaseControllerTest.php +++ b/tests/Unit/Http/Controllers/Admin/DatabaseControllerTest.php @@ -25,13 +25,13 @@ namespace Tests\Unit\Http\Controllers\Admin; use Mockery as m; -use Prologue\Alerts\AlertsMessageBag; -use Pterodactyl\Contracts\Repository\DatabaseHostRepositoryInterface; -use Pterodactyl\Contracts\Repository\LocationRepositoryInterface; -use Pterodactyl\Http\Controllers\Admin\DatabaseController; -use Pterodactyl\Services\Database\DatabaseHostService; -use Tests\Assertions\ControllerAssertionsTrait; use Tests\TestCase; +use Prologue\Alerts\AlertsMessageBag; +use Tests\Assertions\ControllerAssertionsTrait; +use Pterodactyl\Services\Database\DatabaseHostService; +use Pterodactyl\Http\Controllers\Admin\DatabaseController; +use Pterodactyl\Contracts\Repository\LocationRepositoryInterface; +use Pterodactyl\Contracts\Repository\DatabaseHostRepositoryInterface; class DatabaseControllerTest extends TestCase { diff --git a/tests/Unit/Services/Servers/CreationServiceTest.php b/tests/Unit/Services/Servers/CreationServiceTest.php index c14384cf3..d9a5c2452 100644 --- a/tests/Unit/Services/Servers/CreationServiceTest.php +++ b/tests/Unit/Services/Servers/CreationServiceTest.php @@ -25,13 +25,13 @@ namespace Tests\Unit\Services\Servers; use Exception; -use GuzzleHttp\Exception\RequestException; use Mockery as m; -use Pterodactyl\Exceptions\DisplayException; use Tests\TestCase; use Illuminate\Log\Writer; use phpmock\phpunit\PHPMock; use Illuminate\Database\DatabaseManager; +use GuzzleHttp\Exception\RequestException; +use Pterodactyl\Exceptions\DisplayException; use Pterodactyl\Services\Servers\CreationService; use Pterodactyl\Services\Servers\VariableValidatorService; use Pterodactyl\Services\Servers\UsernameGenerationService; diff --git a/tests/Unit/Services/Servers/DeletionServiceTest.php b/tests/Unit/Services/Servers/DeletionServiceTest.php index 37295ed8b..f61b53a26 100644 --- a/tests/Unit/Services/Servers/DeletionServiceTest.php +++ b/tests/Unit/Services/Servers/DeletionServiceTest.php @@ -25,18 +25,18 @@ namespace Tests\Unit\Services\Servers; use Exception; -use GuzzleHttp\Exception\RequestException; -use Illuminate\Log\Writer; use Mockery as m; -use Illuminate\Database\ConnectionInterface; -use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface; -use Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface; -use Pterodactyl\Contracts\Repository\ServerRepositoryInterface; -use Pterodactyl\Exceptions\DisplayException; -use Pterodactyl\Models\Server; -use Pterodactyl\Services\Database\DatabaseManagementService; -use Pterodactyl\Services\Servers\DeletionService; use Tests\TestCase; +use Illuminate\Log\Writer; +use Pterodactyl\Models\Server; +use GuzzleHttp\Exception\RequestException; +use Illuminate\Database\ConnectionInterface; +use Pterodactyl\Exceptions\DisplayException; +use Pterodactyl\Services\Servers\DeletionService; +use Pterodactyl\Services\Database\DatabaseManagementService; +use Pterodactyl\Contracts\Repository\ServerRepositoryInterface; +use Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface; +use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface; class DeletionServiceTest extends TestCase { diff --git a/tests/Unit/Services/Services/Options/OptionCreationServiceTest.php b/tests/Unit/Services/Services/Options/OptionCreationServiceTest.php index 950168644..931367d0e 100644 --- a/tests/Unit/Services/Services/Options/OptionCreationServiceTest.php +++ b/tests/Unit/Services/Services/Options/OptionCreationServiceTest.php @@ -90,7 +90,7 @@ class OptionCreationServiceTest extends TestCase $this->repository->shouldReceive('findCountWhere')->with([ ['service_id', '=', $data['service_id']], - ['id', '=', $data['config_from']] + ['id', '=', $data['config_from']], ])->once()->andReturn(1); $this->repository->shouldReceive('create')->with($data) @@ -109,7 +109,7 @@ class OptionCreationServiceTest extends TestCase { $this->repository->shouldReceive('findCountWhere')->with([ ['service_id', '=', null], - ['id', '=', 1] + ['id', '=', 1], ])->once()->andReturn(0); try { diff --git a/tests/Unit/Services/Services/Options/OptionDeletionServiceTest.php b/tests/Unit/Services/Services/Options/OptionDeletionServiceTest.php index 1c2aa5c4d..bb369563f 100644 --- a/tests/Unit/Services/Services/Options/OptionDeletionServiceTest.php +++ b/tests/Unit/Services/Services/Options/OptionDeletionServiceTest.php @@ -25,11 +25,11 @@ namespace Tests\Unit\Services\Services\Options; use Mockery as m; -use Pterodactyl\Contracts\Repository\ServerRepositoryInterface; -use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface; -use Pterodactyl\Exceptions\Services\HasActiveServersException; -use Pterodactyl\Services\Services\Options\OptionDeletionService; use Tests\TestCase; +use Pterodactyl\Exceptions\Services\HasActiveServersException; +use Pterodactyl\Contracts\Repository\ServerRepositoryInterface; +use Pterodactyl\Services\Services\Options\OptionDeletionService; +use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface; class OptionDeletionServiceTest extends TestCase { diff --git a/tests/Unit/Services/Services/Options/OptionUpdateServiceTest.php b/tests/Unit/Services/Services/Options/OptionUpdateServiceTest.php index 20d23761c..7e34ad19f 100644 --- a/tests/Unit/Services/Services/Options/OptionUpdateServiceTest.php +++ b/tests/Unit/Services/Services/Options/OptionUpdateServiceTest.php @@ -26,11 +26,11 @@ namespace Tests\Unit\Services\Services\Options; use Exception; use Mockery as m; -use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface; -use Pterodactyl\Exceptions\Services\ServiceOption\NoParentConfigurationFoundException; +use Tests\TestCase; use Pterodactyl\Models\ServiceOption; use Pterodactyl\Services\Services\Options\OptionUpdateService; -use Tests\TestCase; +use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface; +use Pterodactyl\Exceptions\Services\ServiceOption\NoParentConfigurationFoundException; class OptionUpdateServiceTest extends TestCase { diff --git a/tests/Unit/Services/Services/ServiceCreationServiceTest.php b/tests/Unit/Services/Services/ServiceCreationServiceTest.php index e0989a40c..758b64272 100644 --- a/tests/Unit/Services/Services/ServiceCreationServiceTest.php +++ b/tests/Unit/Services/Services/ServiceCreationServiceTest.php @@ -25,12 +25,12 @@ namespace Tests\Unit\Services\Services; use Mockery as m; -use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface; -use Pterodactyl\Models\Service; -use Pterodactyl\Services\Services\ServiceCreationService; -use Pterodactyl\Traits\Services\CreatesServiceIndex; use Tests\TestCase; +use Pterodactyl\Models\Service; use Illuminate\Contracts\Config\Repository; +use Pterodactyl\Traits\Services\CreatesServiceIndex; +use Pterodactyl\Services\Services\ServiceCreationService; +use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface; class ServiceCreationServiceTest extends TestCase { diff --git a/tests/Unit/Services/Services/ServiceDeletionServiceTest.php b/tests/Unit/Services/Services/ServiceDeletionServiceTest.php index 66ded0d7f..0290b625b 100644 --- a/tests/Unit/Services/Services/ServiceDeletionServiceTest.php +++ b/tests/Unit/Services/Services/ServiceDeletionServiceTest.php @@ -26,11 +26,11 @@ namespace Tests\Unit\Services\Services; use Exception; use Mockery as m; +use Tests\TestCase; +use Pterodactyl\Services\Services\ServiceDeletionService; +use Pterodactyl\Exceptions\Services\HasActiveServersException; use Pterodactyl\Contracts\Repository\ServerRepositoryInterface; use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface; -use Pterodactyl\Exceptions\Services\HasActiveServersException; -use Pterodactyl\Services\Services\ServiceDeletionService; -use Tests\TestCase; class ServiceDeletionServiceTest extends TestCase { diff --git a/tests/Unit/Services/Services/ServiceUpdateServiceTest.php b/tests/Unit/Services/Services/ServiceUpdateServiceTest.php index 40baa8115..cac11ea66 100644 --- a/tests/Unit/Services/Services/ServiceUpdateServiceTest.php +++ b/tests/Unit/Services/Services/ServiceUpdateServiceTest.php @@ -25,9 +25,9 @@ namespace Tests\Unit\Services\Services; use Mockery as m; -use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface; -use Pterodactyl\Services\Services\ServiceUpdateService; use Tests\TestCase; +use Pterodactyl\Services\Services\ServiceUpdateService; +use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface; class ServiceUpdateServiceTest extends TestCase { diff --git a/tests/Unit/Services/Services/Variables/VariableCreationServiceTest.php b/tests/Unit/Services/Services/Variables/VariableCreationServiceTest.php index 320f06e75..87ca4ed92 100644 --- a/tests/Unit/Services/Services/Variables/VariableCreationServiceTest.php +++ b/tests/Unit/Services/Services/Variables/VariableCreationServiceTest.php @@ -25,13 +25,12 @@ namespace Tests\Unit\Services\Services\Variables; use Mockery as m; -use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface; -use Pterodactyl\Contracts\Repository\ServiceVariableRepositoryInterface; -use Pterodactyl\Exceptions\Services\ServiceVariable\ReservedVariableNameException; +use Tests\TestCase; use Pterodactyl\Models\ServiceOption; use Pterodactyl\Models\ServiceVariable; use Pterodactyl\Services\Services\Variables\VariableCreationService; -use Tests\TestCase; +use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface; +use Pterodactyl\Contracts\Repository\ServiceVariableRepositoryInterface; class VariableCreationServiceTest extends TestCase { diff --git a/tests/Unit/Services/Services/Variables/VariableUpdateServiceTest.php b/tests/Unit/Services/Services/Variables/VariableUpdateServiceTest.php index 5e0673879..2a19d9f07 100644 --- a/tests/Unit/Services/Services/Variables/VariableUpdateServiceTest.php +++ b/tests/Unit/Services/Services/Variables/VariableUpdateServiceTest.php @@ -26,11 +26,11 @@ namespace Tests\Unit\Services\Services\Variables; use Exception; use Mockery as m; -use PhpParser\Node\Expr\Variable; -use Pterodactyl\Exceptions\DisplayException; -use Pterodactyl\Models\ServiceVariable; -use Pterodactyl\Services\Services\Variables\VariableUpdateService; use Tests\TestCase; +use PhpParser\Node\Expr\Variable; +use Pterodactyl\Models\ServiceVariable; +use Pterodactyl\Exceptions\DisplayException; +use Pterodactyl\Services\Services\Variables\VariableUpdateService; use Pterodactyl\Contracts\Repository\ServiceVariableRepositoryInterface; class VariableUpdateServiceTest extends TestCase @@ -87,7 +87,7 @@ class VariableUpdateServiceTest extends TestCase ->shouldReceive('findCountWhere')->with([ ['env_variable', '=', 'TEST_VAR_123'], ['option_id', '=', $this->model->option_id], - ['id', '!=', $this->model->id] + ['id', '!=', $this->model->id], ])->once()->andReturn(0); $this->repository->shouldReceive('withoutFresh')->withNoArgs()->once()->andReturnSelf() @@ -109,7 +109,7 @@ class VariableUpdateServiceTest extends TestCase ->shouldReceive('findCountWhere')->with([ ['env_variable', '=', 'TEST_VAR_123'], ['option_id', '=', $this->model->option_id], - ['id', '!=', $this->model->id] + ['id', '!=', $this->model->id], ])->once()->andReturn(1); try {