From adcab5969a68408fddeb9523a2a55e0620ead07c Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Sat, 6 Jan 2018 12:58:30 -0600 Subject: [PATCH] Fix server description nullablility --- app/Http/Controllers/Admin/ServersController.php | 1 + app/Http/Requests/Admin/ServerFormRequest.php | 5 ++++- app/Services/Servers/ServerCreationService.php | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Admin/ServersController.php b/app/Http/Controllers/Admin/ServersController.php index e2bfa8fd4..c3e33b964 100644 --- a/app/Http/Controllers/Admin/ServersController.php +++ b/app/Http/Controllers/Admin/ServersController.php @@ -254,6 +254,7 @@ class ServersController extends Controller * @throws \Pterodactyl\Exceptions\DisplayException * @throws \Pterodactyl\Exceptions\Model\DataValidationException * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException + * @throws \Illuminate\Validation\ValidationException */ public function store(ServerFormRequest $request) { diff --git a/app/Http/Requests/Admin/ServerFormRequest.php b/app/Http/Requests/Admin/ServerFormRequest.php index f448a953c..33b9c8ffd 100644 --- a/app/Http/Requests/Admin/ServerFormRequest.php +++ b/app/Http/Requests/Admin/ServerFormRequest.php @@ -21,7 +21,10 @@ class ServerFormRequest extends AdminFormRequest */ public function rules() { - return Server::getCreateRules(); + $rules = Server::getCreateRules(); + $rules['description'][] = 'nullable'; + + return $rules; } /** diff --git a/app/Services/Servers/ServerCreationService.php b/app/Services/Servers/ServerCreationService.php index 82c49000c..4395717ec 100644 --- a/app/Services/Servers/ServerCreationService.php +++ b/app/Services/Servers/ServerCreationService.php @@ -118,7 +118,7 @@ class ServerCreationService 'uuidShort' => str_random(8), 'node_id' => array_get($data, 'node_id'), 'name' => array_get($data, 'name'), - 'description' => array_get($data, 'description', ''), + 'description' => array_get($data, 'description') ?? '', 'skip_scripts' => isset($data['skip_scripts']), 'suspended' => false, 'owner_id' => array_get($data, 'owner_id'),