Feedback fixes
This commit is contained in:
parent
54cfd4410c
commit
7444fdf234
@ -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);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -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 {
|
||||
|
Reference in New Issue
Block a user