Page MenuHomePhabricator
Files F15393464

D17367.id41761.diff
No OneTemporary
Actions

D17367.id41761.diff
View Options

diff --git a/src/land/ArcanistGitLandEngine.php b/src/land/ArcanistGitLandEngine.php
--- a/src/land/ArcanistGitLandEngine.php
+++ b/src/land/ArcanistGitLandEngine.php
@@ -59,7 +59,7 @@
public function __destruct() {
if ($this->restoreWhenDestroyed) {
- $this->writeWARN(
+ $this->writeWarn(
pht('INTERRUPTED!'),
pht('Restoring working copy to its original state.'));
diff --git a/src/lint/linter/ArcanistBaseXHPASTLinter.php b/src/lint/linter/ArcanistBaseXHPASTLinter.php
--- a/src/lint/linter/ArcanistBaseXHPASTLinter.php
+++ b/src/lint/linter/ArcanistBaseXHPASTLinter.php
@@ -189,7 +189,7 @@
* Get a path's parse exception from the responsible linter.
*
* @param string Path to retrieve exception for.
- * @return Exeption|null Parse exception, if available.
+ * @return Exception|null Parse exception, if available.
* @task sharing
*/
final protected function getXHPASTExceptionForPath($path) {
diff --git a/src/lint/linter/__tests__/ArcanistClosureLinterTestCase.php b/src/lint/linter/__tests__/ArcanistClosureLinterTestCase.php
--- a/src/lint/linter/__tests__/ArcanistClosureLinterTestCase.php
+++ b/src/lint/linter/__tests__/ArcanistClosureLinterTestCase.php
@@ -3,11 +3,14 @@
final class ArcanistClosureLinterTestCase
extends ArcanistExternalLinterTestCase {
- public function testLinter() {
+ protected function getLinter() {
$linter = new ArcanistClosureLinter();
$linter->setFlags(array('--additional_extensions=lint-test'));
+ return $linter;
+ }
- $this->executeTestsInDirectory(dirname(__FILE__).'/gjslint/', $linter);
+ public function testLinter() {
+ $this->executeTestsInDirectory(dirname(__FILE__).'/gjslint/');
}
}
diff --git a/src/unit/parser/__tests__/XUnitTestResultParserTestCase.php b/src/unit/parser/__tests__/XUnitTestResultParserTestCase.php
--- a/src/unit/parser/__tests__/XUnitTestResultParserTestCase.php
+++ b/src/unit/parser/__tests__/XUnitTestResultParserTestCase.php
@@ -28,7 +28,7 @@
$parsed_results = id(new ArcanistXUnitTestResultParser())
->parseTestResults('');
- $this->failTest(pht('Should throw on empty input'));
+ $this->assertFailure(pht('Should throw on empty input'));
} catch (Exception $e) {
// OK
}
@@ -43,7 +43,7 @@
$parsed_results = id(new ArcanistXUnitTestResultParser())
->parseTestResults($stubbed_results);
- $this->failTest(pht('Should throw on non-xml input'));
+ $this->assertFailure(pht('Should throw on non-xml input'));
} catch (Exception $e) {
// OK
}
diff --git a/src/workflow/ArcanistLandWorkflow.php b/src/workflow/ArcanistLandWorkflow.php
--- a/src/workflow/ArcanistLandWorkflow.php
+++ b/src/workflow/ArcanistLandWorkflow.php
@@ -514,9 +514,7 @@
$this->branch = head($branch);
$this->keepBranch = $this->getArgument('keep-branch');
- $update_strategy = $this->getConfigFromAnySource(
- 'arc.land.update.default',
- 'merge');
+ $update_strategy = $this->getConfigFromAnySource('arc.land.update.default');
$this->shouldUpdateWithRebase = $update_strategy == 'rebase';
if ($this->getArgument('update-with-rebase')) {
$this->shouldUpdateWithRebase = true;
diff --git a/src/workflow/ArcanistLintWorkflow.php b/src/workflow/ArcanistLintWorkflow.php
--- a/src/workflow/ArcanistLintWorkflow.php
+++ b/src/workflow/ArcanistLintWorkflow.php
@@ -227,7 +227,7 @@
}
if ($everything) {
- $paths = iterator_to_array($this->getRepositoryApi()->getAllFiles());
+ $paths = iterator_to_array($this->getRepositoryAPI()->getAllFiles());
$this->shouldLintAll = true;
} else {
$paths = $this->selectPathsForWorkflow($paths, $rev);
diff --git a/src/workflow/ArcanistStartWorkflow.php b/src/workflow/ArcanistStartWorkflow.php
--- a/src/workflow/ArcanistStartWorkflow.php
+++ b/src/workflow/ArcanistStartWorkflow.php
@@ -76,7 +76,7 @@
"%s: %s\n\n",
pht('Started'),
implode(', ', ipull($phid_query, 'fullName')));
- $this->printCurrentTracking(true);
+ $this->printCurrentTracking();
}
}
diff --git a/src/workflow/ArcanistStopWorkflow.php b/src/workflow/ArcanistStopWorkflow.php
--- a/src/workflow/ArcanistStopWorkflow.php
+++ b/src/workflow/ArcanistStopWorkflow.php
@@ -105,7 +105,7 @@
"%s %s\n\n",
pht('Stopped:'),
implode(', ', ipull($phid_query, 'fullName')));
- $this->printCurrentTracking(true);
+ $this->printCurrentTracking();
}
}
diff --git a/src/workflow/ArcanistTasksWorkflow.php b/src/workflow/ArcanistTasksWorkflow.php
--- a/src/workflow/ArcanistTasksWorkflow.php
+++ b/src/workflow/ArcanistTasksWorkflow.php
@@ -81,7 +81,7 @@
$unassigned = $this->getArgument('unassigned');
if ($owner) {
- $owner_phid = $this->findOwnerPhid($owner);
+ $owner_phid = $this->findOwnerPHID($owner);
} else if ($unassigned) {
$owner_phid = null;
} else {
diff --git a/src/workflow/ArcanistUnitWorkflow.php b/src/workflow/ArcanistUnitWorkflow.php
--- a/src/workflow/ArcanistUnitWorkflow.php
+++ b/src/workflow/ArcanistUnitWorkflow.php
@@ -140,7 +140,7 @@
}
if ($everything) {
- $paths = iterator_to_array($this->getRepositoryApi()->getAllFiles());
+ $paths = iterator_to_array($this->getRepositoryAPI()->getAllFiles());
} else {
$paths = $this->selectPathsForWorkflow($paths, $rev);
}
diff --git a/src/workflow/ArcanistWorkflow.php b/src/workflow/ArcanistWorkflow.php
--- a/src/workflow/ArcanistWorkflow.php
+++ b/src/workflow/ArcanistWorkflow.php
@@ -1008,9 +1008,7 @@
}
$should_commit = true;
} else {
- $permit_autostash = $this->getConfigFromAnySource(
- 'arc.autostash',
- false);
+ $permit_autostash = $this->getConfigFromAnySource('arc.autostash');
if ($permit_autostash && $api->canStashChanges()) {
echo pht(
'Stashing uncommitted changes. (You can restore them with `%s`).',

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 16, 9:00 PM (1 w, 1 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7465481
Default Alt Text
D17367.id41761.diff (5 KB)

Event Timeline

Phabricator · Built by Phacility