From 986063dce45ac2eb62c8a8c5513f856aaac3b767 Mon Sep 17 00:00:00 2001 From: Lance Pioch Date: Sat, 19 Jul 2025 13:58:04 -0400 Subject: [PATCH] Use default startup variable value when creating server via api (#1518) Co-authored-by: Boy132 --- app/Services/Servers/VariableValidatorService.php | 2 +- .../Services/Servers/VariableValidatorServiceTest.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Services/Servers/VariableValidatorService.php b/app/Services/Servers/VariableValidatorService.php index a1a7f88bc..df1a4e0f3 100644 --- a/app/Services/Servers/VariableValidatorService.php +++ b/app/Services/Servers/VariableValidatorService.php @@ -36,7 +36,7 @@ class VariableValidatorService $data = $rules = $customAttributes = []; foreach ($variables as $variable) { - $data['environment'][$variable->env_variable] = array_get($fields, $variable->env_variable); + $data['environment'][$variable->env_variable] = $fields[$variable->env_variable] ?? $variable->default_value; $rules['environment.' . $variable->env_variable] = $variable->rules; $customAttributes['environment.' . $variable->env_variable] = trans('validation.internal.variable_value', ['env' => $variable->name]); } diff --git a/tests/Integration/Services/Servers/VariableValidatorServiceTest.php b/tests/Integration/Services/Servers/VariableValidatorServiceTest.php index ac0cd35a9..484e517e5 100644 --- a/tests/Integration/Services/Servers/VariableValidatorServiceTest.php +++ b/tests/Integration/Services/Servers/VariableValidatorServiceTest.php @@ -34,6 +34,7 @@ class VariableValidatorServiceTest extends IntegrationTestCase try { $this->getService()->handle($egg->id, [ 'BUNGEE_VERSION' => '1.2.3', + 'SERVER_JARFILE' => '', ]); $this->fail('This statement should not be reached.');