Merge branch 'develop' into enhancement/new-server-admin

app/Console/Commands/Server/BulkPowerActionCommand.php

@@ -5,14 +5,14 @@ namespace Pterodactyl\Console\Commands\Server;
 use Illuminate\Console\Command;
 use GuzzleHttp\Exception\RequestException;
 use Illuminate\Validation\ValidationException;
-use Pterodactyl\Repositories\Daemon\PowerRepository;
 use Illuminate\Validation\Factory as ValidatorFactory;
+use Pterodactyl\Repositories\Wings\DaemonPowerRepository;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 
 class BulkPowerActionCommand extends Command
 {
     /**
-     * @var \Pterodactyl\Contracts\Repository\Daemon\PowerRepositoryInterface
+     * @var \Pterodactyl\Repositories\Wings\DaemonPowerRepository
      */
     private $powerRepository;
 
@@ -42,27 +42,26 @@ class BulkPowerActionCommand extends Command
     /**
      * BulkPowerActionCommand constructor.
      *
-     * @param \Pterodactyl\Repositories\Daemon\PowerRepository $powerRepository
+     * @param \Pterodactyl\Repositories\Wings\DaemonPowerRepository $powerRepository
      * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository
      * @param \Illuminate\Validation\Factory $validator
      */
     public function __construct(
-        PowerRepository $powerRepository,
+        DaemonPowerRepository $powerRepository,
         ServerRepositoryInterface $repository,
         ValidatorFactory $validator
     ) {
         parent::__construct();
 
-        $this->powerRepository = $powerRepository;
         $this->repository = $repository;
         $this->validator = $validator;
+        $this->powerRepository = $powerRepository;
     }
 
     /**
      * Handle the bulk power request.
      *
      * @throws \Illuminate\Validation\ValidationException
-     * @throws \Pterodactyl\Exceptions\Repository\Daemon\InvalidPowerSignalException
      */
     public function handle()
     {
@@ -105,7 +104,7 @@ class BulkPowerActionCommand extends Command
                 $this->powerRepository
                     ->setNode($server->node)
                     ->setServer($server)
-                    ->sendSignal($action);
+                    ->send($action);
             } catch (RequestException $exception) {
                 $this->output->error(trans('command/messages.server.power.action_failed', [
                     'name' => $server->name,

app/Console/Commands/Server/BulkReinstallActionCommand.php

@@ -12,8 +12,8 @@ namespace Pterodactyl\Console\Commands\Server;
 use Webmozart\Assert\Assert;
 use Illuminate\Console\Command;
 use GuzzleHttp\Exception\RequestException;
+use Pterodactyl\Repositories\Eloquent\ServerRepository;
 use Pterodactyl\Repositories\Wings\DaemonServerRepository;
-use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 use Pterodactyl\Services\Servers\ServerConfigurationStructureService;
 
 class BulkReinstallActionCommand extends Command
@@ -21,23 +21,23 @@ class BulkReinstallActionCommand extends Command
     /**
      * @var \Pterodactyl\Services\Servers\ServerConfigurationStructureService
      */
-    protected $configurationStructureService;
+    private $configurationStructureService;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface
+     * @var \Pterodactyl\Repositories\Wings\DaemonServerRepository
      */
-    protected $daemonRepository;
+    private $daemonRepository;
+
+    /**
+     * @var \Pterodactyl\Repositories\Eloquent\ServerRepository
+     */
+    private $repository;
 
     /**
      * @var string
      */
     protected $description = 'Reinstall a single server, all servers on a node, or all servers on the panel.';
 
-    /**
-     * @var \Pterodactyl\Repositories\Wings\DaemonServerRepository
-     */
-    protected $repository;
-
     /**
      * @var string
      */
@@ -50,12 +50,12 @@ class BulkReinstallActionCommand extends Command
      *
      * @param \Pterodactyl\Repositories\Wings\DaemonServerRepository $daemonRepository
      * @param \Pterodactyl\Services\Servers\ServerConfigurationStructureService $configurationStructureService
-     * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository
+     * @param \Pterodactyl\Repositories\Eloquent\ServerRepository $repository
      */
     public function __construct(
         DaemonServerRepository $daemonRepository,
         ServerConfigurationStructureService $configurationStructureService,
-        ServerRepositoryInterface $repository
+        ServerRepository $repository
     ) {
         parent::__construct();
 
@@ -101,7 +101,7 @@ class BulkReinstallActionCommand extends Command
     /**
      * Return the servers to be reinstalled.
      *
-     * @return \Illuminate\Database\Eloquent\Collection
+     * @return \Illuminate\Support\Collection
      */
     private function getServersToProcess()
     {