Merge branch 'stable'

This commit is contained in:
Dylan K. Taylor
2020-01-11 21:41:38 +00:00
11 changed files with 26 additions and 30 deletions

View File

@@ -492,7 +492,7 @@ class Config{
/**
* @param array $default
* @param array &$data
* @param array $data reference parameter
*
* @return int
*/

View File

@@ -37,7 +37,7 @@ final class Git{
* Returns the git hash of the currently checked out head of the given repository, or null on failure.
*
* @param string $dir
* @param bool &$dirty Output, set to whether the repo has local changes
* @param bool $dirty reference parameter, set to whether the repo has local changes
*
* @return string|null
*/

View File

@@ -138,9 +138,9 @@ class Internet{
* @param string $page
* @param int $timeout default 10
* @param array $extraHeaders
* @param string &$err Will be set to the output of curl_error(). Use this to retrieve errors that occured during the operation.
* @param array[] &$headers
* @param int &$httpCode
* @param string $err reference parameter, will be set to the output of curl_error(). Use this to retrieve errors that occured during the operation.
* @param array[] $headers reference parameter
* @param int $httpCode reference parameter
*
* @return bool|mixed false if an error occurred, mixed data if successful.
*/
@@ -162,9 +162,9 @@ class Internet{
* @param array|string $args
* @param int $timeout
* @param array $extraHeaders
* @param string &$err Will be set to the output of curl_error(). Use this to retrieve errors that occured during the operation.
* @param array[] &$headers
* @param int &$httpCode
* @param string $err reference parameter, will be set to the output of curl_error(). Use this to retrieve errors that occured during the operation.
* @param array[] $headers reference parameter
* @param int $httpCode reference parameter
*
* @return bool|mixed false if an error occurred, mixed data if successful.
*/

View File

@@ -141,8 +141,8 @@ final class Process{
/**
* @param string $command Command to execute
* @param string|null &$stdout Reference parameter to write stdout to
* @param string|null &$stderr Reference parameter to write stderr to
* @param string|null $stdout Reference parameter to write stdout to
* @param string|null $stderr Reference parameter to write stderr to
*
* @return int process exit code
*/