bug #23434 [DotEnv] Fix variable substitution (brieucthomas)

fabpot · fabpot · commit c3ec5c5361c5 · 2017-07-06T15:57:36.000+03:00
This PR was merged into the 3.3 branch. Discussion ---------- [DotEnv] Fix variable substitution | Q | A | ------------- | --- | Branch? | 3.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #23423 | License | MIT | Doc PR | no Commits ------- 1dfcdc7 [DotEnv] Fix variable substitution
diff --git a/src/Symfony/Component/Dotenv/Dotenv.php b/src/Symfony/Component/Dotenv/Dotenv.php
@@ -351,7 +351,7 @@ private function resolveVariables($value)
             }
 
             $name = $matches[3];
-            $value = isset($this->values[$name]) ? $this->values[$name] : (isset($_ENV[$name]) ? isset($_ENV[$name]) : (string) getenv($name));
+            $value = isset($this->values[$name]) ? $this->values[$name] : (isset($_ENV[$name]) ? $_ENV[$name] : (string) getenv($name));
 
             if (!$matches[2] && isset($matches[4])) {
                 $value .= '}';
diff --git a/src/Symfony/Component/Dotenv/Tests/DotenvTest.php b/src/Symfony/Component/Dotenv/Tests/DotenvTest.php
@@ -63,6 +63,7 @@ public function testParse($data, $expected)
     public function getEnvData()
     {
         putenv('LOCAL=local');
+        $_ENV['REMOTE'] = 'remote';
 
         $tests = array(
             // spaces
@@ -134,6 +135,7 @@ public function getEnvData()
             array('FOO=" \\$ "', array('FOO' => ' $ ')),
             array('FOO=" $ "', array('FOO' => ' $ ')),
             array('BAR=$LOCAL', array('BAR' => 'local')),
+            array('BAR=$REMOTE', array('BAR' => 'remote')),
             array('FOO=$NOTDEFINED', array('FOO' => '')),
         );
 

Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,7 @@ private function resolveVariables($value)`
`351`	`351`	`}`
`352`	`352`
`353`	`353`	`$name = $matches[3];`
`354`		`- $value = isset($this->values[$name]) ? $this->values[$name] : (isset($_ENV[$name]) ? isset($_ENV[$name]) : (string) getenv($name));`
	`354`	`+ $value = isset($this->values[$name]) ? $this->values[$name] : (isset($_ENV[$name]) ? $_ENV[$name] : (string) getenv($name));`
`355`	`355`
`356`	`356`	`if (!$matches[2] && isset($matches[4])) {`
`357`	`357`	`$value .= '}';`