Skip to content

Commit 46cb71e

Browse files
authored
Apply fixes from StyleCI (pterodactyl#590)
1 parent 1260a83 commit 46cb71e

File tree

13 files changed

+41
-42
lines changed

13 files changed

+41
-42
lines changed

app/Http/Controllers/Admin/OptionController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
use Pterodactyl\Models\ServiceOption;
3131
use Pterodactyl\Http\Controllers\Controller;
3232
use Pterodactyl\Http\Requests\Admin\Service\EditOptionScript;
33+
use Pterodactyl\Exceptions\Services\HasActiveServersException;
3334
use Pterodactyl\Services\Services\Options\OptionUpdateService;
3435
use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface;
3536
use Pterodactyl\Services\Services\Options\OptionCreationService;
@@ -38,7 +39,6 @@
3839
use Pterodactyl\Services\Services\Options\InstallScriptUpdateService;
3940
use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
4041
use Pterodactyl\Exceptions\Services\ServiceOption\InvalidCopyFromException;
41-
use Pterodactyl\Exceptions\Services\HasActiveServersException;
4242
use Pterodactyl\Exceptions\Services\ServiceOption\NoParentConfigurationFoundException;
4343

4444
class OptionController extends Controller

app/Services/Services/Options/OptionDeletionService.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424

2525
namespace Pterodactyl\Services\Services\Options;
2626

27+
use Pterodactyl\Exceptions\Services\HasActiveServersException;
2728
use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
2829
use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
29-
use Pterodactyl\Exceptions\Services\HasActiveServersException;
3030

3131
class OptionDeletionService
3232
{

tests/Unit/Http/Controllers/Admin/DatabaseControllerTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
namespace Tests\Unit\Http\Controllers\Admin;
2626

2727
use Mockery as m;
28+
use Tests\TestCase;
2829
use Prologue\Alerts\AlertsMessageBag;
29-
use Pterodactyl\Contracts\Repository\DatabaseHostRepositoryInterface;
30-
use Pterodactyl\Contracts\Repository\LocationRepositoryInterface;
31-
use Pterodactyl\Http\Controllers\Admin\DatabaseController;
32-
use Pterodactyl\Services\Database\DatabaseHostService;
3330
use Tests\Assertions\ControllerAssertionsTrait;
34-
use Tests\TestCase;
31+
use Pterodactyl\Services\Database\DatabaseHostService;
32+
use Pterodactyl\Http\Controllers\Admin\DatabaseController;
33+
use Pterodactyl\Contracts\Repository\LocationRepositoryInterface;
34+
use Pterodactyl\Contracts\Repository\DatabaseHostRepositoryInterface;
3535

3636
class DatabaseControllerTest extends TestCase
3737
{

tests/Unit/Services/Servers/CreationServiceTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
namespace Tests\Unit\Services\Servers;
2626

2727
use Exception;
28-
use GuzzleHttp\Exception\RequestException;
2928
use Mockery as m;
30-
use Pterodactyl\Exceptions\DisplayException;
3129
use Tests\TestCase;
3230
use Illuminate\Log\Writer;
3331
use phpmock\phpunit\PHPMock;
3432
use Illuminate\Database\DatabaseManager;
33+
use GuzzleHttp\Exception\RequestException;
34+
use Pterodactyl\Exceptions\DisplayException;
3535
use Pterodactyl\Services\Servers\CreationService;
3636
use Pterodactyl\Services\Servers\VariableValidatorService;
3737
use Pterodactyl\Services\Servers\UsernameGenerationService;

tests/Unit/Services/Servers/DeletionServiceTest.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@
2525
namespace Tests\Unit\Services\Servers;
2626

2727
use Exception;
28-
use GuzzleHttp\Exception\RequestException;
29-
use Illuminate\Log\Writer;
3028
use Mockery as m;
29+
use Tests\TestCase;
30+
use Illuminate\Log\Writer;
31+
use Pterodactyl\Models\Server;
32+
use GuzzleHttp\Exception\RequestException;
3133
use Illuminate\Database\ConnectionInterface;
32-
use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;
33-
use Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface;
34-
use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
3534
use Pterodactyl\Exceptions\DisplayException;
36-
use Pterodactyl\Models\Server;
37-
use Pterodactyl\Services\Database\DatabaseManagementService;
3835
use Pterodactyl\Services\Servers\DeletionService;
39-
use Tests\TestCase;
36+
use Pterodactyl\Services\Database\DatabaseManagementService;
37+
use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
38+
use Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface;
39+
use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;
4040

4141
class DeletionServiceTest extends TestCase
4242
{

tests/Unit/Services/Services/Options/OptionCreationServiceTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public function testCreateNewModelUsingConfigFrom()
9090

9191
$this->repository->shouldReceive('findCountWhere')->with([
9292
['service_id', '=', $data['service_id']],
93-
['id', '=', $data['config_from']]
93+
['id', '=', $data['config_from']],
9494
])->once()->andReturn(1);
9595

9696
$this->repository->shouldReceive('create')->with($data)
@@ -109,7 +109,7 @@ public function testExceptionIsThrownIfNoParentConfigurationIsFound()
109109
{
110110
$this->repository->shouldReceive('findCountWhere')->with([
111111
['service_id', '=', null],
112-
['id', '=', 1]
112+
['id', '=', 1],
113113
])->once()->andReturn(0);
114114

115115
try {

tests/Unit/Services/Services/Options/OptionDeletionServiceTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
namespace Tests\Unit\Services\Services\Options;
2626

2727
use Mockery as m;
28-
use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
29-
use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
28+
use Tests\TestCase;
3029
use Pterodactyl\Exceptions\Services\HasActiveServersException;
30+
use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
3131
use Pterodactyl\Services\Services\Options\OptionDeletionService;
32-
use Tests\TestCase;
32+
use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
3333

3434
class OptionDeletionServiceTest extends TestCase
3535
{

tests/Unit/Services/Services/Options/OptionUpdateServiceTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626

2727
use Exception;
2828
use Mockery as m;
29-
use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
30-
use Pterodactyl\Exceptions\Services\ServiceOption\NoParentConfigurationFoundException;
29+
use Tests\TestCase;
3130
use Pterodactyl\Models\ServiceOption;
3231
use Pterodactyl\Services\Services\Options\OptionUpdateService;
33-
use Tests\TestCase;
32+
use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
33+
use Pterodactyl\Exceptions\Services\ServiceOption\NoParentConfigurationFoundException;
3434

3535
class OptionUpdateServiceTest extends TestCase
3636
{

tests/Unit/Services/Services/ServiceCreationServiceTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
namespace Tests\Unit\Services\Services;
2626

2727
use Mockery as m;
28-
use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface;
29-
use Pterodactyl\Models\Service;
30-
use Pterodactyl\Services\Services\ServiceCreationService;
31-
use Pterodactyl\Traits\Services\CreatesServiceIndex;
3228
use Tests\TestCase;
29+
use Pterodactyl\Models\Service;
3330
use Illuminate\Contracts\Config\Repository;
31+
use Pterodactyl\Traits\Services\CreatesServiceIndex;
32+
use Pterodactyl\Services\Services\ServiceCreationService;
33+
use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface;
3434

3535
class ServiceCreationServiceTest extends TestCase
3636
{

tests/Unit/Services/Services/ServiceDeletionServiceTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626

2727
use Exception;
2828
use Mockery as m;
29+
use Tests\TestCase;
30+
use Pterodactyl\Services\Services\ServiceDeletionService;
31+
use Pterodactyl\Exceptions\Services\HasActiveServersException;
2932
use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
3033
use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface;
31-
use Pterodactyl\Exceptions\Services\HasActiveServersException;
32-
use Pterodactyl\Services\Services\ServiceDeletionService;
33-
use Tests\TestCase;
3434

3535
class ServiceDeletionServiceTest extends TestCase
3636
{

0 commit comments

Comments
 (0)