Page MenuHomePhabricator

D10568.diff
No OneTemporary

D10568.diff

diff --git a/scripts/arcanist.php b/scripts/arcanist.php
--- a/scripts/arcanist.php
+++ b/scripts/arcanist.php
@@ -46,7 +46,7 @@
'repeat' => true,
'help' =>
'Specify a runtime configuration value. This will take precedence '.
- 'over static values, and only affect the current arcanist invocation.'
+ 'over static values, and only affect the current arcanist invocation.',
),
));
@@ -413,7 +413,7 @@
'text',
"You need to install the cURL PHP extension, maybe with ".
"'apt-get install php5-curl' or 'yum install php53-curl' or ".
- "something similar."),
+ "something similar.",),
'json_decode' => array('flag', '--without-json'),
);
}
diff --git a/src/configuration/ArcanistSettings.php b/src/configuration/ArcanistSettings.php
--- a/src/configuration/ArcanistSettings.php
+++ b/src/configuration/ArcanistSettings.php
@@ -126,7 +126,7 @@
"Path to a custom CA bundle file to be used for arcanist's cURL ".
"calls. This is used primarily when your conduit endpoint is ".
"behind https signed by your organization's internal CA.",
- 'example' => 'support/yourca.pem'
+ 'example' => 'support/yourca.pem',
),
'https.blindly-trust-domains' => array(
'type' => 'list',
diff --git a/src/difference/ArcanistDiffUtils.php b/src/difference/ArcanistDiffUtils.php
--- a/src/difference/ArcanistDiffUtils.php
+++ b/src/difference/ArcanistDiffUtils.php
@@ -52,7 +52,7 @@
if (($o === $n) || !$ol || !$nl) {
return array(
array(array(0, $ol)),
- array(array(0, $nl))
+ array(array(0, $nl)),
);
}
diff --git a/src/hgdaemon/ArcanistHgProxyServer.php b/src/hgdaemon/ArcanistHgProxyServer.php
--- a/src/hgdaemon/ArcanistHgProxyServer.php
+++ b/src/hgdaemon/ArcanistHgProxyServer.php
@@ -177,7 +177,7 @@
array_merge($clients, array($hg)),
array(
'read' => $socket ? array($socket) : array(),
- 'except' => $socket ? array($socket) : array()
+ 'except' => $socket ? array($socket) : array(),
));
if (!$hg->update()) {
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
@@ -432,7 +432,7 @@
'Specify a string (or list of strings) identifying the binary '.
'which should be invoked to execute this linter. This overrides '.
'the default binary. If you provide a list of possible binaries, '.
- 'the first one which exists will be used.')
+ 'the first one which exists will be used.'),
),
'flags' => array(
'type' => 'optional list<string>',
diff --git a/src/lint/linter/ArcanistLesscLinter.php b/src/lint/linter/ArcanistLesscLinter.php
--- a/src/lint/linter/ArcanistLesscLinter.php
+++ b/src/lint/linter/ArcanistLesscLinter.php
@@ -121,7 +121,8 @@
'--lint',
'--no-color',
'--strict-math='.($this->strictMath ? 'on' : 'off'),
- '--strict-units='.($this->strictUnits ? 'on' : 'off'));
+ '--strict-units='.($this->strictUnits ? 'on' : 'off'),
+ );
}
protected function parseLinterOutput($path, $err, $stdout, $stderr) {
diff --git a/src/lint/linter/ArcanistLinter.php b/src/lint/linter/ArcanistLinter.php
--- a/src/lint/linter/ArcanistLinter.php
+++ b/src/lint/linter/ArcanistLinter.php
@@ -351,7 +351,7 @@
'type' => 'optional map<string|int, string>',
'help' => pht(
'Provide a map from lint codes to adjusted severity levels: error, '.
- 'warning, advice, autofix or disabled.')
+ 'warning, advice, autofix or disabled.'),
),
'severity.rules' => array(
'type' => 'optional map<string, string>',
diff --git a/src/lint/linter/ArcanistPuppetLintLinter.php b/src/lint/linter/ArcanistPuppetLintLinter.php
--- a/src/lint/linter/ArcanistPuppetLintLinter.php
+++ b/src/lint/linter/ArcanistPuppetLintLinter.php
@@ -63,7 +63,9 @@
'%{column}',
'%{kind}',
'%{check}',
- '%{message}'))));
+ '%{message}',
+ ))),
+ );
}
public function getLinterConfigurationOptions() {
diff --git a/src/lint/linter/ArcanistXHPASTLinter.php b/src/lint/linter/ArcanistXHPASTLinter.php
--- a/src/lint/linter/ArcanistXHPASTLinter.php
+++ b/src/lint/linter/ArcanistXHPASTLinter.php
@@ -1840,7 +1840,8 @@
$global,
// No advice for globals, but hooks have an option to provide some.
- null);
+ null,
+ );
}
// Exclude access of static properties, since lint will be raised at
diff --git a/src/parser/ArcanistDiffParser.php b/src/parser/ArcanistDiffParser.php
--- a/src/parser/ArcanistDiffParser.php
+++ b/src/parser/ArcanistDiffParser.php
@@ -564,7 +564,7 @@
'rename from (?P<old>.*)',
'(?P<move>rename) to (?P<cur>.*)',
'copy from (?P<old>.*)',
- '(?P<copy>copy) to (?P<cur>.*)'
+ '(?P<copy>copy) to (?P<cur>.*)',
);
$ok = false;
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
@@ -1054,7 +1054,8 @@
$bookmarks[] = array(
'is_active' => $is_active,
'name' => $name,
- 'revision' => $revision);
+ 'revision' => $revision,
+ );
}
}
diff --git a/src/unit/engine/CSharpToolsTestEngine.php b/src/unit/engine/CSharpToolsTestEngine.php
--- a/src/unit/engine/CSharpToolsTestEngine.php
+++ b/src/unit/engine/CSharpToolsTestEngine.php
@@ -133,7 +133,8 @@
return array(
$future,
$assembly_dir.DIRECTORY_SEPARATOR.$xunit_temp,
- $cover_temp);
+ $cover_temp,
+ );
}
/**
@@ -195,7 +196,8 @@
$results[] = array(
'file' => $tag->getAttribute('file'),
'start' => $tag->getAttribute('start'),
- 'end' => $tag->getAttribute('end'));
+ 'end' => $tag->getAttribute('end'),
+ );
}
return $results;
}
diff --git a/src/workflow/ArcanistBackoutWorkflow.php b/src/workflow/ArcanistBackoutWorkflow.php
--- a/src/workflow/ArcanistBackoutWorkflow.php
+++ b/src/workflow/ArcanistBackoutWorkflow.php
@@ -118,7 +118,7 @@
array(
'revision_id' => null,
'edit' => 'create',
- 'fields' => $fields
+ 'fields' => $fields,
));
$template = $this->newInteractiveEditor($template)
->setName('new-commit')
diff --git a/src/workflow/ArcanistCloseWorkflow.php b/src/workflow/ArcanistCloseWorkflow.php
--- a/src/workflow/ArcanistCloseWorkflow.php
+++ b/src/workflow/ArcanistCloseWorkflow.php
@@ -129,7 +129,7 @@
$info = $conduit->callMethodSynchronous(
'maniphest.info',
array(
- 'task_id' => $task_id
+ 'task_id' => $task_id,
));
if ($info['status'] == $status) {
return false;
@@ -139,7 +139,7 @@
array(
'id' => $task_id,
'status' => $status,
- 'comments' => $comment
+ 'comments' => $comment,
));
}
diff --git a/src/workflow/ArcanistCommitWorkflow.php b/src/workflow/ArcanistCommitWorkflow.php
--- a/src/workflow/ArcanistCommitWorkflow.php
+++ b/src/workflow/ArcanistCommitWorkflow.php
@@ -51,14 +51,14 @@
'show' => array(
'help' =>
'Show the command which would be issued, but do not actually '.
- 'commit anything.'
+ 'commit anything.',
),
'revision' => array(
'param' => 'revision_id',
'help' =>
'Commit a specific revision. If you do not specify a revision, '.
'arc will look for committable revisions.',
- )
+ ),
);
}
diff --git a/src/workflow/ArcanistDiffWorkflow.php b/src/workflow/ArcanistDiffWorkflow.php
--- a/src/workflow/ArcanistDiffWorkflow.php
+++ b/src/workflow/ArcanistDiffWorkflow.php
@@ -406,7 +406,7 @@
'lintall' => '--head suppresses lint.',
'advice' => '--head suppresses lint.',
),
- )
+ ),
);
return $arguments;
diff --git a/src/workflow/ArcanistExportWorkflow.php b/src/workflow/ArcanistExportWorkflow.php
--- a/src/workflow/ArcanistExportWorkflow.php
+++ b/src/workflow/ArcanistExportWorkflow.php
@@ -70,13 +70,13 @@
'param' => 'revision_id',
'help' =>
'Instead of exporting changes from the working copy, export them '.
- 'from a Differential revision.'
+ 'from a Differential revision.',
),
'diff' => array(
'param' => 'diff_id',
'help' =>
'Instead of exporting changes from the working copy, export them '.
- 'from a Differential diff.'
+ 'from a Differential diff.',
),
'*' => 'paths',
);
diff --git a/src/workflow/ArcanistLintWorkflow.php b/src/workflow/ArcanistLintWorkflow.php
--- a/src/workflow/ArcanistLintWorkflow.php
+++ b/src/workflow/ArcanistLintWorkflow.php
@@ -95,7 +95,7 @@
"With 'json', show lint warnings in machine-readable JSON format. ".
"With 'none', show no lint warnings. ".
"With 'compiler', show lint warnings in suitable for your editor. ".
- "With 'xml', show lint warnings in the Checkstyle XML format."
+ "With 'xml', show lint warnings in the Checkstyle XML format.",
),
'only-new' => array(
'param' => 'bool',
@@ -105,7 +105,7 @@
'engine' => array(
'param' => 'classname',
'help' =>
- 'Override configured lint engine for this project.'
+ 'Override configured lint engine for this project.',
),
'apply-patches' => array(
'help' =>
@@ -135,7 +135,7 @@
'help' => 'Lint all files in the project.',
'conflicts' => array(
'cache' => '--everything lints all files',
- 'rev' => '--everything lints all files'
+ 'rev' => '--everything lints all files',
),
),
'severity' => array(
diff --git a/src/workflow/ArcanistPatchWorkflow.php b/src/workflow/ArcanistPatchWorkflow.php
--- a/src/workflow/ArcanistPatchWorkflow.php
+++ b/src/workflow/ArcanistPatchWorkflow.php
@@ -499,7 +499,8 @@
} else {
$copies[] = array(
$change->getOldPath(),
- $change->getCurrentPath());
+ $change->getCurrentPath(),
+ );
}
break;
case ArcanistDiffChangeType::TYPE_ADD:
@@ -864,7 +865,7 @@
'differential.query',
array(
'phids' => $phids,
- 'arcanistProjects' => array($bundle->getProjectID())
+ 'arcanistProjects' => array($bundle->getProjectID()),
));
$revs = array();
foreach ($dep_on_revs as $dep_on_rev) {
@@ -876,7 +877,8 @@
$base_args = array(
'--force',
'--skip-dependencies',
- '--nobranch');
+ '--nobranch',
+ );
if (!$this->shouldCommit()) {
$base_args[] = '--nocommit';
}
diff --git a/src/workflow/ArcanistStartWorkflow.php b/src/workflow/ArcanistStartWorkflow.php
--- a/src/workflow/ArcanistStartWorkflow.php
+++ b/src/workflow/ArcanistStartWorkflow.php
@@ -63,7 +63,7 @@
$started_phids[] = $conduit->callMethodSynchronous(
'phrequent.push',
array(
- 'objectPHID' => $object_phid
+ 'objectPHID' => $object_phid,
));
}
diff --git a/src/workflow/ArcanistUnitWorkflow.php b/src/workflow/ArcanistUnitWorkflow.php
--- a/src/workflow/ArcanistUnitWorkflow.php
+++ b/src/workflow/ArcanistUnitWorkflow.php
@@ -52,7 +52,7 @@
'engine' => array(
'param' => 'classname',
'help' =>
- 'Override configured unit engine for this project.'
+ 'Override configured unit engine for this project.',
),
'coverage' => array(
'help' => 'Always enable coverage information.',
@@ -80,7 +80,7 @@
'conflicts' => array(
'json' => 'Only one output format allowed',
'ugly' => 'Only one output format allowed',
- )
+ ),
),
'everything' => array(
'help' => 'Run every test.',

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 17, 4:33 PM (5 d, 15 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7708592
Default Alt Text
D10568.diff (12 KB)

Event Timeline