From 79561a7af9ac01360269fecee225ddfa6ffd232e Mon Sep 17 00:00:00 2001
From: soufianZantar <s.zantar@gmail.com>
Date: Mon, 5 Aug 2019 10:42:16 +0200
Subject: [PATCH] [Dotenv] search variable values in ENV first then env file

---
 src/Symfony/Component/Dotenv/Dotenv.php       | 20 +++++++++++++------
 .../Component/Dotenv/Tests/DotenvTest.php     | 17 ++++++++++++++++
 src/Symfony/Component/Dotenv/composer.json    |  2 +-
 .../Component/VarDumper/Dumper/CliDumper.php  |  2 +-
 4 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/src/Symfony/Component/Dotenv/Dotenv.php b/src/Symfony/Component/Dotenv/Dotenv.php
index c6fc3cbda9ea5..3bc93bf7d52e4 100644
--- a/src/Symfony/Component/Dotenv/Dotenv.php
+++ b/src/Symfony/Component/Dotenv/Dotenv.php
@@ -332,7 +332,15 @@ private function resolveCommands($value)
 
             $process = new Process('echo '.$matches[0]);
             $process->inheritEnvironmentVariables(true);
-            $process->setEnv($this->values);
+
+            $env = [];
+            foreach ($this->values as $name => $value) {
+                if (!isset($_ENV[$name]) && !(isset($_SERVER[$name]) && 0 !== strpos($name, 'HTTP_'))) {
+                    $env[$name] = $value;
+                }
+            }
+            $process->setEnv($env);
+
             try {
                 $process->mustRun();
             } catch (ProcessException $e) {
@@ -375,14 +383,14 @@ private function resolveVariables($value)
             }
 
             $name = $matches['name'];
-            if (isset($this->values[$name])) {
-                $value = $this->values[$name];
+            if (isset($_ENV[$name])) {
+                $value = $_ENV[$name];
             } elseif (isset($_SERVER[$name]) && 0 !== strpos($name, 'HTTP_')) {
                 $value = $_SERVER[$name];
-            } elseif (isset($_ENV[$name])) {
-                $value = $_ENV[$name];
+            } elseif (isset($this->values[$name])) {
+                $value = $this->values[$name];
             } else {
-                $value = (string) getenv($name);
+                $value = '';
             }
 
             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 b920270da9d7d..dc7c4c1715450 100644
--- 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['LOCAL'] = 'local';
         $_ENV['REMOTE'] = 'remote';
 
         $tests = [
@@ -295,4 +296,20 @@ public function testOverridingEnvVarsWithNamesMemorizedInSpecialVar()
         $this->assertSame('baz1', getenv('BAZ'));
         $this->assertSame('/var/www', getenv('DOCUMENT_ROOT'));
     }
+
+    public function testGetVariablesValueFromEnvFirst()
+    {
+        $_ENV['APP_ENV'] = 'prod';
+        $dotenv = new Dotenv(true);
+
+        $test = "APP_ENV=dev\nTEST1=foo1_\${APP_ENV}";
+        $values = $dotenv->parse($test);
+        $this->assertSame('foo1_prod', $values['TEST1']);
+
+        if ('\\' !== \DIRECTORY_SEPARATOR) {
+            $test = "APP_ENV=dev\nTEST2=foo2_\$(php -r 'echo \$_SERVER[\"APP_ENV\"];')";
+            $values = $dotenv->parse($test);
+            $this->assertSame('foo2_prod', $values['TEST2']);
+        }
+    }
 }
diff --git a/src/Symfony/Component/Dotenv/composer.json b/src/Symfony/Component/Dotenv/composer.json
index 3bcfd89c8d350..e35339c98e111 100644
--- a/src/Symfony/Component/Dotenv/composer.json
+++ b/src/Symfony/Component/Dotenv/composer.json
@@ -19,7 +19,7 @@
         "php": "^5.5.9|>=7.0.8"
     },
     "require-dev": {
-        "symfony/process": "~3.2|~4.0"
+        "symfony/process": "^3.4.2|^4.0"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Dotenv\\": "" },
diff --git a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
index 2bd347d96a53e..946df78257bae 100644
--- a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
+++ b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
@@ -28,7 +28,7 @@ class CliDumper extends AbstractDumper
     protected $maxStringWidth = 0;
     protected $styles = [
         // See http://en.wikipedia.org/wiki/ANSI_escape_code#graphics
-        'default' => '38;5;208',
+        'default' => '0;38;5;208',
         'num' => '1;38;5;38',
         'const' => '1;38;5;208',
         'str' => '1;38;5;113',