From 9c5754acaabc366ff7b1fb768d5054edc6746bdd Mon Sep 17 00:00:00 2001 From: Alexander McCullagh Date: Wed, 18 Dec 2019 15:26:27 +0100 Subject: [PATCH] [Dotenv] FIX missing getenv --- src/Symfony/Component/Dotenv/Dotenv.php | 2 +- src/Symfony/Component/Dotenv/Tests/DotenvTest.php | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/Dotenv/Dotenv.php b/src/Symfony/Component/Dotenv/Dotenv.php index c2475f204a8bb..84e66b1d0bd79 100644 --- a/src/Symfony/Component/Dotenv/Dotenv.php +++ b/src/Symfony/Component/Dotenv/Dotenv.php @@ -387,7 +387,7 @@ private function resolveVariables($value, array $loadedVars) } elseif (isset($this->values[$name])) { $value = $this->values[$name]; } else { - $value = ''; + $value = (string) getenv($name); } if (!$matches['opening_brace'] && isset($matches['closing_brace'])) { diff --git a/src/Symfony/Component/Dotenv/Tests/DotenvTest.php b/src/Symfony/Component/Dotenv/Tests/DotenvTest.php index 1e493f24bdb5b..965f368643d81 100644 --- a/src/Symfony/Component/Dotenv/Tests/DotenvTest.php +++ b/src/Symfony/Component/Dotenv/Tests/DotenvTest.php @@ -314,4 +314,15 @@ public function testGetVariablesValueFromEnvFirst() $this->assertSame('foo2_prod', $values['TEST2']); } } + + public function testGetVariablesValueFromGetenv() + { + putenv('Foo=Bar'); + + $dotenv = new Dotenv(true); + $values = $dotenv->parse('Foo=${Foo}'); + $this->assertSame('Bar', $values['Foo']); + + putenv('Foo'); + } }