[Process] filter env vars for "argc" & "argv" specifically

nicolas-grekas · nicolas-grekas · commit 11ccbcd24c2e · 2021-11-22T23:36:24.000+01:00
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
@@ -340,7 +340,7 @@ public function start(callable $callback = null, array $env = [])
 
         $envPairs = [];
         foreach ($env as $k => $v) {
-            if (false !== $v) {
+            if (false !== $v && 'argc' !== $k && 'argv' !== $k) {
                 $envPairs[] = $k.'='.$v;
             }
         }
@@ -1171,25 +1171,12 @@ public function getEnv()
     /**
      * Sets the environment variables.
      *
-     * Each environment variable value should be a string.
-     * If it is an array, the variable is ignored.
-     * If it is false or null, it will be removed when
-     * env vars are otherwise inherited.
-     *
-     * That happens in PHP when 'argv' is registered into
-     * the $_ENV array for instance.
-     *
-     * @param array $env The new environment variables
+     * @param array<string|\Stringable> $env The new environment variables
      *
      * @return $this
      */
     public function setEnv(array $env)
     {
-        // Process can not handle env values that are arrays
-        $env = array_filter($env, function ($value) {
-            return !\is_array($value);
-        });
-
         $this->env = $env;
 
         return $this;
@@ -1673,14 +1660,7 @@ private function getDefaultEnv(): array
     {
         $env = getenv();
         $env = array_intersect_key($env, $_SERVER) ?: $env;
-        unset($env['argc'], $env['argv']);
-
-        foreach ($_ENV as $k => $v) {
-            if (\is_string($v)) {
-                $env[$k] = $v;
-            }
-        }
 
-        return $env;
+        return $_ENV + $env;
     }
 }
