Skip to content

Commit 60f6e86

Browse files
committed
Remove all of the old references to unused interfaces outside the test code
1 parent 25f18dc commit 60f6e86

14 files changed

+43
-682
lines changed

.php_cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ return PhpCsFixer\Config::create()
4747
'psr4' => true,
4848
'random_api_migration' => true,
4949
'single_line_throw' => false,
50+
'single_trait_insert_per_statement' => false,
5051
'standardize_not_equals' => true,
5152
'ternary_to_null_coalescing' => true,
5253
'yoda_style' => [

app/Console/Commands/Server/BulkPowerActionCommand.php

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
use Illuminate\Console\Command;
66
use GuzzleHttp\Exception\RequestException;
77
use Illuminate\Validation\ValidationException;
8-
use Pterodactyl\Repositories\Daemon\PowerRepository;
98
use Illuminate\Validation\Factory as ValidatorFactory;
9+
use Pterodactyl\Repositories\Wings\DaemonPowerRepository;
1010
use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
1111

1212
class BulkPowerActionCommand extends Command
1313
{
1414
/**
15-
* @var \Pterodactyl\Contracts\Repository\Daemon\PowerRepositoryInterface
15+
* @var \Pterodactyl\Repositories\Wings\DaemonPowerRepository
1616
*/
1717
private $powerRepository;
1818

@@ -42,27 +42,26 @@ class BulkPowerActionCommand extends Command
4242
/**
4343
* BulkPowerActionCommand constructor.
4444
*
45-
* @param \Pterodactyl\Repositories\Daemon\PowerRepository $powerRepository
45+
* @param \Pterodactyl\Repositories\Wings\DaemonPowerRepository $powerRepository
4646
* @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository
4747
* @param \Illuminate\Validation\Factory $validator
4848
*/
4949
public function __construct(
50-
PowerRepository $powerRepository,
50+
DaemonPowerRepository $powerRepository,
5151
ServerRepositoryInterface $repository,
5252
ValidatorFactory $validator
5353
) {
5454
parent::__construct();
5555

56-
$this->powerRepository = $powerRepository;
5756
$this->repository = $repository;
5857
$this->validator = $validator;
58+
$this->powerRepository = $powerRepository;
5959
}
6060

6161
/**
6262
* Handle the bulk power request.
6363
*
6464
* @throws \Illuminate\Validation\ValidationException
65-
* @throws \Pterodactyl\Exceptions\Repository\Daemon\InvalidPowerSignalException
6665
*/
6766
public function handle()
6867
{
@@ -105,7 +104,7 @@ public function handle()
105104
$this->powerRepository
106105
->setNode($server->node)
107106
->setServer($server)
108-
->sendSignal($action);
107+
->send($action);
109108
} catch (RequestException $exception) {
110109
$this->output->error(trans('command/messages.server.power.action_failed', [
111110
'name' => $server->name,

app/Console/Commands/Server/BulkReinstallActionCommand.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,31 @@
1212
use Webmozart\Assert\Assert;
1313
use Illuminate\Console\Command;
1414
use GuzzleHttp\Exception\RequestException;
15+
use Pterodactyl\Repositories\Eloquent\ServerRepository;
1516
use Pterodactyl\Repositories\Wings\DaemonServerRepository;
16-
use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
1717
use Pterodactyl\Services\Servers\ServerConfigurationStructureService;
1818

1919
class BulkReinstallActionCommand extends Command
2020
{
2121
/**
2222
* @var \Pterodactyl\Services\Servers\ServerConfigurationStructureService
2323
*/
24-
protected $configurationStructureService;
24+
private $configurationStructureService;
2525

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

3131
/**
32-
* @var string
32+
* @var \Pterodactyl\Repositories\Eloquent\ServerRepository
3333
*/
34-
protected $description = 'Reinstall a single server, all servers on a node, or all servers on the panel.';
34+
private $repository;
3535

3636
/**
37-
* @var \Pterodactyl\Repositories\Wings\DaemonServerRepository
37+
* @var string
3838
*/
39-
protected $repository;
39+
protected $description = 'Reinstall a single server, all servers on a node, or all servers on the panel.';
4040

4141
/**
4242
* @var string
@@ -50,12 +50,12 @@ class BulkReinstallActionCommand extends Command
5050
*
5151
* @param \Pterodactyl\Repositories\Wings\DaemonServerRepository $daemonRepository
5252
* @param \Pterodactyl\Services\Servers\ServerConfigurationStructureService $configurationStructureService
53-
* @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository
53+
* @param \Pterodactyl\Repositories\Eloquent\ServerRepository $repository
5454
*/
5555
public function __construct(
5656
DaemonServerRepository $daemonRepository,
5757
ServerConfigurationStructureService $configurationStructureService,
58-
ServerRepositoryInterface $repository
58+
ServerRepository $repository
5959
) {
6060
parent::__construct();
6161

@@ -101,7 +101,7 @@ public function handle()
101101
/**
102102
* Return the servers to be reinstalled.
103103
*
104-
* @return \Illuminate\Database\Eloquent\Collection
104+
* @return \Illuminate\Support\Collection
105105
*/
106106
private function getServersToProcess()
107107
{

app/Contracts/Repository/Daemon/BaseRepositoryInterface.php

Lines changed: 0 additions & 68 deletions
This file was deleted.

app/Contracts/Repository/Daemon/CommandRepositoryInterface.php

Lines changed: 0 additions & 19 deletions
This file was deleted.

app/Contracts/Repository/Daemon/ConfigurationRepositoryInterface.php

Lines changed: 0 additions & 19 deletions
This file was deleted.

app/Contracts/Repository/Daemon/FileRepositoryInterface.php

Lines changed: 0 additions & 86 deletions
This file was deleted.

app/Contracts/Repository/Daemon/PowerRepositoryInterface.php

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)