Skip to content

Commit 56a10f3

Browse files
committed
Merge branch '6.4' into 7.1
* 6.4: [TwigBridge] Remove usage of Node() instantiations Update security.bg.xlf [Dotenv] Default value can be empty [Emoji] Update data to support emoji 16
2 parents eafe859 + 436ae2d commit 56a10f3

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

Dotenv.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ private function resolveVariables(string $value, array $loadedVars): string
481481
(?!\() # no opening parenthesis
482482
(?P<opening_brace>\{)? # optional brace
483483
(?P<name>'.self::VARNAME_REGEX.')? # var name
484-
(?P<default_value>:[-=][^\}]++)? # optional default value
484+
(?P<default_value>:[-=][^\}]*+)? # optional default value
485485
(?P<closing_brace>\})? # optional closing brace
486486
/x';
487487

Tests/DotenvTest.php

+8
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,14 @@ public static function getEnvData()
175175
["FOO=BAR\nBAR=\${NOTDEFINED:=TEST}", ['FOO' => 'BAR', 'NOTDEFINED' => 'TEST', 'BAR' => 'TEST']],
176176
["FOO=\nBAR=\${FOO:=TEST}", ['FOO' => 'TEST', 'BAR' => 'TEST']],
177177
["FOO=\nBAR=\$FOO:=TEST}", ['FOO' => 'TEST', 'BAR' => 'TEST}']],
178+
["FOO=BAR\nBAR=\${FOO:-}", ['FOO' => 'BAR', 'BAR' => 'BAR']],
179+
["FOO=BAR\nBAR=\${NOTDEFINED:-}", ['FOO' => 'BAR', 'BAR' => '']],
180+
["FOO=\nBAR=\${FOO:-}", ['FOO' => '', 'BAR' => '']],
181+
["FOO=\nBAR=\$FOO:-}", ['FOO' => '', 'BAR' => '}']],
182+
["FOO=BAR\nBAR=\${FOO:=}", ['FOO' => 'BAR', 'BAR' => 'BAR']],
183+
["FOO=BAR\nBAR=\${NOTDEFINED:=}", ['FOO' => 'BAR', 'NOTDEFINED' => '', 'BAR' => '']],
184+
["FOO=\nBAR=\${FOO:=}", ['FOO' => '', 'BAR' => '']],
185+
["FOO=\nBAR=\$FOO:=}", ['FOO' => '', 'BAR' => '}']],
178186
["FOO=foo\nFOOBAR=\${FOO}\${BAR}", ['FOO' => 'foo', 'FOOBAR' => 'foo']],
179187

180188
// underscores

0 commit comments

Comments
 (0)