From ebc5164a53ea9f04ac673b7a5f40ea9aee7c94f7 Mon Sep 17 00:00:00 2001 From: notCharles Date: Tue, 27 Jan 2026 17:22:13 -0500 Subject: [PATCH] oh stan --- .../Sharing/ServerConfigCreatorService.php | 19 +++++++++---------- .../Sharing/ServerConfigImporterService.php | 2 +- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/app/Services/Servers/Sharing/ServerConfigCreatorService.php b/app/Services/Servers/Sharing/ServerConfigCreatorService.php index 085677c25..d4f71c361 100644 --- a/app/Services/Servers/Sharing/ServerConfigCreatorService.php +++ b/app/Services/Servers/Sharing/ServerConfigCreatorService.php @@ -5,6 +5,7 @@ namespace App\Services\Servers\Sharing; use App\Exceptions\Service\InvalidFileUploadException; use App\Models\Allocation; use App\Models\Egg; +use App\Models\EggVariable; use App\Models\Node; use App\Models\Server; use App\Models\ServerVariable; @@ -132,13 +133,12 @@ class ServerConfigCreatorService $startupCommand = Arr::get($config, 'settings.startup'); if ($startupCommand === null) { - $startupCommand = $egg->startup_commands[0]; + $startupCommand = array_values($egg->startup_commands)[0]; } $dockerImage = Arr::get($config, 'settings.image'); if ($dockerImage === null) { - $dockerImagesArray = array_values($egg->docker_images); - $dockerImage = $dockerImagesArray[0] ?? ''; + $dockerImage = array_values($egg->docker_images)[0]; } $server = Server::create([ @@ -228,15 +228,14 @@ class ServerConfigCreatorService $envVariable = Arr::get($variable, 'env_variable'); $value = Arr::get($variable, 'value'); + /** @var EggVariable $eggVariable */ $eggVariable = $server->egg->variables()->where('env_variable', $envVariable)->first(); - if ($eggVariable) { - ServerVariable::create([ - 'server_id' => $server->id, - 'variable_id' => $eggVariable->id, - 'variable_value' => $value, - ]); - } + ServerVariable::create([ + 'server_id' => $server->id, + 'variable_id' => $eggVariable->id, + 'variable_value' => $value, + ]); } } diff --git a/app/Services/Servers/Sharing/ServerConfigImporterService.php b/app/Services/Servers/Sharing/ServerConfigImporterService.php index 08835ebac..91903c787 100644 --- a/app/Services/Servers/Sharing/ServerConfigImporterService.php +++ b/app/Services/Servers/Sharing/ServerConfigImporterService.php @@ -95,7 +95,7 @@ class ServerConfigImporterService } /** - * @param array[] $variables + * @param array $variables */ protected function importVariables(Server $server, array $variables): void {