Skip to content

Commit f157c06

Browse files
committed
Fix PHPCS to order by length not alphabetical
1 parent dc310ff commit f157c06

File tree

7 files changed

+28
-25
lines changed

7 files changed

+28
-25
lines changed

.php_cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ return PhpCsFixer\Config::create()
3535
'no_unreachable_default_argument_value' => true,
3636
'no_useless_return' => true,
3737
'not_operator_with_successor_space' => true,
38+
'ordered_imports' => [
39+
'sortAlgorithm' => 'length',
40+
],
3841
'phpdoc_align' => ['tags' => ['param']],
3942
'phpdoc_separation' => false,
4043
'protected_to_private' => false,

app/Http/Controllers/Server/SubuserController.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@
2424

2525
namespace Pterodactyl\Http\Controllers\Server;
2626

27-
use Illuminate\Contracts\Session\Session;
28-
use Prologue\Alerts\AlertsMessageBag;
29-
use Pterodactyl\Contracts\Repository\SubuserRepositoryInterface;
3027
use Illuminate\Http\Request;
31-
use Pterodactyl\Http\Controllers\Controller;
3228
use Pterodactyl\Models\Permission;
33-
use Pterodactyl\Services\Subusers\SubuserCreationService;
34-
use Pterodactyl\Services\Subusers\SubuserDeletionService;
29+
use Prologue\Alerts\AlertsMessageBag;
30+
use Illuminate\Contracts\Session\Session;
31+
use Pterodactyl\Http\Controllers\Controller;
3532
use Pterodactyl\Services\Subusers\SubuserUpdateService;
3633
use Pterodactyl\Traits\Controllers\JavascriptInjection;
34+
use Pterodactyl\Services\Subusers\SubuserCreationService;
35+
use Pterodactyl\Services\Subusers\SubuserDeletionService;
36+
use Pterodactyl\Contracts\Repository\SubuserRepositoryInterface;
3737

3838
class SubuserController extends Controller
3939
{

app/Http/Middleware/Server/SubuserAccess.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626

2727
use Closure;
2828
use Illuminate\Contracts\Session\Session;
29-
use Pterodactyl\Contracts\Repository\SubuserRepositoryInterface;
3029
use Pterodactyl\Exceptions\DisplayException;
30+
use Pterodactyl\Contracts\Repository\SubuserRepositoryInterface;
3131
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
3232

3333
class SubuserAccess

app/Services/Subusers/SubuserCreationService.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
namespace Pterodactyl\Services\Subusers;
2626

2727
use Illuminate\Log\Writer;
28-
use Pterodactyl\Exceptions\Repository\RecordNotFoundException;
2928
use Pterodactyl\Models\Server;
3029
use GuzzleHttp\Exception\RequestException;
3130
use Illuminate\Database\ConnectionInterface;
3231
use Pterodactyl\Exceptions\DisplayException;
3332
use Pterodactyl\Services\Users\UserCreationService;
3433
use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
34+
use Pterodactyl\Exceptions\Repository\RecordNotFoundException;
3535
use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
3636
use Pterodactyl\Contracts\Repository\SubuserRepositoryInterface;
3737
use Pterodactyl\Exceptions\Service\Subuser\UserIsServerOwnerException;

tests/Unit/Http/Controllers/Server/Files/RemoteRequestControllerTest.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@
2424

2525
namespace Tests\Unit\Http\Controllers\Server\Files;
2626

27+
use Mockery as m;
28+
use Tests\TestCase;
29+
use Illuminate\Log\Writer;
30+
use Illuminate\Http\Request;
31+
use Pterodactyl\Models\Server;
32+
use Illuminate\Contracts\Session\Session;
2733
use GuzzleHttp\Exception\RequestException;
2834
use Illuminate\Contracts\Config\Repository;
29-
use Illuminate\Contracts\Session\Session;
30-
use Illuminate\Http\Request;
31-
use Illuminate\Log\Writer;
32-
use Mockery as m;
35+
use Tests\Assertions\ControllerAssertionsTrait;
3336
use Pterodactyl\Contracts\Repository\Daemon\FileRepositoryInterface;
3437
use Pterodactyl\Http\Controllers\Server\Files\RemoteRequestController;
35-
use Pterodactyl\Models\Server;
36-
use Tests\Assertions\ControllerAssertionsTrait;
37-
use Tests\TestCase;
3838

3939
class RemoteRequestControllerTest extends TestCase
4040
{

tests/Unit/Http/Controllers/Server/SubuserControllerTest.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,20 @@
2424

2525
namespace Tests\Unit\Http\Controllers\Server;
2626

27-
use Illuminate\Contracts\Session\Session;
28-
use Illuminate\Http\Request;
2927
use Mockery as m;
30-
use Prologue\Alerts\AlertsMessageBag;
31-
use Pterodactyl\Contracts\Repository\SubuserRepositoryInterface;
32-
use Pterodactyl\Http\Controllers\Server\SubuserController;
33-
use Pterodactyl\Models\Permission;
28+
use Tests\TestCase;
29+
use Illuminate\Http\Request;
3430
use Pterodactyl\Models\Server;
3531
use Pterodactyl\Models\Subuser;
32+
use Pterodactyl\Models\Permission;
33+
use Prologue\Alerts\AlertsMessageBag;
34+
use Illuminate\Contracts\Session\Session;
35+
use Tests\Assertions\ControllerAssertionsTrait;
36+
use Pterodactyl\Services\Subusers\SubuserUpdateService;
3637
use Pterodactyl\Services\Subusers\SubuserCreationService;
3738
use Pterodactyl\Services\Subusers\SubuserDeletionService;
38-
use Pterodactyl\Services\Subusers\SubuserUpdateService;
39-
use Tests\Assertions\ControllerAssertionsTrait;
40-
use Tests\TestCase;
39+
use Pterodactyl\Http\Controllers\Server\SubuserController;
40+
use Pterodactyl\Contracts\Repository\SubuserRepositoryInterface;
4141

4242
class SubuserControllerTest extends TestCase
4343
{

tests/Unit/Services/Subusers/SubuserCreationServiceTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
namespace Tests\Unit\Services\Subusers;
2626

2727
use Mockery as m;
28-
use Pterodactyl\Exceptions\Repository\RecordNotFoundException;
2928
use Tests\TestCase;
3029
use Illuminate\Log\Writer;
3130
use phpmock\phpunit\PHPMock;
@@ -38,6 +37,7 @@
3837
use Pterodactyl\Services\Subusers\SubuserCreationService;
3938
use Pterodactyl\Services\Subusers\PermissionCreationService;
4039
use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
40+
use Pterodactyl\Exceptions\Repository\RecordNotFoundException;
4141
use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
4242
use Pterodactyl\Contracts\Repository\SubuserRepositoryInterface;
4343
use Pterodactyl\Exceptions\Service\Subuser\UserIsServerOwnerException;

0 commit comments

Comments
 (0)