Page MenuHomePhabricator
Files F14444008

D17376.diff
No OneTemporary
Actions

D17376.diff
View Options

diff --git a/src/lint/ArcanistLintMessage.php b/src/lint/ArcanistLintMessage.php
--- a/src/lint/ArcanistLintMessage.php
+++ b/src/lint/ArcanistLintMessage.php
@@ -40,7 +40,8 @@
$message->setGranularity(idx($dict, 'granularity'));
$message->setOtherLocations(idx($dict, 'locations', array()));
if (isset($dict['bypassChangedLineFiltering'])) {
- $message->bypassChangedLineFiltering($dict['bypassChangedLineFiltering']);
+ $message->setBypassChangedLineFiltering(
+ $dict['bypassChangedLineFiltering']);
}
return $message;
}
diff --git a/src/lint/linter/xhpast/rules/ArcanistPHPCompatibilityXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistPHPCompatibilityXHPASTLinterRule.php
--- a/src/lint/linter/xhpast/rules/ArcanistPHPCompatibilityXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistPHPCompatibilityXHPASTLinterRule.php
@@ -369,7 +369,7 @@
}
}
- $literals = $root->selectDescendantsOftype('n_ARRAY_LITERAL');
+ $literals = $root->selectDescendantsOfType('n_ARRAY_LITERAL');
foreach ($literals as $literal) {
$open_token = head($literal->getTokens())->getValue();
if ($open_token == '[') {
diff --git a/src/repository/api/ArcanistGitAPI.php b/src/repository/api/ArcanistGitAPI.php
--- a/src/repository/api/ArcanistGitAPI.php
+++ b/src/repository/api/ArcanistGitAPI.php
@@ -1405,7 +1405,7 @@
* or cycle locally.
*
* @param string Ref to start from.
- * @return list<wild> Path to an upstream.
+ * @return ArcanistGitUpstreamPath Path to an upstream.
*/
public function getPathToUpstream($start) {
$cursor = $start;
diff --git a/src/repository/api/ArcanistMercurialAPI.php b/src/repository/api/ArcanistMercurialAPI.php
--- a/src/repository/api/ArcanistMercurialAPI.php
+++ b/src/repository/api/ArcanistMercurialAPI.php
@@ -791,7 +791,7 @@
'commit --amend -l %s',
$tmp_file);
} catch (CommandException $ex) {
- if (preg_match('/nothing changed/', $ex->getStdOut())) {
+ if (preg_match('/nothing changed/', $ex->getStdout())) {
// NOTE: Mercurial considers it an error to make a no-op amend. Although
// we generally defer to the underlying VCS to dictate behavior, this
// one seems a little goofy, and we use amend as part of various
diff --git a/src/repository/api/ArcanistRepositoryAPI.php b/src/repository/api/ArcanistRepositoryAPI.php
--- a/src/repository/api/ArcanistRepositoryAPI.php
+++ b/src/repository/api/ArcanistRepositoryAPI.php
@@ -282,7 +282,7 @@
* Hook for implementations to dirty working copy caches after the working
* copy has been updated.
*
- * @return this
+ * @return void
* @task status
*/
protected function didReloadWorkingCopy() {
diff --git a/src/unit/engine/XUnitTestEngine.php b/src/unit/engine/XUnitTestEngine.php
--- a/src/unit/engine/XUnitTestEngine.php
+++ b/src/unit/engine/XUnitTestEngine.php
@@ -255,7 +255,7 @@
throw $exc;
}
$result->setResult(ArcanistUnitTestResult::RESULT_FAIL);
- $result->setUserdata($exc->getStdout());
+ $result->setUserData($exc->getStdout());
}
$result->setDuration(microtime(true) - $regenerate_start);
@@ -301,7 +301,7 @@
throw $exc;
}
$result->setResult(ArcanistUnitTestResult::RESULT_FAIL);
- $result->setUserdata($exc->getStdout());
+ $result->setUserData($exc->getStdout());
$build_failed = true;
}
diff --git a/src/workflow/ArcanistLandWorkflow.php b/src/workflow/ArcanistLandWorkflow.php
--- a/src/workflow/ArcanistLandWorkflow.php
+++ b/src/workflow/ArcanistLandWorkflow.php
@@ -886,7 +886,7 @@
}
} catch (CommandException $ex) {
$err = $ex->getError();
- $stdout = $ex->getStdOut();
+ $stdout = $ex->getStdout();
// Copied from: PhabricatorRepositoryPullLocalDaemon.php
// NOTE: Between versions 2.1 and 2.1.1, Mercurial changed the
diff --git a/src/workflow/ArcanistPatchWorkflow.php b/src/workflow/ArcanistPatchWorkflow.php
--- a/src/workflow/ArcanistPatchWorkflow.php
+++ b/src/workflow/ArcanistPatchWorkflow.php
@@ -710,7 +710,7 @@
}
// in case there were any submodule changes involved
- $repository_api->execpassthru('submodule update --init --recursive');
+ $repository_api->execPassthru('submodule update --init --recursive');
if ($this->shouldCommit()) {
if ($bundle->getFullAuthor()) {
@@ -763,7 +763,7 @@
echo phutil_console_format(
"\n<bg:red>** %s **</bg>\n",
pht('Patch Failed!'));
- $stderr = $ex->getStdErr();
+ $stderr = $ex->getStderr();
if (preg_match('/case-folding collision/', $stderr)) {
echo phutil_console_wrap(
phutil_console_format(
diff --git a/src/workflow/ArcanistWorkflow.php b/src/workflow/ArcanistWorkflow.php
--- a/src/workflow/ArcanistWorkflow.php
+++ b/src/workflow/ArcanistWorkflow.php
@@ -336,7 +336,7 @@
$this->conduitAuthenticated = true;
- return;
+ return $this;
} catch (Exception $ex) {
$conduit->setConduitToken(null);
throw $ex;

File Metadata

Mime Type
text/plain
Expires
Fri, Dec 27, 10:39 AM (3 h, 38 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6931602
Default Alt Text
D17376.diff (5 KB)

Event Timeline

Phabricator · Built by Phacility