Fix test failures

Author: DaneEveritt

app/Exceptions/DisplayException.php

@@ -14,6 +14,9 @@
 
 class DisplayException extends PterodactylException
 {
+    const LEVEL_WARNING = 'warning';
+    const LEVEL_ERROR = 'error';
+
     /**
      * @var string
      */
@@ -27,7 +30,7 @@ class DisplayException extends PterodactylException
      * @param string         $level
      * @internal param mixed $log
      */
-    public function __construct($message, Throwable $previous = null, $level = 'error')
+    public function __construct($message, Throwable $previous = null, $level = self::LEVEL_ERROR)
     {
         $this->level = $level;
 

app/Exceptions/Http/Connection/DaemonConnectionException.php

@@ -0,0 +1,31 @@
+<?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\Exceptions\Http\Connection;
+
+use GuzzleHttp\Exception\GuzzleException;
+use Pterodactyl\Exceptions\DisplayException;
+
+class DaemonConnectionException extends DisplayException
+{
+    /**
+     * Throw a displayable exception caused by a daemon connection error.
+     *
+     * @param \GuzzleHttp\Exception\GuzzleException $previous
+     */
+    public function __construct(GuzzleException $previous)
+    {
+        /** @var \GuzzleHttp\Psr7\Response|null $response */
+        $response = method_exists($previous, 'getResponse') ? $previous->getResponse() : null;
+
+        parent::__construct(trans('admin/server.exceptions.daemon_exception', [
+            'code' => is_null($response) ? 'E_CONN_REFUSED' : $response->getStatusCode(),
+        ]), $previous, DisplayException::LEVEL_WARNING);
+    }
+}

app/Services/Servers/ServerCreationService.php

@@ -10,15 +10,14 @@
 namespace Pterodactyl\Services\Servers;
 
 use Ramsey\Uuid\Uuid;
-use Illuminate\Log\Writer;
-use Illuminate\Database\DatabaseManager;
 use GuzzleHttp\Exception\RequestException;
-use Pterodactyl\Exceptions\DisplayException;
+use Illuminate\Database\ConnectionInterface;
 use Pterodactyl\Services\Nodes\NodeCreationService;
 use Pterodactyl\Contracts\Repository\NodeRepositoryInterface;
 use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 use Pterodactyl\Contracts\Repository\AllocationRepositoryInterface;
+use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
 use Pterodactyl\Contracts\Repository\ServerVariableRepositoryInterface;
 use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;
 
@@ -35,14 +34,14 @@ class ServerCreationService
     protected $configurationStructureService;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface
+     * @var \Illuminate\Database\ConnectionInterface
      */
-    protected $daemonServerRepository;
+    protected $connection;
 
     /**
-     * @var \Illuminate\Database\DatabaseManager
+     * @var \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface
      */
-    protected $database;
+    protected $daemonServerRepository;
 
     /**
      * @var \Pterodactyl\Contracts\Repository\NodeRepositoryInterface
@@ -74,50 +73,42 @@ class ServerCreationService
      */
     protected $validatorService;
 
-    /**
-     * @var \Illuminate\Log\Writer
-     */
-    protected $writer;
-
     /**
      * CreationService constructor.
      *
      * @param \Pterodactyl\Contracts\Repository\AllocationRepositoryInterface     $allocationRepository
+     * @param \Illuminate\Database\ConnectionInterface                            $connection
      * @param \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface  $daemonServerRepository
-     * @param \Illuminate\Database\DatabaseManager                                $database
      * @param \Pterodactyl\Contracts\Repository\NodeRepositoryInterface           $nodeRepository
      * @param \Pterodactyl\Services\Servers\ServerConfigurationStructureService   $configurationStructureService
      * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface         $repository
      * @param \Pterodactyl\Contracts\Repository\ServerVariableRepositoryInterface $serverVariableRepository
      * @param \Pterodactyl\Contracts\Repository\UserRepositoryInterface           $userRepository
      * @param \Pterodactyl\Services\Servers\UsernameGenerationService             $usernameService
      * @param \Pterodactyl\Services\Servers\VariableValidatorService              $validatorService
-     * @param \Illuminate\Log\Writer                                              $writer
      */
     public function __construct(
         AllocationRepositoryInterface $allocationRepository,
+        ConnectionInterface $connection,
         DaemonServerRepositoryInterface $daemonServerRepository,
-        DatabaseManager $database,
         NodeRepositoryInterface $nodeRepository,
         ServerConfigurationStructureService $configurationStructureService,
         ServerRepositoryInterface $repository,
         ServerVariableRepositoryInterface $serverVariableRepository,
         UserRepositoryInterface $userRepository,
         UsernameGenerationService $usernameService,
-        VariableValidatorService $validatorService,
-        Writer $writer
+        VariableValidatorService $validatorService
     ) {
         $this->allocationRepository = $allocationRepository;
-        $this->daemonServerRepository = $daemonServerRepository;
         $this->configurationStructureService = $configurationStructureService;
-        $this->database = $database;
+        $this->connection = $connection;
+        $this->daemonServerRepository = $daemonServerRepository;
         $this->nodeRepository = $nodeRepository;
         $this->repository = $repository;
         $this->serverVariableRepository = $serverVariableRepository;
         $this->userRepository = $userRepository;
         $this->usernameService = $usernameService;
         $this->validatorService = $validatorService;
-        $this->writer = $writer;
     }
 
     /**
@@ -136,7 +127,7 @@ public function create(array $data)
         $validator = $this->validatorService->isAdmin()->setFields($data['environment'])->validate($data['option_id']);
         $uniqueShort = str_random(8);
 
-        $this->database->beginTransaction();
+        $this->connection->beginTransaction();
 
         $server = $this->repository->create([
             'uuid' => Uuid::uuid4()->toString(),
@@ -187,16 +178,13 @@ public function create(array $data)
 
         // Create the server on the daemon & commit it to the database.
         try {
-            $this->daemonServerRepository->setNode($server->node_id)->create($structure, ['start_on_completion' => (bool) $data['start_on_completion']]);
-            $this->database->commit();
+            $this->daemonServerRepository->setNode($server->node_id)->create($structure, [
+                'start_on_completion' => (bool) array_get($data, 'start_on_completion', false),
+            ]);
+            $this->connection->commit();
         } catch (RequestException $exception) {
-            $response = $exception->getResponse();
-            $this->writer->warning($exception);
-            $this->database->rollBack();
-
-            throw new DisplayException(trans('admin/server.exceptions.daemon_exception', [
-                'code' => is_null($response) ? 'E_CONN_REFUSED' : $response->getStatusCode(),
-            ]));
+            $this->connection->rollBack();
+            throw new DaemonConnectionException($exception);
         }
 
         return $server;