Skip to content

An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.

fix(env): preserve empty service variable values (#10850)

Andras Bacsaib6a4c7383a15
diff --git a/app/Models/EnvironmentVariable.php b/app/Models/EnvironmentVariable.php
index bfb02a470e..e346e59d13 100644
--- a/app/Models/EnvironmentVariable.php
+++ b/app/Models/EnvironmentVariable.php
@@ -356,7 +356,7 @@ class EnvironmentVariable extends BaseModel
private function set_environment_variables(?string $environment_variable = null): ?string
{
- if (is_null($environment_variable) && $environment_variable === '') {
+ if (is_null($environment_variable)) {
return null;
}
$environment_variable = trim($environment_variable);
diff --git a/tests/Feature/EnvironmentVariableValueCastingTest.php b/tests/Feature/EnvironmentVariableValueCastingTest.php
new file mode 100644
index 0000000000..6df78c1344
--- /dev/null
+++ b/tests/Feature/EnvironmentVariableValueCastingTest.php
@@ -0,0 +1,45 @@
+<?php
+
+use App\Models\Application;
+use App\Models\EnvironmentVariable;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+
+uses(RefreshDatabase::class);
+
+it('stores null environment variable values as database null', function () {
+ $env = EnvironmentVariable::create([
+ 'key' => 'NULL_VALUE',
+ 'value' => null,
+ 'resourceable_type' => Application::class,
+ 'resourceable_id' => 1,
+ ]);
+
+ $rawValue = DB::table('environment_variables')
+ ->where('id', $env->id)
+ ->value('value');
+
+ expect($rawValue)->toBeNull();
+
+ $env->refresh();
+ expect($env->value)->toBeNull();
+});
+
+it('preserves intentional empty string environment variable values', function () {
+ $env = EnvironmentVariable::create([
+ 'key' => 'EMPTY_STRING_VALUE',
+ 'value' => '',
+ 'resourceable_type' => Application::class,
+ 'resourceable_id' => 1,
+ ]);
+
+ $rawValue = DB::table('environment_variables')
+ ->where('id', $env->id)
+ ->value('value');
+
+ expect($rawValue)->not->toBeNull()
+ ->and(decrypt($rawValue))->toBe('');
+
+ $env->refresh();
+ expect($env->value)->toBe('');
+});