More fixes for broken unit tests

app/Services/Servers/EnvironmentService.php

@@ -4,8 +4,6 @@ namespace Pterodactyl\Services\Servers;
 
 use Pterodactyl\Models\Server;
 use Pterodactyl\Models\EggVariable;
-use Illuminate\Contracts\Config\Repository as ConfigRepository;
-use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 
 class EnvironmentService
 {
@@ -14,28 +12,6 @@ class EnvironmentService
      */
     private $additional = [];
 
-    /**
-     * @var \Illuminate\Contracts\Config\Repository
-     */
-    private $config;
-
-    /**
-     * @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface
-     */
-    private $repository;
-
-    /**
-     * EnvironmentService constructor.
-     *
-     * @param \Illuminate\Contracts\Config\Repository $config
-     * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository
-     */
-    public function __construct(ConfigRepository $config, ServerRepositoryInterface $repository)
-    {
-        $this->config = $config;
-        $this->repository = $repository;
-    }
-
     /**
      * Dynamically configure additional environment variables to be assigned
      * with a specific server.
@@ -79,7 +55,7 @@ class EnvironmentService
         }
 
         // Process variables set in the configuration file.
-        foreach ($this->config->get('pterodactyl.environment_variables', []) as $key => $object) {
+        foreach (config('pterodactyl.environment_variables', []) as $key => $object) {
             $variables->put(
                 $key, is_callable($object) ? call_user_func($object, $server) : object_get($server, $object)
             );

app/Services/Servers/ReinstallServerService.php

@@ -19,26 +19,18 @@ class ReinstallServerService
      */
     private $connection;
 
-    /**
-     * @var \Pterodactyl\Repositories\Eloquent\ServerRepository
-     */
-    private $repository;
-
     /**
      * ReinstallService constructor.
      *
      * @param \Illuminate\Database\ConnectionInterface $connection
      * @param \Pterodactyl\Repositories\Wings\DaemonServerRepository $daemonServerRepository
-     * @param \Pterodactyl\Repositories\Eloquent\ServerRepository $repository
      */
     public function __construct(
         ConnectionInterface $connection,
-        DaemonServerRepository $daemonServerRepository,
-        ServerRepository $repository
+        DaemonServerRepository $daemonServerRepository
     ) {
         $this->daemonServerRepository = $daemonServerRepository;
         $this->connection = $connection;
-        $this->repository = $repository;
     }
 
     /**
@@ -49,16 +41,14 @@ class ReinstallServerService
      *
      * @throws \Throwable
      */
-    public function reinstall(Server $server)
+    public function handle(Server $server)
     {
         return $this->connection->transaction(function () use ($server) {
-            $updated = $this->repository->update($server->id, [
-                'installed' => Server::STATUS_INSTALLING,
-            ], true, true);
+            $server->forceFill(['installed' => Server::STATUS_INSTALLING])->save();
 
             $this->daemonServerRepository->setServer($server)->reinstall();
 
-            return $updated;
+            return $server->refresh();
         });
     }
 }

app/Services/Servers/ServerConfigurationStructureService.php

@@ -1,17 +1,9 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Services\Servers;
 
 use Pterodactyl\Models\Mount;
 use Pterodactyl\Models\Server;
-use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 
 class ServerConfigurationStructureService
 {
@@ -22,22 +14,13 @@ class ServerConfigurationStructureService
      */
     private $environment;
 
-    /**
-     * @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface
-     */
-    private $repository;
-
     /**
      * ServerConfigurationStructureService constructor.
      *
-     * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository
      * @param \Pterodactyl\Services\Servers\EnvironmentService $environment
      */
-    public function __construct(
-        ServerRepositoryInterface $repository,
-        EnvironmentService $environment
-    ) {
-        $this->repository = $repository;
+    public function __construct(EnvironmentService $environment)
+    {
         $this->environment = $environment;
     }
 
@@ -112,8 +95,6 @@ class ServerConfigurationStructureService
      *
      * @param \Pterodactyl\Models\Server $server
      * @return array
-     *
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     protected function returnLegacyFormat(Server $server)
     {