Skip to content

Commit 1e1eac1

Browse files
authored
Apply fixes from StyleCI (pterodactyl#607)
1 parent f451e4d commit 1e1eac1

35 files changed

+120
-122
lines changed

app/Http/Controllers/Admin/PackController.php

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

2525
namespace Pterodactyl\Http\Controllers\Admin;
2626

27-
use Illuminate\Contracts\Config\Repository as ConfigRepository;
27+
use Illuminate\Http\Request;
28+
use Pterodactyl\Models\Pack;
2829
use Prologue\Alerts\AlertsMessageBag;
29-
use Pterodactyl\Contracts\Repository\PackRepositoryInterface;
30-
use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface;
31-
use Pterodactyl\Http\Requests\Admin\PackFormRequest;
30+
use Pterodactyl\Http\Controllers\Controller;
3231
use Pterodactyl\Services\Packs\ExportPackService;
32+
use Pterodactyl\Services\Packs\PackUpdateService;
3333
use Pterodactyl\Services\Packs\PackCreationService;
3434
use Pterodactyl\Services\Packs\PackDeletionService;
35-
use Pterodactyl\Services\Packs\PackUpdateService;
35+
use Pterodactyl\Http\Requests\Admin\PackFormRequest;
3636
use Pterodactyl\Services\Packs\TemplateUploadService;
37-
use Illuminate\Http\Request;
38-
use Pterodactyl\Models\Pack;
39-
use Pterodactyl\Http\Controllers\Controller;
37+
use Pterodactyl\Contracts\Repository\PackRepositoryInterface;
38+
use Illuminate\Contracts\Config\Repository as ConfigRepository;
39+
use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface;
4040

4141
class PackController extends Controller
4242
{

app/Models/Permission.php

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

2525
namespace Pterodactyl\Models;
2626

27+
use Sofa\Eloquence\Eloquence;
2728
use Illuminate\Database\Eloquent\Model;
2829
use Sofa\Eloquence\Contracts\CleansAttributes;
29-
use Sofa\Eloquence\Eloquence;
3030

3131
class Permission extends Model implements CleansAttributes
3232
{

app/Models/Subuser.php

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

2525
namespace Pterodactyl\Models;
2626

27+
use Sofa\Eloquence\Eloquence;
28+
use Sofa\Eloquence\Validable;
2729
use Illuminate\Database\Eloquent\Model;
2830
use Illuminate\Notifications\Notifiable;
2931
use Sofa\Eloquence\Contracts\CleansAttributes;
3032
use Sofa\Eloquence\Contracts\Validable as ValidableContract;
31-
use Sofa\Eloquence\Eloquence;
32-
use Sofa\Eloquence\Validable;
3333

3434
class Subuser extends Model implements CleansAttributes, ValidableContract
3535
{

app/Providers/RepositoryServiceProvider.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,12 @@
2525
namespace Pterodactyl\Providers;
2626

2727
use Illuminate\Support\ServiceProvider;
28-
use Pterodactyl\Contracts\Repository\Daemon\CommandRepositoryInterface;
29-
use Pterodactyl\Contracts\Repository\Daemon\FileRepositoryInterface;
30-
use Pterodactyl\Contracts\Repository\Daemon\PowerRepositoryInterface;
31-
use Pterodactyl\Contracts\Repository\PackRepositoryInterface;
32-
use Pterodactyl\Repositories\Daemon\CommandRepository;
3328
use Pterodactyl\Repositories\Daemon\FileRepository;
3429
use Pterodactyl\Repositories\Daemon\PowerRepository;
3530
use Pterodactyl\Repositories\Eloquent\NodeRepository;
3631
use Pterodactyl\Repositories\Eloquent\PackRepository;
3732
use Pterodactyl\Repositories\Eloquent\UserRepository;
33+
use Pterodactyl\Repositories\Daemon\CommandRepository;
3834
use Pterodactyl\Repositories\Eloquent\ApiKeyRepository;
3935
use Pterodactyl\Repositories\Eloquent\ServerRepository;
4036
use Pterodactyl\Repositories\Eloquent\ServiceRepository;
@@ -43,6 +39,7 @@
4339
use Pterodactyl\Repositories\Eloquent\AllocationRepository;
4440
use Pterodactyl\Repositories\Daemon\ConfigurationRepository;
4541
use Pterodactyl\Contracts\Repository\NodeRepositoryInterface;
42+
use Pterodactyl\Contracts\Repository\PackRepositoryInterface;
4643
use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
4744
use Pterodactyl\Repositories\Eloquent\DatabaseHostRepository;
4845
use Pterodactyl\Repositories\Eloquent\ApiPermissionRepository;
@@ -56,9 +53,12 @@
5653
use Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface;
5754
use Pterodactyl\Contracts\Repository\LocationRepositoryInterface;
5855
use Pterodactyl\Contracts\Repository\AllocationRepositoryInterface;
56+
use Pterodactyl\Contracts\Repository\Daemon\FileRepositoryInterface;
57+
use Pterodactyl\Contracts\Repository\Daemon\PowerRepositoryInterface;
5958
use Pterodactyl\Contracts\Repository\DatabaseHostRepositoryInterface;
6059
use Pterodactyl\Contracts\Repository\ApiPermissionRepositoryInterface;
6160
use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
61+
use Pterodactyl\Contracts\Repository\Daemon\CommandRepositoryInterface;
6262
use Pterodactyl\Contracts\Repository\OptionVariableRepositoryInterface;
6363
use Pterodactyl\Contracts\Repository\ServerVariableRepositoryInterface;
6464
use Pterodactyl\Contracts\Repository\ServiceVariableRepositoryInterface;

app/Repositories/Daemon/BaseRepository.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
namespace Pterodactyl\Repositories\Daemon;
2626

2727
use GuzzleHttp\Client;
28+
use Webmozart\Assert\Assert;
2829
use Illuminate\Foundation\Application;
2930
use Pterodactyl\Contracts\Repository\NodeRepositoryInterface;
3031
use Illuminate\Contracts\Config\Repository as ConfigRepository;
3132
use Pterodactyl\Contracts\Repository\Daemon\BaseRepositoryInterface;
32-
use Webmozart\Assert\Assert;
3333

3434
class BaseRepository implements BaseRepositoryInterface
3535
{

app/Repositories/Daemon/FileRepository.php

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

2525
namespace Pterodactyl\Repositories\Daemon;
2626

27-
use Pterodactyl\Contracts\Repository\Daemon\FileRepositoryInterface;
2827
use Webmozart\Assert\Assert;
28+
use Pterodactyl\Contracts\Repository\Daemon\FileRepositoryInterface;
2929

3030
class FileRepository extends BaseRepository implements FileRepositoryInterface
3131
{

app/Repositories/Daemon/ServerRepository.php

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

2525
namespace Pterodactyl\Repositories\Daemon;
2626

27+
use Webmozart\Assert\Assert;
2728
use Pterodactyl\Services\Servers\EnvironmentService;
2829
use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface;
2930
use Pterodactyl\Contracts\Repository\ServerRepositoryInterface as DatabaseServerRepositoryInterface;
30-
use Webmozart\Assert\Assert;
3131

3232
class ServerRepository extends BaseRepository implements ServerRepositoryInterface
3333
{

app/Repositories/Eloquent/DatabaseRepository.php

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

2525
namespace Pterodactyl\Repositories\Eloquent;
2626

27-
use Pterodactyl\Exceptions\Repository\DuplicateDatabaseNameException;
2827
use Pterodactyl\Models\Database;
2928
use Illuminate\Foundation\Application;
3029
use Illuminate\Database\DatabaseManager;
3130
use Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface;
31+
use Pterodactyl\Exceptions\Repository\DuplicateDatabaseNameException;
3232

3333
class DatabaseRepository extends EloquentRepository implements DatabaseRepositoryInterface
3434
{

app/Repositories/Eloquent/LocationRepository.php

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

2727
use Pterodactyl\Models\Location;
2828
use Pterodactyl\Exceptions\DisplayException;
29+
use Pterodactyl\Repositories\Concerns\Searchable;
2930
use Pterodactyl\Exceptions\Repository\RecordNotFoundException;
3031
use Pterodactyl\Contracts\Repository\LocationRepositoryInterface;
31-
use Pterodactyl\Repositories\Concerns\Searchable;
3232

3333
class LocationRepository extends EloquentRepository implements LocationRepositoryInterface
3434
{

app/Repositories/Eloquent/NodeRepository.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
namespace Pterodactyl\Repositories\Eloquent;
2626

2727
use Pterodactyl\Models\Node;
28+
use Pterodactyl\Repositories\Concerns\Searchable;
2829
use Pterodactyl\Contracts\Repository\NodeRepositoryInterface;
2930
use Pterodactyl\Exceptions\Repository\RecordNotFoundException;
30-
use Pterodactyl\Repositories\Concerns\Searchable;
3131

3232
class NodeRepository extends EloquentRepository implements NodeRepositoryInterface
3333
{

0 commit comments

Comments
 (0)