[Process] intersect with getenv() in case-insensitive manner to get default envs

stable-staple · nicolas-grekas · commit ca64e231920e · 2021-11-28T15:42:47.000+01:00
- since environment variables are case-insensitive in Windows,
  all envs should be compared in case-insensitive manner
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
@@ -304,10 +304,10 @@ public function start(callable $callback = null, array $env = [])
         $descriptors = $this->getDescriptors();
 
         if ($this->env) {
-            $env += $this->env;
+            $env += '\\' === \DIRECTORY_SEPARATOR ? array_diff_ukey($this->env, $env, 'strcasecmp') : $this->env;
         }
 
-        $env += $this->getDefaultEnv();
+        $env += '\\' === \DIRECTORY_SEPARATOR ? array_diff_ukey($this->getDefaultEnv(), $env, 'strcasecmp') : $this->getDefaultEnv();
 
         if (\is_array($commandline = $this->commandline)) {
             $commandline = implode(' ', array_map([$this, 'escapeArgument'], $commandline));
@@ -1659,8 +1659,8 @@ private function replacePlaceholders(string $commandline, array $env)
     private function getDefaultEnv(): array
     {
         $env = getenv();
-        $env = array_intersect_key($env, $_SERVER) ?: $env;
+        $env = ('\\' === \DIRECTORY_SEPARATOR ? array_intersect_ukey($env, $_SERVER, 'strcasecmp') : array_intersect_key($env, $_SERVER)) ?: $env;
 
-        return $_ENV + $env;
+        return $_ENV + ('\\' === \DIRECTORY_SEPARATOR ? array_diff_ukey($env, $_ENV, 'strcasecmp') : $env);
     }
 }
diff --git a/src/Symfony/Component/Process/Tests/ProcessTest.php b/src/Symfony/Component/Process/Tests/ProcessTest.php
@@ -1522,6 +1522,18 @@ public function testWaitStoppedDeadProcess()
         $this->assertFalse($process->isRunning());
     }
 
+    public function testEnvCaseInsensitiveOnWindows()
+    {
+        $p = $this->getProcessForCode('print_r([$_SERVER[\'PATH\'] ?? 1, $_SERVER[\'Path\'] ?? 2]);');
+        $p->run(null, ['Path' => 'foo/bar']);
+
+        if ('\\' === \DIRECTORY_SEPARATOR) {
+            $this->assertSame("Array ( [0] => foo/bar [1] => foo/bar )", preg_replace('/\s++/', ' ', trim($p->getOutput())));
+        } else {
+            $this->assertSame("Array ( [0] => {$_SERVER['PATH']} [1] => foo/bar )", preg_replace('/\s++/', ' ', trim($p->getOutput())));
+        }
+    }
+
     /**
      * @param string|array $commandline
      * @param mixed        $input

Original file line number	Diff line number	Diff line change
`@@ -304,10 +304,10 @@ public function start(callable $callback = null, array $env = [])`
`304`	`304`	`$descriptors = $this->getDescriptors();`
`305`	`305`
`306`	`306`	`if ($this->env) {`
`307`		`- $env += $this->env;`
	`307`	`+ $env += '\\' === \DIRECTORY_SEPARATOR ? array_diff_ukey($this->env, $env, 'strcasecmp') : $this->env;`
`308`	`308`	`}`
`309`	`309`
`310`		`- $env += $this->getDefaultEnv();`
	`310`	`+ $env += '\\' === \DIRECTORY_SEPARATOR ? array_diff_ukey($this->getDefaultEnv(), $env, 'strcasecmp') : $this->getDefaultEnv();`
`311`	`311`
`312`	`312`	`if (\is_array($commandline = $this->commandline)) {`
`313`	`313`	`$commandline = implode(' ', array_map([$this, 'escapeArgument'], $commandline));`
`@@ -1659,8 +1659,8 @@ private function replacePlaceholders(string $commandline, array $env)`
`1659`	`1659`	`private function getDefaultEnv(): array`
`1660`	`1660`	`{`
`1661`	`1661`	`$env = getenv();`
`1662`		`- $env = array_intersect_key($env, $_SERVER) ?: $env;`
	`1662`	`+ $env = ('\\' === \DIRECTORY_SEPARATOR ? array_intersect_ukey($env, $_SERVER, 'strcasecmp') : array_intersect_key($env, $_SERVER)) ?: $env;`
`1663`	`1663`
`1664`		`- return $_ENV + $env;`
	`1664`	`+ return $_ENV + ('\\' === \DIRECTORY_SEPARATOR ? array_diff_ukey($env, $_ENV, 'strcasecmp') : $env);`
`1665`	`1665`	`}`
`1666`	`1666`	`}`