[Dotenv] FIX missing getenv

mccullagh · mccullagh · commit c96920f707f9 · 2019-12-18T15:26:27.000+01:00
diff --git 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
@@ -314,4 +314,16 @@ public function testGetVariablesValueFromEnvFirst()
             $this->assertSame('foo2_prod', $values['TEST2']);
         }
     }
+
+    public function testGetVariablesValueFromGetenv()
+    {
+        putenv('Foo=Bar');
+
+        $dotenv = new Dotenv(true);
+
+        $test = "Foo=\${Foo}";
+        $values = $dotenv->parse($test);
+
+        $this->assertSame('Bar', $values['Foo']);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -387,7 +387,7 @@ private function resolveVariables($value, array $loadedVars)`
`387`	`387`	`} elseif (isset($this->values[$name])) {`
`388`	`388`	`$value = $this->values[$name];`
`389`	`389`	`} else {`
`390`		`- $value = '';`
	`390`	`+ $value = (string) getenv($name);`
`391`	`391`	`}`
`392`	`392`
`393`	`393`	`if (!$matches['opening_brace'] && isset($matches['closing_brace'])) {`
Original file line number	Diff line number	Diff line change
`@@ -314,4 +314,16 @@ public function testGetVariablesValueFromEnvFirst()`
`314`	`314`	`$this->assertSame('foo2_prod', $values['TEST2']);`
`315`	`315`	`}`
`316`	`316`	`}`
	`317`	`+`
	`318`	`+ public function testGetVariablesValueFromGetenv()`
	`319`	`+ {`
	`320`	`+ putenv('Foo=Bar');`
	`321`	`+`
	`322`	`+ $dotenv = new Dotenv(true);`
	`323`	`+`
	`324`	`+ $test = "Foo=\${Foo}";`
	`325`	`+ $values = $dotenv->parse($test);`
	`326`	`+`
	`327`	`+ $this->assertSame('Bar', $values['Foo']);`
	`328`	`+ }`
`317`	`329`	`}`