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

[Process] fixed previous merge

Browse Source
This commit is contained in:
Fabien Potencier 2012-10-03 16:02:00 +02:00
parent edf694badc
commit b2dd04df93
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -614,15 +614,11 @@ class Process
public function addOutput($line) public function addOutput($line)
{ {
$this->stdout .= $line; $this->stdout .= $line;
return $this;
} }
public function addErrorOutput($line) public function addErrorOutput($line)
{ {
$this->stderr .= $line; $this->stderr .= $line;
return $this;
} }
public function getCommandLine() public function getCommandLine()
@ -630,6 +626,9 @@ class Process
return $this->commandline; return $this->commandline;
} }
/**
* @return self The current Process instance
*/
public function setCommandLine($commandline) public function setCommandLine($commandline)
{ {
$this->commandline = $commandline; $this->commandline = $commandline;
@ -648,6 +647,8 @@ class Process
* To disable the timeout, set this value to null. * To disable the timeout, set this value to null.
* *
* @param integer|null * @param integer|null
*
* @return self The current Process instance
*/ */
public function setTimeout($timeout) public function setTimeout($timeout)
{ {
@ -673,6 +674,9 @@ class Process
return $this->cwd; return $this->cwd;
} }
/**
* @return self The current Process instance
*/
public function setWorkingDirectory($cwd) public function setWorkingDirectory($cwd)
{ {
$this->cwd = $cwd; $this->cwd = $cwd;
@ -685,6 +689,9 @@ class Process
return $this->env; return $this->env;
} }
/**
* @return self The current Process instance
*/
public function setEnv(array $env) public function setEnv(array $env)
{ {
$this->env = $env; $this->env = $env;
@ -697,6 +704,9 @@ class Process
return $this->stdin; return $this->stdin;
} }
/**
* @return self The current Process instance
*/
public function setStdin($stdin) public function setStdin($stdin)
{ {
$this->stdin = $stdin; $this->stdin = $stdin;
@ -709,6 +719,9 @@ class Process
return $this->options; return $this->options;
} }
/**
* @return self The current Process instance
*/
public function setOptions(array $options) public function setOptions(array $options)
{ {
$this->options = $options; $this->options = $options;
@ -721,11 +734,14 @@ class Process
return $this->enhanceWindowsCompatibility; return $this->enhanceWindowsCompatibility;
} }
/**
* @return self The current Process instance
*/
public function setEnhanceWindowsCompatibility($enhance) public function setEnhanceWindowsCompatibility($enhance)
{ {
$this->enhanceWindowsCompatibility = (Boolean) $enhance; $this->enhanceWindowsCompatibility = (Boolean) $enhance;
return $this;' return $this;
} }
/** /**
@ -746,10 +762,14 @@ class Process
* the --enable-sigchild option * the --enable-sigchild option
* *
* @param Boolean $enhance * @param Boolean $enhance
*
* @return self The current Process instance
*/ */
public function setEnhanceSigchildCompatibility($enhance) public function setEnhanceSigchildCompatibility($enhance)
{ {
$this->enhanceSigchildCompatibility = (Boolean) $enhance; $this->enhanceSigchildCompatibility = (Boolean) $enhance;
return $this;
} }
/** /**