[Process] Fixed incorrectly escaping arguments on Windows when inheritEnvironmentVariables is set to false

maryo · nicolas-grekas · commit 26032ef055ad · 2017-05-22T14:32:03.000+02:00
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
@@ -320,7 +320,7 @@ public function start(callable $callback = null/*, array $env = array()*/)
         }
         if ('\\' === DIRECTORY_SEPARATOR && $this->enhanceWindowsCompatibility) {
             $this->options['bypass_shell'] = true;
-            $commandline = $this->prepareWindowsCommandLine($commandline, $envBackup);
+            $commandline = $this->prepareWindowsCommandLine($commandline, $envBackup, $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');
@@ -1627,7 +1627,7 @@ private function doSignal($signal, $throwException)
         return true;
     }
 
-    private function prepareWindowsCommandLine($cmd, array &$envBackup)
+    private function prepareWindowsCommandLine($cmd, array &$envBackup, array &$env = null)
     {
         $uid = uniqid('', true);
         $varCount = 0;
@@ -1640,7 +1640,7 @@ private function prepareWindowsCommandLine($cmd, array &$envBackup)
                     [^"%!^]*+
                 )++
             )"/x',
-            function ($m) use (&$envBackup, &$varCache, &$varCount, $uid) {
+            function ($m) use (&$envBackup, &$env, &$varCache, &$varCount, $uid) {
                 if (isset($varCache[$m[0]])) {
                     return $varCache[$m[0]];
                 }
@@ -1652,10 +1652,15 @@ function ($m) use (&$envBackup, &$varCache, &$varCount, $uid) {
                 }
 
                 $value = str_replace(array('!LF!', '"^!"', '"^%"', '"^^"', '""'), array("\n", '!', '%', '^', '"'), $value);
-                $value = preg_replace('/(\\\\*)"/', '$1$1\\"', $value);
-
+                $value = '"'.preg_replace('/(\\\\*)"/', '$1$1\\"', $value).'"';
                 $var = $uid.++$varCount;
-                putenv("$var=\"$value\"");
+
+                if (null === $env) {
+                    putenv("$var=$value");
+                } else {
+                    $env[$var] = $value;
+                }
+
                 $envBackup[$var] = false;
 
                 return $varCache[$m[0]] = '!'.$var.'!';
diff --git a/src/Symfony/Component/Process/Tests/ProcessTest.php b/src/Symfony/Component/Process/Tests/ProcessTest.php
@@ -1465,6 +1465,19 @@ public function testEscapeArgument($arg)
         $this->assertSame($arg, $p->getOutput());
     }
 
+    /**
+     * @dataProvider provideEscapeArgument
+     * @group legacy
+     */
+    public function testEscapeArgumentWhenInheritEnvDisabled($arg)
+    {
+        $p = new Process(array(self::$phpBin, '-r', 'echo $argv[1];', $arg), null, array('BAR' => 'BAZ'));
+        $p->inheritEnvironmentVariables(false);
+        $p->run();
+
+        $this->assertSame($arg, $p->getOutput());
+    }
+
     public function provideEscapeArgument()
     {
         yield array('a"b%c%');
