Restore bypass_shell by default with windows compat

Seldaek · Seldaek · commit 54cfd4410cbe · 2012-02-22T14:19:04.000+01:00
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
@@ -116,7 +116,7 @@ public function __construct($commandline, $cwd = null, array $env = null, $stdin
         }
         $this->stdin = $stdin;
         $this->timeout = $timeout;
-        $this->options = array_merge(array('suppress_errors' => true, 'binary_pipes' => true, 'bypass_shell' => false), $options);
+        $this->options = array_merge(array('suppress_errors' => true, 'binary_pipes' => true), $options);
     }
 
     /**
@@ -164,6 +164,9 @@ public function run($callback = null)
 
         if (defined('PHP_WINDOWS_VERSION_BUILD') && $this->enhanceWindowsCompatibility) {
             $commandline = 'cmd /V:ON /E:ON /C "'.$commandline.'"';
+            if (!isset($this->options['bypass_shell'])) {
+                $this->options['bypass_shell'] = true;
+            }
         }
 
         $process = proc_open($commandline, $descriptors, $pipes, $this->cwd, $this->env, $this->options);
diff --git a/src/Symfony/Component/Process/ProcessBuilder.php b/src/Symfony/Component/Process/ProcessBuilder.php
@@ -32,7 +32,7 @@ public function __construct(array $arguments = array())
 
         $this->timeout = 60;
         $this->options = array();
-        $this->inheritEnv = false;
+        $this->inheritEnv = true;
     }
 
     public static function create(array $arguments = array())
@@ -112,7 +112,7 @@ public function getProcess()
 
         $env = null;
         if ($this->inheritEnv) {
-            $env = $_ENV ? $this->env + $_ENV : $this->env;
+            $env = $this->env ? $this->env + $_ENV : null;
         } else {
             $env = $this->env;
         }
diff --git a/tests/Symfony/Tests/Component/Process/ProcessBuilderTest.php b/tests/Symfony/Tests/Component/Process/ProcessBuilderTest.php
@@ -27,7 +27,7 @@ public function shouldInheritEnvironmentVars()
         $pb->add('foo')->inheritEnvironmentVariables();
         $proc = $pb->getProcess();
 
-        $this->assertEquals($expected, $proc->getEnv(), '->inheritEnvironmentVariables() copies $_ENV');
+        $this->assertEquals(null, $proc->getEnv(), '->inheritEnvironmentVariables() copies $_ENV');
 
         $_ENV = $snapshot;
     }
@@ -54,12 +54,12 @@ public function shouldInheritAndOverrideEnvironmentVars()
     /**
      * @test
      */
-    public function shouldNotInheritEnvironmentVarsByDefault()
+    public function shouldInheritEnvironmentVarsByDefault()
     {
         $pb = new ProcessBuilder();
         $proc = $pb->add('foo')->getProcess();
 
-        $this->assertEquals(array(), $proc->getEnv());
+        $this->assertEquals(null, $proc->getEnv());
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ public function __construct($commandline, $cwd = null, array $env = null, $stdin`
`116`	`116`	`}`
`117`	`117`	`$this->stdin = $stdin;`
`118`	`118`	`$this->timeout = $timeout;`
`119`		`- $this->options = array_merge(array('suppress_errors' => true, 'binary_pipes' => true, 'bypass_shell' => false), $options);`
	`119`	`+ $this->options = array_merge(array('suppress_errors' => true, 'binary_pipes' => true), $options);`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`/**`
`@@ -164,6 +164,9 @@ public function run($callback = null)`
`164`	`164`
`165`	`165`	`if (defined('PHP_WINDOWS_VERSION_BUILD') && $this->enhanceWindowsCompatibility) {`
`166`	`166`	`$commandline = 'cmd /V:ON /E:ON /C "'.$commandline.'"';`
	`167`	`+ if (!isset($this->options['bypass_shell'])) {`
	`168`	`+ $this->options['bypass_shell'] = true;`
	`169`	`+ }`
`167`	`170`	`}`
`168`	`171`
`169`	`172`	`$process = proc_open($commandline, $descriptors, $pipes, $this->cwd, $this->env, $this->options);`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function __construct(array $arguments = array())`
`32`	`32`
`33`	`33`	`$this->timeout = 60;`
`34`	`34`	`$this->options = array();`
`35`		`- $this->inheritEnv = false;`
	`35`	`+ $this->inheritEnv = true;`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`public static function create(array $arguments = array())`
`@@ -112,7 +112,7 @@ public function getProcess()`
`112`	`112`
`113`	`113`	`$env = null;`
`114`	`114`	`if ($this->inheritEnv) {`
`115`		`- $env = $_ENV ? $this->env + $_ENV : $this->env;`
	`115`	`+ $env = $this->env ? $this->env + $_ENV : null;`
`116`	`116`	`} else {`
`117`	`117`	`$env = $this->env;`
`118`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public function shouldInheritEnvironmentVars()`
`27`	`27`	`$pb->add('foo')->inheritEnvironmentVariables();`
`28`	`28`	`$proc = $pb->getProcess();`
`29`	`29`
`30`		`- $this->assertEquals($expected, $proc->getEnv(), '->inheritEnvironmentVariables() copies $_ENV');`
	`30`	`+ $this->assertEquals(null, $proc->getEnv(), '->inheritEnvironmentVariables() copies $_ENV');`
`31`	`31`
`32`	`32`	`$_ENV = $snapshot;`
`33`	`33`	`}`
`@@ -54,12 +54,12 @@ public function shouldInheritAndOverrideEnvironmentVars()`
`54`	`54`	`/**`
`55`	`55`	`* @test`
`56`	`56`	`*/`
`57`		`- public function shouldNotInheritEnvironmentVarsByDefault()`
	`57`	`+ public function shouldInheritEnvironmentVarsByDefault()`
`58`	`58`	`{`
`59`	`59`	`$pb = new ProcessBuilder();`
`60`	`60`	`$proc = $pb->add('foo')->getProcess();`
`61`	`61`
`62`		`- $this->assertEquals(array(), $proc->getEnv());`
	`62`	`+ $this->assertEquals(null, $proc->getEnv());`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`/**`