File tree Expand file tree Collapse file tree 3 files changed +5
-1
lines changed Expand file tree Collapse file tree 3 files changed +5
-1
lines changed Original file line number Diff line number Diff line change @@ -272,7 +272,7 @@ protected function resolveNestedVariables($value)
272
272
if (strpos ($ value , '$ ' ) !== false ) {
273
273
$ loader = $ this ;
274
274
$ value = preg_replace_callback (
275
- '/\${([a-zA-Z0-9_]+)}/ ' ,
275
+ '/\${([a-zA-Z0-9_. ]+)}/ ' ,
276
276
function ($ matchedPatterns ) use ($ loader ) {
277
277
$ nestedVariable = $ loader ->getEnvironmentVariable ($ matchedPatterns [1 ]);
278
278
if ($ nestedVariable === null ) {
Original file line number Diff line number Diff line change @@ -139,6 +139,8 @@ public function testDotenvNestedEnvironmentVars()
139
139
$ this ->assertSame ('{$NVAR1} {$NVAR2} ' , $ _ENV ['NVAR3 ' ]); // not resolved
140
140
$ this ->assertSame ('Hello World! ' , $ _ENV ['NVAR4 ' ]);
141
141
$ this ->assertSame ('$NVAR1 {NVAR2} ' , $ _ENV ['NVAR5 ' ]); // not resolved
142
+ $ this ->assertSame ('Special Value ' , $ _ENV ['N.VAR6 ' ]); // new '.' (dot) in var name
143
+ $ this ->assertSame ('Special Value ' , $ _ENV ['NVAR7 ' ]); // nested '.' (dot) variable
142
144
}
143
145
144
146
/**
Original file line number Diff line number Diff line change @@ -3,3 +3,5 @@ NVAR2="World!"
3
3
NVAR3 = " {$NVAR1 } {$NVAR2 }"
4
4
NVAR4 = " ${ NVAR1 } ${ NVAR2 } "
5
5
NVAR5 = " $NVAR1 {NVAR2}"
6
+ N.VAR6 = " Special Value"
7
+ NVAR7 = " ${ N.VAR6 } "
You can’t perform that action at this time.
0 commit comments