Merge remote branch 'schniper/patch-2'

fabpot · fabpot · commit 91b1becc7d3b · 2011-05-19T17:39:36.000+02:00
* schniper/patch-2:
  Fix process creation under Win7 Ultimate (app/console assetic:dump ./web): - Set the default $env to NULL, thus inheriting the system's environment settings (array() is no good). - Set bypass_shell to false, otherwise process creation will fail (I don't know if this should happen only on Win7)
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
@@ -46,21 +46,25 @@ class Process
      *
      * @api
      */
-    public function __construct($commandline, $cwd = null, array $env = array(), $stdin = null, $timeout = 60, array $options = array())
+    public function __construct($commandline, $cwd = null, array $env = null, $stdin = null, $timeout = 60, array $options = array())
     {
         if (!function_exists('proc_open')) {
             throw new \RuntimeException('The Process class relies on proc_open, which is not available on your PHP installation.');
         }
 
         $this->commandline = $commandline;
         $this->cwd = null === $cwd ? getcwd() : $cwd;
-        $this->env = array();
-        foreach ($env as $key => $value) {
-            $this->env[(binary) $key] = (binary) $value;
+        if (null !== $env) {
+            $this->env = array();
+            foreach ($env as $key => $value) {
+                $this->env[(binary) $key] = (binary) $value;
+            }
+        } else {
+            $this->env = null;
         }
         $this->stdin = $stdin;
         $this->timeout = $timeout;
-        $this->options = array_merge(array('suppress_errors' => true, 'binary_pipes' => true, 'bypass_shell' => true), $options);
+        $this->options = array_merge(array('suppress_errors' => true, 'binary_pipes' => true, 'bypass_shell' => false), $options);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -46,21 +46,25 @@ class Process`
`46`	`46`	`*`
`47`	`47`	`* @api`
`48`	`48`	`*/`
`49`		`- public function __construct($commandline, $cwd = null, array $env = array(), $stdin = null, $timeout = 60, array $options = array())`
	`49`	`+ public function __construct($commandline, $cwd = null, array $env = null, $stdin = null, $timeout = 60, array $options = array())`
`50`	`50`	`{`
`51`	`51`	`if (!function_exists('proc_open')) {`
`52`	`52`	`throw new \RuntimeException('The Process class relies on proc_open, which is not available on your PHP installation.');`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`$this->commandline = $commandline;`
`56`	`56`	`$this->cwd = null === $cwd ? getcwd() : $cwd;`
`57`		`- $this->env = array();`
`58`		`- foreach ($env as $key => $value) {`
`59`		`- $this->env[(binary) $key] = (binary) $value;`
	`57`	`+ if (null !== $env) {`
	`58`	`+ $this->env = array();`
	`59`	`+ foreach ($env as $key => $value) {`
	`60`	`+ $this->env[(binary) $key] = (binary) $value;`
	`61`	`+ }`
	`62`	`+ } else {`
	`63`	`+ $this->env = null;`
`60`	`64`	`}`
`61`	`65`	`$this->stdin = $stdin;`
`62`	`66`	`$this->timeout = $timeout;`
`63`		`- $this->options = array_merge(array('suppress_errors' => true, 'binary_pipes' => true, 'bypass_shell' => true), $options);`
	`67`	`+ $this->options = array_merge(array('suppress_errors' => true, 'binary_pipes' => true, 'bypass_shell' => false), $options);`
`64`	`68`	`}`
`65`	`69`
`66`	`70`	`/**`