[Dotenv] Default value can be empty

symfony · Sep 26, 2024 · 4cb5f06 · 4cb5f06
1 parent deac556
commit 4cb5f06
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/Dotenv.php b/Dotenv.php
@@ -495,7 +495,7 @@ private function resolveVariables(string $value, array $loadedVars): string
             (?!\()                             # no opening parenthesis
             (?P<opening_brace>\{)?             # optional brace
             (?P<name>'.self::VARNAME_REGEX.')? # var name
-            (?P<default_value>:[-=][^\}]++)?   # optional default value
+            (?P<default_value>:[-=][^\}]*+)?   # optional default value
             (?P<closing_brace>\})?             # optional closing brace
         /x';
 

diff --git a/Tests/DotenvTest.php b/Tests/DotenvTest.php
@@ -175,6 +175,14 @@ public static function getEnvData()
             ["FOO=BAR\nBAR=\${NOTDEFINED:=TEST}", ['FOO' => 'BAR', 'NOTDEFINED' => 'TEST', 'BAR' => 'TEST']],
             ["FOO=\nBAR=\${FOO:=TEST}", ['FOO' => 'TEST', 'BAR' => 'TEST']],
             ["FOO=\nBAR=\$FOO:=TEST}", ['FOO' => 'TEST', 'BAR' => 'TEST}']],
+            ["FOO=BAR\nBAR=\${FOO:-}", ['FOO' => 'BAR', 'BAR' => 'BAR']],
+            ["FOO=BAR\nBAR=\${NOTDEFINED:-}", ['FOO' => 'BAR', 'BAR' => '']],
+            ["FOO=\nBAR=\${FOO:-}", ['FOO' => '', 'BAR' => '']],
+            ["FOO=\nBAR=\$FOO:-}", ['FOO' => '', 'BAR' => '}']],
+            ["FOO=BAR\nBAR=\${FOO:=}", ['FOO' => 'BAR', 'BAR' => 'BAR']],
+            ["FOO=BAR\nBAR=\${NOTDEFINED:=}", ['FOO' => 'BAR', 'NOTDEFINED' => '', 'BAR' => '']],
+            ["FOO=\nBAR=\${FOO:=}", ['FOO' => '', 'BAR' => '']],
+            ["FOO=\nBAR=\$FOO:=}", ['FOO' => '', 'BAR' => '}']],
             ["FOO=foo\nFOOBAR=\${FOO}\${BAR}", ['FOO' => 'foo', 'FOOBAR' => 'foo']],
 
             // underscores