Merge branch 'develop' into cputhreads

Author: DaneEveritt

.php_cs

@@ -33,6 +33,7 @@ return PhpCsFixer\Config::create()
         'new_with_braces' => false,
         'no_alias_functions' => true,
         'no_multiline_whitespace_before_semicolons' => true,
+        'no_superfluous_phpdoc_tags' => false,
         'no_unreachable_default_argument_value' => true,
         'no_useless_return' => true,
         'not_operator_with_successor_space' => true,

app/Http/Requests/Api/Client/Servers/SendPowerRequest.php

@@ -18,11 +18,10 @@ public function permission(): string
             case 'start':
                 return Permission::ACTION_CONTROL_START;
             case 'stop':
+            case 'kill':
                 return Permission::ACTION_CONTROL_STOP;
             case 'restart':
                 return Permission::ACTION_CONTROL_RESTART;
-            case 'kill':
-                return Permission::ACTION_CONTROL_KILL;
         }
 
         return '__invalid';

app/Models/Permission.php

@@ -20,7 +20,6 @@ class Permission extends Validable
     const ACTION_CONTROL_START = 'control.start';
     const ACTION_CONTROL_STOP = 'control.stop';
     const ACTION_CONTROL_RESTART = 'control.restart';
-    const ACTION_CONTROL_KILL = 'control.kill';
 
     const ACTION_DATABASE_READ = 'database.read';
     const ACTION_DATABASE_CREATE = 'database.create';
@@ -111,7 +110,6 @@ class Permission extends Validable
                 'start' => 'Allows a user to start the server if it is stopped.',
                 'stop' => 'Allows a user to stop a server if it is running.',
                 'restart' => 'Allows a user to perform a server restart. This allows them to start the server if it is offline, but not put the server in a completely stopped state.',
-                'kill' => 'Allows a user to terminate a server process.',
             ],
         ],
 

app/Models/Server.php

@@ -61,6 +61,10 @@ class Server extends Validable
      */
     const RESOURCE_NAME = 'server';
 
+    const STATUS_INSTALLING = 0;
+    const STATUS_INSTALLED = 1;
+    const STATUS_INSTALL_FAILED = 2;
+
     /**
      * The table associated with the model.
      *

app/Repositories/Wings/DaemonServerRepository.php

@@ -2,7 +2,6 @@
 
 namespace Pterodactyl\Repositories\Wings;
 
-use BadMethodCallException;
 use Webmozart\Assert\Assert;
 use Pterodactyl\Models\Server;
 use GuzzleHttp\Exception\TransferException;
@@ -13,7 +12,6 @@ class DaemonServerRepository extends DaemonRepository
     /**
      * Returns details about a server from the Daemon instance.
      *
-     * @return array
      * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
      */
     public function getDetails(): array
@@ -89,10 +87,20 @@ public function delete(): void
 
     /**
      * Reinstall a server on the daemon.
+     *
+     * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
      */
     public function reinstall(): void
     {
-        throw new BadMethodCallException('Method is not implemented.');
+        Assert::isInstanceOf($this->server, Server::class);
+
+        try {
+            $this->getHttpClient()->post(sprintf(
+                '/api/servers/%s/reinstall', $this->server->uuid
+            ));
+        } catch (TransferException $exception) {
+            throw new DaemonConnectionException($exception);
+        }
     }
 
     /**

app/Services/Servers/ReinstallServerService.php

@@ -3,11 +3,9 @@
 namespace Pterodactyl\Services\Servers;
 
 use Pterodactyl\Models\Server;
-use GuzzleHttp\Exception\RequestException;
 use Illuminate\Database\ConnectionInterface;
 use Pterodactyl\Repositories\Wings\DaemonServerRepository;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
-use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
 
 class ReinstallServerService
 {
@@ -44,28 +42,23 @@ public function __construct(
     }
 
     /**
-     * @param int|\Pterodactyl\Models\Server $server
+     * Reinstall a server on the remote daemon.
      *
-     * @throws \Pterodactyl\Exceptions\DisplayException
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     * @param \Pterodactyl\Models\Server $server
+     * @return \Pterodactyl\Models\Server
+     *
+     * @throws \Throwable
      */
-    public function reinstall($server)
+    public function reinstall(Server $server)
     {
-        if (! $server instanceof Server) {
-            $server = $this->repository->find($server);
-        }
-
-        $this->database->beginTransaction();
-        $this->repository->withoutFreshModel()->update($server->id, [
-            'installed' => 0,
-        ], true, true);
+        $this->database->transaction(function () use ($server) {
+            $this->repository->withoutFreshModel()->update($server->id, [
+                'installed' => Server::STATUS_INSTALLING,
+            ]);
 
-        try {
             $this->daemonServerRepository->setServer($server)->reinstall();
-            $this->database->commit();
-        } catch (RequestException $exception) {
-            throw new DaemonConnectionException($exception);
-        }
+        });
+
+        return $server->refresh();
     }
 }

composer.json

@@ -15,35 +15,35 @@
         "ext-mbstring": "*",
         "ext-pdo_mysql": "*",
         "ext-zip": "*",
-        "appstract/laravel-blade-directives": "^1.6",
-        "aws/aws-sdk-php": "^3.110",
-        "cakephp/chronos": "^1.2",
-        "doctrine/dbal": "^2.9",
+        "appstract/laravel-blade-directives": "^1.8",
+        "aws/aws-sdk-php": "^3.134",
+        "cakephp/chronos": "^1.3",
+        "doctrine/dbal": "^2.10",
         "fideloper/proxy": "^4.2",
-        "guzzlehttp/guzzle": "^6.3",
+        "guzzlehttp/guzzle": "^6.5",
         "hashids/hashids": "^4.0",
-        "laracasts/utilities": "^3.0",
-        "laravel/framework": "^6.0.0",
-        "laravel/helpers": "^1.1",
+        "laracasts/utilities": "^3.1",
+        "laravel/framework": "^6.18",
+        "laravel/helpers": "^1.2",
         "laravel/tinker": "^1.0",
         "lcobucci/jwt": "^3.3",
         "matriphe/iso-639": "^1.2",
         "pragmarx/google2fa": "^5.0",
         "predis/predis": "^1.1",
         "prologue/alerts": "^0.4",
         "s1lentium/iptools": "^1.1",
-        "spatie/laravel-fractal": "^5.6",
-        "staudenmeir/belongs-to-through": "^2.6",
-        "symfony/yaml": "^4.0",
-        "webmozart/assert": "^1.5"
+        "spatie/laravel-fractal": "^5.7",
+        "staudenmeir/belongs-to-through": "^2.9",
+        "symfony/yaml": "^4.4",
+        "webmozart/assert": "^1.7"
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.2",
         "barryvdh/laravel-ide-helper": "^2.6",
         "codedungeon/phpunit-result-printer": "0.25.1",
-        "friendsofphp/php-cs-fixer": "^2.15.1",
-        "laravel/dusk": "^5.5",
-        "php-mock/php-mock-phpunit": "^2.4",
+        "friendsofphp/php-cs-fixer": "^2.16.1",
+        "laravel/dusk": "^5.11",
+        "php-mock/php-mock-phpunit": "^2.6",
         "phpunit/phpunit": "^7"
     },
     "autoload": {