Merge branch '2.0' into 2.1

fabpot · fabpot · commit 6fb7904ba0a3 · 2013-02-18T22:27:57.000+01:00
* 2.0: [Process] Fix regression introduced in #6620 / 880da01, fixes #7082
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
@@ -128,6 +128,10 @@ public function __construct($commandline, $cwd = null, array $env = null, $stdin
 
         $this->commandline = $commandline;
         $this->cwd = $cwd;
+        // on windows, if the cwd changed via chdir(), proc_open defaults to the dir where php was started
+        if (null === $this->cwd && defined('PHP_WINDOWS_VERSION_BUILD')) {
+            $this->cwd = getcwd();
+        }
         if (null !== $env) {
             $this->env = array();
             foreach ($env as $key => $value) {
