Permalink
Browse files

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.
  • Loading branch information...
2 parents a67692d + 5d06a50 commit fc5b082e436161427e29652e3316d7def5f7a64f @fabpot fabpot committed Oct 6, 2012
Showing with 15 additions and 1 deletion.
  1. +15 −1 Process.php
View
@@ -653,7 +653,7 @@ public function setCommandLine($commandline)
/**
* 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 @@ public function getTimeout()
* 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 @@ public function setOptions(array $options)
$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;

0 comments on commit fc5b082

Please sign in to comment.