symfony
diff --git a/‎src/Symfony/Component/BrowserKit/Client.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/BrowserKit/Client.php
+1Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Component/BrowserKit/Client.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/BrowserKit/Client.php
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎src/Symfony/Component/Process/Process.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Process/Process.php
+30-20Lines changed: 30 additions & 20 deletions b/‎src/Symfony/Component/Process/Process.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Process/Process.php
+30-20Lines changed: 30 additions & 20 deletions
@@ -343,6 +343,7 @@ protected function doRequestInProcess($request)
     {
         $deprecationsFile = tempnam(sys_get_temp_dir(), 'deprec');
         putenv('SYMFONY_DEPRECATIONS_SERIALIZE='.$deprecationsFile);
+        $_ENV['SYMFONY_DEPRECATIONS_SERIALIZE'] = $deprecationsFile;
         $process = new PhpProcess($this->getScript($request), null, null);
         $process->run();
 
 
@@ -304,19 +304,16 @@ public function start(callable $callback = null/*, array $env = array()*/)
             $inheritEnv = true;
         }
 
-        $envBackup = array();
         if (null !== $env && $inheritEnv) {
-            foreach ($env as $k => $v) {
-                $envBackup[$k] = getenv($k);
-                putenv(false === $v || null === $v ? $k : "$k=$v");
-            }
-            $env = null;
+            $env += $this->getDefaultEnv();
         } elseif (null !== $env) {
             @trigger_error('Not inheriting environment variables is deprecated since Symfony 3.3 and will always happen in 4.0. Set "Process::inheritEnvironmentVariables()" to true instead.', E_USER_DEPRECATED);
+        } else {
+            $env = $this->getDefaultEnv();
         }
         if ('\\' === DIRECTORY_SEPARATOR && $this->enhanceWindowsCompatibility) {
             $this->options['bypass_shell'] = true;
-            $commandline = $this->prepareWindowsCommandLine($commandline, $envBackup, $env);
+            $commandline = $this->prepareWindowsCommandLine($commandline, $env);
         } elseif (!$this->useFileHandles && $this->enhanceSigchildCompatibility && $this->isSigchildEnabled()) {
             // last exit code is output on the fourth pipe and caught to work around --enable-sigchild
             $descriptors[3] = array('pipe', 'w');
@@ -332,10 +329,6 @@ public function start(callable $callback = null/*, array $env = array()*/)
 
         $this->process = proc_open($commandline, $descriptors, $this->processPipes->pipes, $this->cwd, $env, $this->options);
 
-        foreach ($envBackup as $k => $v) {
-            putenv(false === $v ? $k : "$k=$v");
-        }
-
         if (!is_resource($this->process)) {
             throw new RuntimeException('Unable to launch a new process.');
         }
@@ -1623,7 +1616,7 @@ private function doSignal($signal, $throwException)
         return true;
     }
 
-    private function prepareWindowsCommandLine($cmd, array &$envBackup, array &$env = null)
+    private function prepareWindowsCommandLine($cmd, array &$env)
     {
         $uid = uniqid('', true);
         $varCount = 0;
@@ -1636,7 +1629,7 @@ private function prepareWindowsCommandLine($cmd, array &$envBackup, array &$env
                     [^"%!^]*+
                 )++
             ) | [^"]*+ )"/x',
-            function ($m) use (&$envBackup, &$env, &$varCache, &$varCount, $uid) {
+            function ($m) use (&$env, &$varCache, &$varCount, $uid) {
                 if (!isset($m[1])) {
                     return $m[0];
                 }
@@ -1654,13 +1647,7 @@ function ($m) use (&$envBackup, &$env, &$varCache, &$varCount, $uid) {
                 $value = '"'.preg_replace('/(\\\\*)"/', '$1$1\\"', $value).'"';
                 $var = $uid.++$varCount;
 
-                if (null === $env) {
-                    putenv("$var=$value");
-                } else {
-                    $env[$var] = $value;
-                }
-
-                $envBackup[$var] = false;
+                $env[$var] = $value;
 
                 return $varCache[$m[0]] = '!'.$var.'!';
             },
@@ -1728,4 +1715,27 @@ private function escapeArgument($argument)
 
         return '"'.str_replace(array('"', '^', '%', '!', "\n"), array('""', '"^^"', '"^%"', '"^!"', '!LF!'), $argument).'"';
     }
+
+    private function getDefaultEnv()
+    {
+        if (\PHP_VERSION_ID >= 70100) {
+            $env = getenv();
+        } else {
+            $env = array();
+
+            foreach ($_SERVER as $k => $v) {
+                if (is_string($v) && false !== $v = getenv($k)) {
+                    $env[$k] = $v;
+                }
+            }
+        }
+
+        foreach ($_ENV as $k => $v) {
+            if (is_string($v)) {
+                $env[$k] = $v;
+            }
+        }
+
+        return $env;
+    }
 }
Original file line number	Diff line number	Diff line change
`@@ -343,6 +343,7 @@ protected function doRequestInProcess($request)`
`343`	`343`	`{`
`344`	`344`	`$deprecationsFile = tempnam(sys_get_temp_dir(), 'deprec');`
`345`	`345`	`putenv('SYMFONY_DEPRECATIONS_SERIALIZE='.$deprecationsFile);`
	`346`	`+ $_ENV['SYMFONY_DEPRECATIONS_SERIALIZE'] = $deprecationsFile;`
`346`	`347`	`$process = new PhpProcess($this->getScript($request), null, null);`
`347`	`348`	`$process->run();`
`348`	`349`