sonot
/
PteroTheme
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[L6] Initial run, getting all dependencies in line

This commit is contained in:
Dane Everitt 2019-09-04 20:19:01 -07:00
parent cb9536cb24
commit 2c0503c593
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
4 changed files with 1345 additions and 1621 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Console/Commands/Server/BulkReinstallActionCommand.php
View File

@ -12,9 +12,9 @@ namespace Pterodactyl\Console\Commands\Server;
use Webmozart\Assert\Assert; use Webmozart\Assert\Assert;
use Illuminate\Console\Command; use Illuminate\Console\Command;
use GuzzleHttp\Exception\RequestException; use GuzzleHttp\Exception\RequestException;
use Pterodactyl\Repositories\Wings\WingsServerRepository;
use Pterodactyl\Contracts\Repository\ServerRepositoryInterface; use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
use Pterodactyl\Services\Servers\ServerConfigurationStructureService; use Pterodactyl\Services\Servers\ServerConfigurationStructureService;
use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;
class BulkReinstallActionCommand extends Command class BulkReinstallActionCommand extends Command
{ {
@ -34,7 +34,7 @@ class BulkReinstallActionCommand extends Command
protected $description = 'Reinstall a single server, all servers on a node, or all servers on the panel.'; protected $description = 'Reinstall a single server, all servers on a node, or all servers on the panel.';
/** /**
* @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface * @var \Pterodactyl\Repositories\Wings\WingsServerRepository
*/ */
protected $repository; protected $repository;
@ -48,12 +48,12 @@ class BulkReinstallActionCommand extends Command
/** /**
* BulkReinstallActionCommand constructor. * BulkReinstallActionCommand constructor.
* *
* @param \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface $daemonRepository * @param \Pterodactyl\Repositories\Wings\WingsServerRepository $daemonRepository
* @param \Pterodactyl\Services\Servers\ServerConfigurationStructureService $configurationStructureService * @param \Pterodactyl\Services\Servers\ServerConfigurationStructureService $configurationStructureService
* @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository
*/ */
public function __construct( public function __construct(
DaemonServerRepositoryInterface $daemonRepository, WingsServerRepository $daemonRepository,
ServerConfigurationStructureService $configurationStructureService, ServerConfigurationStructureService $configurationStructureService,
ServerRepositoryInterface $repository ServerRepositoryInterface $repository
) { ) {

12
app/Console/Commands/Server/RebuildServerCommand.php
View File

@ -12,9 +12,9 @@ namespace Pterodactyl\Console\Commands\Server;
use Webmozart\Assert\Assert; use Webmozart\Assert\Assert;
use Illuminate\Console\Command; use Illuminate\Console\Command;
use GuzzleHttp\Exception\RequestException; use GuzzleHttp\Exception\RequestException;
use Pterodactyl\Repositories\Wings\WingsServerRepository;
use Pterodactyl\Contracts\Repository\ServerRepositoryInterface; use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
use Pterodactyl\Services\Servers\ServerConfigurationStructureService; use Pterodactyl\Services\Servers\ServerConfigurationStructureService;
use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;
class RebuildServerCommand extends Command class RebuildServerCommand extends Command
{ {
@ -24,7 +24,7 @@ class RebuildServerCommand extends Command
protected $configurationStructureService; protected $configurationStructureService;
/** /**
* @var \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface * @var \Pterodactyl\Repositories\Wings\WingsServerRepository
*/ */
protected $daemonRepository; protected $daemonRepository;
@ -48,12 +48,12 @@ class RebuildServerCommand extends Command
/** /**
* RebuildServerCommand constructor. * RebuildServerCommand constructor.
* *
* @param \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface $daemonRepository * @param \Pterodactyl\Repositories\Wings\WingsServerRepository $daemonRepository
* @param \Pterodactyl\Services\Servers\ServerConfigurationStructureService $configurationStructureService * @param \Pterodactyl\Services\Servers\ServerConfigurationStructureService $configurationStructureService
* @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository
*/ */
public function __construct( public function __construct(
DaemonServerRepositoryInterface $daemonRepository, WingsServerRepository $daemonRepository,
ServerConfigurationStructureService $configurationStructureService, ServerConfigurationStructureService $configurationStructureService,
ServerRepositoryInterface $repository ServerRepositoryInterface $repository
) { ) {

40
composer.json
View File

@ -15,45 +15,39 @@
"ext-mbstring": "*", "ext-mbstring": "*",
"ext-pdo_mysql": "*", "ext-pdo_mysql": "*",
"ext-zip": "*", "ext-zip": "*",
"appstract/laravel-blade-directives": "^0.7", "appstract/laravel-blade-directives": "^1.6",
"aws/aws-sdk-php": "^3.48", "aws/aws-sdk-php": "^3.110",
"cakephp/chronos": "^1.1", "cakephp/chronos": "^1.2",
"doctrine/dbal": "^2.5", "doctrine/dbal": "^2.9",
"fideloper/proxy": "^4.0", "fideloper/proxy": "^4.2",
"guzzlehttp/guzzle": "^6.3", "guzzlehttp/guzzle": "^6.3",
"hashids/hashids": "^3.0", "hashids/hashids": "^4.0",
"igaster/laravel-theme": "^2.0.6", "igaster/laravel-theme": "^2.0.6",
"laracasts/utilities": "^3.0", "laracasts/utilities": "^3.0",
"laravel/framework": "~5.7.14", "laravel/framework": "^5.8",
"laravel/tinker": "^1.0", "laravel/tinker": "^1.0",
"lord/laroute": "^2.4", "lord/laroute": "^2.4",
"matriphe/iso-639": "^1.2", "matriphe/iso-639": "^1.2",
"nesbot/carbon": "^1.22",
"pragmarx/google2fa": "^5.0", "pragmarx/google2fa": "^5.0",
"predis/predis": "^1.1", "predis/predis": "^1.1",
"prologue/alerts": "^0.4", "prologue/alerts": "^0.4",
"ramsey/uuid": "^3.7",
"s1lentium/iptools": "^1.1", "s1lentium/iptools": "^1.1",
"sofa/eloquence-base": "v5.6.2", "sofa/eloquence-base": "v5.6.2",
"sofa/eloquence-validable": "v5.6", "sofa/eloquence-validable": "v5.6",
"spatie/laravel-fractal": "^5.4", "spatie/laravel-fractal": "^5.6",
"staudenmeir/belongs-to-through": "~2.3.0", "staudenmeir/belongs-to-through": "^2.5",
"webmozart/assert": "^1.2" "webmozart/assert": "^1.5"
}, },
"require-dev": { "require-dev": {
"barryvdh/laravel-debugbar": "^3.2", "barryvdh/laravel-debugbar": "^3.2",
"barryvdh/laravel-ide-helper": "^2.5", "barryvdh/laravel-ide-helper": "^2.6",
"codedungeon/phpunit-result-printer": "^0.17.1", "codedungeon/phpunit-result-printer": "^0.26",
"filp/whoops": "^2.1", "filp/whoops": "^2.5",
"friendsofphp/php-cs-fixer": "^2.15.1", "friendsofphp/php-cs-fixer": "^2.15.1",
"fzaninotto/faker": "^1.6", "laravel/dusk": "^5.5",
"laravel/dusk": "^3.0", "mockery/mockery": "^1.2",
"martinlindhe/laravel-vue-i18n-generator": "^0.1.28", "php-mock/php-mock-phpunit": "^2.4",
"mockery/mockery": "^1.0", "phpunit/phpunit": "^8.3"
"nunomaduro/collision": "^2.0",
"php-mock/php-mock-phpunit": "^2.1",
"phpunit/phpunit": "~7.0",
"tightenco/ziggy": "^0.5.0"
}, },
"autoload": { "autoload": {
"classmap": [ "classmap": [

2902
composer.lock generated
View File

File diff suppressed because it is too large Load Diff