merged branch xrstf/2.1 (PR #5687)
This PR was merged into the 2.1 branch.
Commits
-------
65cf3a0
added doc comments
Discussion
----------
added doc comments
---------------------------------------------------------------------------
by stof at 2012-10-06T11:27:23Z
closing in favor of #5686 which targets 2.0
---------------------------------------------------------------------------
by fabpot at 2012-10-06T12:38:17Z
This one cannot be closed as it contains more phpdocs than in the 2.0 branch.
This commit is contained in:
commit
f152170899
@ -653,7 +653,7 @@ class Process
|
||||
/**
|
||||
* Gets the process timeout.
|
||||
*
|
||||
* @return integer The timeout in seconds
|
||||
* @return integer|null The timeout in seconds or null if it's disabled
|
||||
*/
|
||||
public function getTimeout()
|
||||
{
|
||||
@ -666,6 +666,8 @@ class Process
|
||||
* To disable the timeout, set this value to null.
|
||||
*
|
||||
* @param integer|null $timeout The timeout in seconds
|
||||
*
|
||||
* @throws \InvalidArgumentException if the timeout is negative
|
||||
*/
|
||||
public function setTimeout($timeout)
|
||||
{
|
||||
@ -764,11 +766,23 @@ class Process
|
||||
$this->options = $options;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets whether or not Windows compatibility is enabled
|
||||
*
|
||||
* This is true by default.
|
||||
*
|
||||
* @return Boolean
|
||||
*/
|
||||
public function getEnhanceWindowsCompatibility()
|
||||
{
|
||||
return $this->enhanceWindowsCompatibility;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets whether or not Windows compatibility is enabled
|
||||
*
|
||||
* @param Boolean $enhance
|
||||
*/
|
||||
public function setEnhanceWindowsCompatibility($enhance)
|
||||
{
|
||||
$this->enhanceWindowsCompatibility = (Boolean) $enhance;
|
||||
|
Reference in New Issue
Block a user