Skip to content

Commit 2c0503c

Browse files
committed
[L6] Initial run, getting all dependencies in line
1 parent cb9536c commit 2c0503c

File tree

4 files changed

+1349
-1625
lines changed

4 files changed

+1349
-1625
lines changed

app/Console/Commands/Server/BulkReinstallActionCommand.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
use Webmozart\Assert\Assert;
1313
use Illuminate\Console\Command;
1414
use GuzzleHttp\Exception\RequestException;
15+
use Pterodactyl\Repositories\Wings\WingsServerRepository;
1516
use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
1617
use Pterodactyl\Services\Servers\ServerConfigurationStructureService;
17-
use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;
1818

1919
class BulkReinstallActionCommand extends Command
2020
{
@@ -34,7 +34,7 @@ class BulkReinstallActionCommand extends Command
3434
protected $description = 'Reinstall a single server, all servers on a node, or all servers on the panel.';
3535

3636
/**
37-
* @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface
37+
* @var \Pterodactyl\Repositories\Wings\WingsServerRepository
3838
*/
3939
protected $repository;
4040

@@ -48,12 +48,12 @@ class BulkReinstallActionCommand extends Command
4848
/**
4949
* BulkReinstallActionCommand constructor.
5050
*
51-
* @param \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface $daemonRepository
52-
* @param \Pterodactyl\Services\Servers\ServerConfigurationStructureService $configurationStructureService
53-
* @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository
51+
* @param \Pterodactyl\Repositories\Wings\WingsServerRepository $daemonRepository
52+
* @param \Pterodactyl\Services\Servers\ServerConfigurationStructureService $configurationStructureService
53+
* @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository
5454
*/
5555
public function __construct(
56-
DaemonServerRepositoryInterface $daemonRepository,
56+
WingsServerRepository $daemonRepository,
5757
ServerConfigurationStructureService $configurationStructureService,
5858
ServerRepositoryInterface $repository
5959
) {

app/Console/Commands/Server/RebuildServerCommand.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
use Webmozart\Assert\Assert;
1313
use Illuminate\Console\Command;
1414
use GuzzleHttp\Exception\RequestException;
15+
use Pterodactyl\Repositories\Wings\WingsServerRepository;
1516
use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
1617
use Pterodactyl\Services\Servers\ServerConfigurationStructureService;
17-
use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;
1818

1919
class RebuildServerCommand extends Command
2020
{
@@ -24,7 +24,7 @@ class RebuildServerCommand extends Command
2424
protected $configurationStructureService;
2525

2626
/**
27-
* @var \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface
27+
* @var \Pterodactyl\Repositories\Wings\WingsServerRepository
2828
*/
2929
protected $daemonRepository;
3030

@@ -48,12 +48,12 @@ class RebuildServerCommand extends Command
4848
/**
4949
* RebuildServerCommand constructor.
5050
*
51-
* @param \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface $daemonRepository
52-
* @param \Pterodactyl\Services\Servers\ServerConfigurationStructureService $configurationStructureService
53-
* @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository
51+
* @param \Pterodactyl\Repositories\Wings\WingsServerRepository $daemonRepository
52+
* @param \Pterodactyl\Services\Servers\ServerConfigurationStructureService $configurationStructureService
53+
* @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository
5454
*/
5555
public function __construct(
56-
DaemonServerRepositoryInterface $daemonRepository,
56+
WingsServerRepository $daemonRepository,
5757
ServerConfigurationStructureService $configurationStructureService,
5858
ServerRepositoryInterface $repository
5959
) {

composer.json

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -15,45 +15,39 @@
1515
"ext-mbstring": "*",
1616
"ext-pdo_mysql": "*",
1717
"ext-zip": "*",
18-
"appstract/laravel-blade-directives": "^0.7",
19-
"aws/aws-sdk-php": "^3.48",
20-
"cakephp/chronos": "^1.1",
21-
"doctrine/dbal": "^2.5",
22-
"fideloper/proxy": "^4.0",
18+
"appstract/laravel-blade-directives": "^1.6",
19+
"aws/aws-sdk-php": "^3.110",
20+
"cakephp/chronos": "^1.2",
21+
"doctrine/dbal": "^2.9",
22+
"fideloper/proxy": "^4.2",
2323
"guzzlehttp/guzzle": "^6.3",
24-
"hashids/hashids": "^3.0",
24+
"hashids/hashids": "^4.0",
2525
"igaster/laravel-theme": "^2.0.6",
2626
"laracasts/utilities": "^3.0",
27-
"laravel/framework": "~5.7.14",
27+
"laravel/framework": "^5.8",
2828
"laravel/tinker": "^1.0",
2929
"lord/laroute": "^2.4",
3030
"matriphe/iso-639": "^1.2",
31-
"nesbot/carbon": "^1.22",
3231
"pragmarx/google2fa": "^5.0",
3332
"predis/predis": "^1.1",
3433
"prologue/alerts": "^0.4",
35-
"ramsey/uuid": "^3.7",
3634
"s1lentium/iptools": "^1.1",
3735
"sofa/eloquence-base": "v5.6.2",
3836
"sofa/eloquence-validable": "v5.6",
39-
"spatie/laravel-fractal": "^5.4",
40-
"staudenmeir/belongs-to-through": "~2.3.0",
41-
"webmozart/assert": "^1.2"
37+
"spatie/laravel-fractal": "^5.6",
38+
"staudenmeir/belongs-to-through": "^2.5",
39+
"webmozart/assert": "^1.5"
4240
},
4341
"require-dev": {
4442
"barryvdh/laravel-debugbar": "^3.2",
45-
"barryvdh/laravel-ide-helper": "^2.5",
46-
"codedungeon/phpunit-result-printer": "^0.17.1",
47-
"filp/whoops": "^2.1",
43+
"barryvdh/laravel-ide-helper": "^2.6",
44+
"codedungeon/phpunit-result-printer": "^0.26",
45+
"filp/whoops": "^2.5",
4846
"friendsofphp/php-cs-fixer": "^2.15.1",
49-
"fzaninotto/faker": "^1.6",
50-
"laravel/dusk": "^3.0",
51-
"martinlindhe/laravel-vue-i18n-generator": "^0.1.28",
52-
"mockery/mockery": "^1.0",
53-
"nunomaduro/collision": "^2.0",
54-
"php-mock/php-mock-phpunit": "^2.1",
55-
"phpunit/phpunit": "~7.0",
56-
"tightenco/ziggy": "^0.5.0"
47+
"laravel/dusk": "^5.5",
48+
"mockery/mockery": "^1.2",
49+
"php-mock/php-mock-phpunit": "^2.4",
50+
"phpunit/phpunit": "^8.3"
5751
},
5852
"autoload": {
5953
"classmap": [

0 commit comments

Comments
 (0)