diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

always manually inherit $_SERVER

Browse Source 
The $_ENV superglobal is not populated if E is not present in the variables_order directive. Since populating this variable is not recommended (for performance reasons), we should not rely on it.

This change updates the builder so $env=null is never passed to proc_open(). Instead we always merge the $_SERVER superglobal into any environment variables that were manually set on the builder (unless inherit has been disabled).
This commit is contained in:
Christian 2013-08-11 21:20:34 +02:00 committed by Fabien Potencier
parent a0a1c314e4
commit 2baa2c610e
2 changed files with 18 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Symfony/Component/Process/ProcessBuilder.php
View File

@ -164,7 +164,8 @@ class ProcessBuilder
$script = implode(' ', array_map(array(__NAMESPACE__.'\\ProcessUtils', 'escapeArgument'), $arguments)); $script = implode(' ', array_map(array(__NAMESPACE__.'\\ProcessUtils', 'escapeArgument'), $arguments));
if ($this->inheritEnv) { if ($this->inheritEnv) {
$env = $this->env ? $this->env + $_ENV : null; // include $_ENV for BC purposes
$env = array_replace($_ENV, $_SERVER, $this->env);
} else { } else {
$env = $this->env; $env = $this->env;
} }

74
src/Symfony/Component/Process/Tests/ProcessBuilderTest.php
View File

@ -17,75 +17,33 @@ class ProcessBuilderTest extends \PHPUnit_Framework_TestCase
{ {
public function testInheritEnvironmentVars() public function testInheritEnvironmentVars()
{ {
$snapshot = $_ENV; $_ENV['MY_VAR_1'] = 'foo';
$_ENV = $expected = array('foo' => 'bar');
$pb = new ProcessBuilder(); $proc = ProcessBuilder::create()
$pb->add('foo')->inheritEnvironmentVariables(); ->add('foo')
$proc = $pb->getProcess(); ->getProcess();
$this->assertNull($proc->getEnv(), '->inheritEnvironmentVariables() copies $_ENV'); unset($_ENV['MY_VAR_1']);
$_ENV = $snapshot; $env = $proc->getEnv();
$this->assertArrayHasKey('MY_VAR_1', $env);
$this->assertEquals('foo', $env['MY_VAR_1']);
} }
public function testProcessShouldInheritAndOverrideEnvironmentVars() public function testProcessShouldInheritAndOverrideEnvironmentVars()
{ {
$snapshot = $_ENV; $_ENV['MY_VAR_1'] = 'foo';
$_ENV = array('foo' => 'bar', 'bar' => 'baz');
$expected = array('foo' => 'foo', 'bar' => 'baz');
$pb = new ProcessBuilder(); $proc = ProcessBuilder::create()
$pb->add('foo')->inheritEnvironmentVariables() ->setEnv('MY_VAR_1', 'bar')
->setEnv('foo', 'foo');
$proc = $pb->getProcess();
$this->assertEquals($expected, $proc->getEnv(), '->inheritEnvironmentVariables() copies $_ENV');
$_ENV = $snapshot;
}
public function testProcessBuilderShouldNotPassEnvArrays()
{
$snapshot = $_ENV;
$_ENV = array('a' => array('b', 'c'), 'd' => 'e', 'f' => 'g');
$expected = array('d' => 'e', 'f' => 'g');
$pb = new ProcessBuilder();
$pb->add('a')->inheritEnvironmentVariables()
->setEnv('d', 'e');
$proc = $pb->getProcess();
$this->assertEquals($expected, $proc->getEnv(), '->inheritEnvironmentVariables() removes array values from $_ENV');
$_ENV = $snapshot;
}
public function testInheritEnvironmentVarsByDefault()
{
$pb = new ProcessBuilder();
$proc = $pb->add('foo')->getProcess();
$this->assertNull($proc->getEnv());
}
public function testNotReplaceExplicitlySetVars()
{
$snapshot = $_ENV;
$_ENV = array('foo' => 'bar');
$expected = array('foo' => 'baz');
$pb = new ProcessBuilder();
$pb
->setEnv('foo', 'baz')
->inheritEnvironmentVariables()
->add('foo') ->add('foo')
; ->getProcess();
$proc = $pb->getProcess();
$this->assertEquals($expected, $proc->getEnv(), '->inheritEnvironmentVariables() copies $_ENV'); unset($_ENV['MY_VAR_1']);
$_ENV = $snapshot; $env = $proc->getEnv();
$this->assertArrayHasKey('MY_VAR_1', $env);
$this->assertEquals('bar', $env['MY_VAR_1']);
} }
/** /**