Page MenuHomePhorge
Files F5483997

D26085.1750116810.diff
No OneTemporary
Actions

D26085.1750116810.diff
View Options

diff --git a/src/console/PhutilConsoleServer.php b/src/console/PhutilConsoleServer.php
--- a/src/console/PhutilConsoleServer.php
+++ b/src/console/PhutilConsoleServer.php
@@ -99,7 +99,7 @@
/**
* Set handler called for unknown messages.
*
- * @param callable Signature: (PhutilConsoleMessage $message).
+ * @param callable $callback Signature: (PhutilConsoleMessage $message).
*/
public function setHandler($callback) {
$this->handler = $callback;
diff --git a/src/future/exec/ExecFuture.php b/src/future/exec/ExecFuture.php
--- a/src/future/exec/ExecFuture.php
+++ b/src/future/exec/ExecFuture.php
@@ -188,8 +188,8 @@
* NOTE: If you call @{method:discardBuffers}, all the stdout/stderr data
* will be thrown away and the cursors will be reset.
*
- * @return pair <$stdout, $stderr> pair with new output since the last call
- * to this method.
+ * @return array A pair of <$stdout, $stderr> with new output since the last
+ * call to this method.
* @task interact
*/
public function read() {
@@ -331,9 +331,7 @@
*
* list($stdout, $stderr) = $future->resolvex();
*
- * @param float Optional timeout after which resolution will pause and
- * execution will return to the caller.
- * @return pair <$stdout, $stderr> pair.
+ * @return array A pair of <$stdout, $stderr>.
* @task resolve
*/
public function resolvex() {
@@ -346,8 +344,6 @@
* @{method:resolvex}, but also throws if stderr is nonempty, or stdout is not
* valid JSON. Returns a PHP array, decoded from the JSON command output.
*
- * @param float Optional timeout after which resolution will pause and
- * execution will return to the caller.
* @return array PHP array, decoded from JSON command output.
* @task resolve
*/
@@ -418,6 +414,9 @@
$this->setResult($result);
}
+ /**
+ * @return array A pair of <$stdout, $stderr>.
+ */
private function raiseResultError($result) {
list($err, $stdout, $stderr) = $result;
diff --git a/src/hgdaemon/ArcanistHgProxyClient.php b/src/hgdaemon/ArcanistHgProxyClient.php
--- a/src/hgdaemon/ArcanistHgProxyClient.php
+++ b/src/hgdaemon/ArcanistHgProxyClient.php
@@ -75,7 +75,7 @@
*
* @param list<string> $argv A list of command arguments, like "log", "-l",
* "5".
- * @return array<int, string, string> Tuple of return code, stdout, stderr.
+ * @return array Tuple of return code (integer), stdout, stderr.
*
* @task exec
*/
diff --git a/src/lint/engine/ArcanistLintEngine.php b/src/lint/engine/ArcanistLintEngine.php
--- a/src/lint/engine/ArcanistLintEngine.php
+++ b/src/lint/engine/ArcanistLintEngine.php
@@ -290,9 +290,9 @@
}
/**
- * @param array<string,array<string,array<string>>>
- * $results Array of format <string path, array<string version,
- * list<array message>>>
+ * @param array<string,array<string,array<string>>> $results
+ * Array of format
+ * <string path, array<string version,list<array message>>>
* $results
* @return $this
*/
diff --git a/src/lint/linter/ArcanistExternalLinter.php b/src/lint/linter/ArcanistExternalLinter.php
--- a/src/lint/linter/ArcanistExternalLinter.php
+++ b/src/lint/linter/ArcanistExternalLinter.php
@@ -63,7 +63,7 @@
* this method and return true so execution continues when it exits with
* a nonzero status.
*
- * @param bool Return true to continue on nonzero error code.
+ * @return bool Return true to continue on nonzero error code.
* @task bin
*/
public function shouldExpectCommandErrors() {
diff --git a/src/workflow/ArcanistWorkflow.php b/src/workflow/ArcanistWorkflow.php
--- a/src/workflow/ArcanistWorkflow.php
+++ b/src/workflow/ArcanistWorkflow.php
@@ -662,7 +662,7 @@
* @{method:requireAuthentication} return true, or explicitly by calling
* @{method:establishConduit} or @{method:authenticateConduit}.
*
- * @return @{class@libphutil:ConduitClient} Live conduit client.
+ * @return ConduitClient Live conduit client.
* @task conduit
*/
final public function getConduit() {

File Metadata

Mime Type
text/plain
Expires
Mon, Jun 16, 23:33 (12 h, 44 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1879835
Default Alt Text
D26085.1750116810.diff (4 KB)

Event Timeline

Content licensed under Creative Commons Attribution-ShareAlike 4.0 (CC-BY-SA) unless otherwise noted; code licensed under Apache 2.0 or other open source licenses. · CC BY-SA 4.0 · Apache 2.0