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

Feedback fixes

Browse Source
This commit is contained in:
Jordi Boggiano 2012-02-22 14:38:43 +01:00
parent 54cfd4410c
commit 7444fdf234
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/Process/Process.php
View File

@ -116,7 +116,7 @@ class Process
}
$this->stdin = $stdin;
$this->timeout = $timeout;
$this->options = array_merge(array('suppress_errors' => true, 'binary_pipes' => true), $options);
$this->options = array_replace(array('suppress_errors' => true, 'binary_pipes' => true), $options);
}
/**

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

@ -20,7 +20,7 @@ class ProcessBuilder
{
private $arguments;
private $cwd;
private $env = array();
private $env;
private $stdin;
private $timeout;
private $options;
@ -32,6 +32,7 @@ class ProcessBuilder
$this->timeout = 60;
$this->options = array();
$this->env = array();
$this->inheritEnv = true;
}
@ -110,7 +111,6 @@ class ProcessBuilder
$script .= ' '.implode(' ', array_map('escapeshellarg', $arguments));
}
$env = null;
if ($this->inheritEnv) {
$env = $this->env ? $this->env + $_ENV : null;
} else {