bug #35022 [Dotenv] FIX missing getenv (mccullagh)

nicolas-grekas · nicolas-grekas · commit b38aad5a39e2 · 2019-12-18T22:43:02.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- [Dotenv] FIX missing getenv | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | Deprecations? | no> | Tickets | Fix #34598 | License | MIT | Doc PR | - Revert one line to use getenv because not all environment variables are populated in $_ENV[] Commits ------- 9c5754a [Dotenv] FIX missing getenv
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,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');
+    }
 }

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,15 @@ 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`	`+ $values = $dotenv->parse('Foo=${Foo}');`
	`324`	`+ $this->assertSame('Bar', $values['Foo']);`
	`325`	`+`
	`326`	`+ putenv('Foo');`
	`327`	`+ }`
`317`	`328`	`}`