1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-25 08:12:40 +01:00

Applied various linter fixes.

Summary: Applied some more linter fixes that I previously missed because my global `arc` install was out-of-date.

Test Plan: Will run `arc unit` on another host.

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: epriestley, Korvin

Differential Revision: https://secure.phabricator.com/D9443
This commit is contained in:
Joshua Spence 2014-06-09 16:03:58 -07:00 committed by epriestley
parent 7f1c07973d
commit d0128afa29
44 changed files with 83 additions and 86 deletions

View file

@ -41,7 +41,7 @@ foreach ($rules as $rule) {
$rule->getRuleType(),
$rule->getID());
echo "Setting rule '" . $rule->getName() . "' to personal. ";
echo "Setting rule '".$rule->getName()."' to personal. ";
}
}
}

View file

@ -22,5 +22,5 @@ if (!$controller && substr($path, -1) !== '/') {
list($controller) = $application->buildControllerForPath($path.'/');
}
if ($controller) {
echo get_class($controller) . "\n";
echo get_class($controller)."\n";
}

View file

@ -110,7 +110,7 @@ function print_symbol($file, $line_num, $type, $token, $context, $language) {
if ($file[0] == '.' || $file[0] == '..') {
array_shift($file);
}
$file = '/' . implode('/', $file);
$file = '/'.implode('/', $file);
$parts = array(
$context,

View file

@ -231,19 +231,19 @@ final class AphrontRequest {
if (PhabricatorEnv::getEnvConfig('phabricator.developer-mode')) {
// TODO: Clean this up, see T1921.
$more_info[] =
"To avoid this error, use phabricator_form() to construct forms. " .
"If you are already using phabricator_form(), make sure the form " .
"'action' uses a relative URI (i.e., begins with a '/'). Forms " .
"using absolute URIs do not include CSRF tokens, to prevent " .
"leaking tokens to external sites.\n\n" .
"If this page performs writes which do not require CSRF " .
"protection (usually, filling caches or logging), you can use " .
"AphrontWriteGuard::beginScopedUnguardedWrites() to temporarily " .
"bypass CSRF protection while writing. You should use this only " .
"for writes which can not be protected with normal CSRF " .
"mechanisms.\n\n" .
"Some UI elements (like PhabricatorActionListView) also have " .
"methods which will allow you to render links as forms (like " .
"To avoid this error, use phabricator_form() to construct forms. ".
"If you are already using phabricator_form(), make sure the form ".
"'action' uses a relative URI (i.e., begins with a '/'). Forms ".
"using absolute URIs do not include CSRF tokens, to prevent ".
"leaking tokens to external sites.\n\n".
"If this page performs writes which do not require CSRF ".
"protection (usually, filling caches or logging), you can use ".
"AphrontWriteGuard::beginScopedUnguardedWrites() to temporarily ".
"bypass CSRF protection while writing. You should use this only ".
"for writes which can not be protected with normal CSRF ".
"mechanisms.\n\n".
"Some UI elements (like PhabricatorActionListView) also have ".
"methods which will allow you to render links as forms (like ".
"setRenderAsForm(true)).";
}

View file

@ -261,7 +261,7 @@ final class PhabricatorAuditCommentEditor extends PhabricatorEditor {
->setAuditorPHID($auditor_phid)
->setAuditStatus($audit_requested)
->setAuditReasons(
array('Added by ' . $actor->getUsername()))
array('Added by '.$actor->getUsername()))
->save();
}
}
@ -274,7 +274,7 @@ final class PhabricatorAuditCommentEditor extends PhabricatorEditor {
->setAuditorPHID($cc_phid)
->setAuditStatus($audit_cc)
->setAuditReasons(
array('Added by ' . $actor->getUsername()))
array('Added by '.$actor->getUsername()))
->save();
}
}

View file

@ -81,7 +81,7 @@ abstract class PhabricatorAuthProviderOAuth extends PhabricatorAuthProvider {
public function getConfigurationHelp() {
$help = $this->getProviderConfigurationHelp();
return $help . "\n\n" .
return $help."\n\n".
pht('Use the **OAuth App Notes** field to record details about which '.
'account the external application is registered under.');
}

View file

@ -152,7 +152,7 @@ final class PhabricatorChatLogChannelLogController
array(
'href' => $first_uri,
),
"\xC2\xAB ". pht('Newest'));
"\xC2\xAB ".pht('Newest'));
}
$prev_uri = $pager->getPrevPageURI();
@ -162,7 +162,7 @@ final class PhabricatorChatLogChannelLogController
array(
'href' => $prev_uri,
),
"\xE2\x80\xB9 " . pht('Newer'));
"\xE2\x80\xB9 ".pht('Newer'));
}
$next_uri = $pager->getNextPageURI();
@ -172,7 +172,7 @@ final class PhabricatorChatLogChannelLogController
array(
'href' => $next_uri,
),
pht('Older') . " \xE2\x80\xBA");
pht('Older')." \xE2\x80\xBA");
}
$pager_top = phutil_tag(
@ -224,7 +224,7 @@ final class PhabricatorChatLogChannelLogController
array(
'href' => '#latest'
),
pht('Jump to Bottom') . " \xE2\x96\xBE");
pht('Jump to Bottom')." \xE2\x96\xBE");
$jump = phutil_tag(
'div',

View file

@ -27,8 +27,8 @@ final class ConduitCall {
$this->handler->defineParamTypes());
if ($invalid_params) {
throw new ConduitException(
"Method '{$method}' doesn't define these parameters: '" .
implode("', '", array_keys($invalid_params)) . "'.");
"Method '{$method}' doesn't define these parameters: '".
implode("', '", array_keys($invalid_params))."'.");
}
if ($this->servers) {

View file

@ -34,7 +34,7 @@ final class PhabricatorConfigIgnoreController
'This issue will no longer be suppressed, and will return to its '.
'rightful place as a global setup warning.');
} else {
throw new Exception('Unrecognized verb: ' . $this->verb);
throw new Exception('Unrecognized verb: '.$this->verb);
}
$dialog = id(new AphrontDialogView())

View file

@ -274,8 +274,8 @@ final class ConpherenceWidgetController extends
phabricator_format_local_time(
$status->getDateFrom(),
$user,
$time_str) .
' - ' .
$time_str).
' - '.
phabricator_format_local_time(
$status->getDateTo(),
$user,

View file

@ -59,7 +59,7 @@ final class ConpherenceLayoutView extends AphrontView {
$selected_id = null;
$selected_thread_id = null;
if ($this->thread) {
$selected_id = $this->thread->getPHID() . '-nav-item';
$selected_id = $this->thread->getPHID().'-nav-item';
$selected_thread_id = $this->thread->getID();
}
$this->initBehavior('conpherence-menu',
@ -77,7 +77,7 @@ final class ConpherenceLayoutView extends AphrontView {
$this->initBehavior(
'conpherence-widget-pane',
array(
'widgetBaseUpdateURI' => $this->baseURI . 'update/',
'widgetBaseUpdateURI' => $this->baseURI.'update/',
'widgetRegistry' => array(
'conpherence-message-pane' => array(
'name' => pht('Thread'),

View file

@ -70,7 +70,7 @@ final class PhabricatorDashboardViewController
'yet. Use %s to add panels.',
phutil_tag(
'a',
array('href'=>$manage_uri),
array('href' => $manage_uri),
pht('Manage Dashboard'))));
}

View file

@ -17,7 +17,7 @@ final class DifferentialGetWorkingCopy {
$origin_path = $repo->getLocalPath();
$path = rtrim($origin_path, '/');
$path = $path . '__workspace';
$path = $path.'__workspace';
if (!Filesystem::pathExists($path)) {
$repo->execxLocalCommand(
@ -53,7 +53,7 @@ final class DifferentialGetWorkingCopy {
$origin_path = $repo->getLocalPath();
$path = rtrim($origin_path, '/');
$path = $path . '__workspace';
$path = $path.'__workspace';
if (!Filesystem::pathExists($path)) {
$repo->execxLocalCommand(

View file

@ -1322,7 +1322,7 @@ final class DifferentialTransactionEditor
$result[] = "{$file}:{$range} {$inline_content}";
} else {
$result[] = '================';
$result[] = 'Comment at: ' . $file . ':' . $range;
$result[] = 'Comment at: '.$file.':'.$range;
$result[] = $hunk_parser->makeContextDiff(
$changeset->getHunks(),
$comment->getIsNewFile(),

View file

@ -53,8 +53,8 @@ final class DifferentialLandingToHostedGit
$missing_binary =
"\nindex "
. "0000000000000000000000000000000000000000.."
. "0000000000000000000000000000000000000000\n";
."0000000000000000000000000000000000000000.."
."0000000000000000000000000000000000000000\n";
if (strpos($raw_diff, $missing_binary) !== false) {
throw new Exception('Patch is missing content for a binary file');
}
@ -85,7 +85,7 @@ final class DifferentialLandingToHostedGit
$author_date = $revision->getDateCreated();
$workspace->execxLocal(
'-c user.name=%s -c user.email=%s ' .
'-c user.name=%s -c user.email=%s '.
'commit --date=%s --author=%s '.
'--message=%s',
// -c will set the 'committer'

View file

@ -105,11 +105,11 @@ class DifferentialReplyHandler extends PhabricatorMailReplyHandler {
// unrecognized commands will be parsed as part of the comment.
$command = DifferentialAction::ACTION_COMMENT;
$supported_commands = $this->getSupportedCommands();
$regex = "/\A\n*!(" . implode('|', $supported_commands) . ")\n*/";
$regex = "/\A\n*!(".implode('|', $supported_commands).")\n*/";
$matches = array();
if (preg_match($regex, $body, $matches)) {
$command = $matches[1];
$body = trim(str_replace('!' . $command, '', $body));
$body = trim(str_replace('!'.$command, '', $body));
}
$actor = $this->getActor();

View file

@ -638,12 +638,12 @@ final class DifferentialHunkParser {
if ($hunk_offset['-'] !== null || $hunk_offset['+'] !== null) {
$header = '@@';
if ($hunk_offset['-'] !== null) {
$header .= ' -' . ($hunk->getOldOffset() + $hunk_offset['-']) .
',' . ($hunk_last['-'] - $hunk_offset['-'] + 1);
$header .= ' -'.($hunk->getOldOffset() + $hunk_offset['-']).
','.($hunk_last['-'] - $hunk_offset['-'] + 1);
}
if ($hunk_offset['+'] !== null) {
$header .= ' +' . ($hunk->getNewOffset() + $hunk_offset['+']) .
',' . ($hunk_last['+'] - $hunk_offset['+'] + 1);
$header .= ' +'.($hunk->getNewOffset() + $hunk_offset['+']).
','.($hunk_last['+'] - $hunk_offset['+'] + 1);
}
$header .= ' @@';
$context[] = $header;

View file

@ -8,4 +8,3 @@ index a1f7255..b5fb7b8 100644
fig
-grape
honeydew

View file

@ -9,4 +9,3 @@ index a1f7255..fa84742 100644
+guava
+gooseberry
honeydew

View file

@ -15,4 +15,3 @@ index bf66874..071dd49 100644
banana
grape
-honeydew

View file

@ -75,7 +75,7 @@ final class DifferentialInlineCommentView extends AphrontView {
$sigil = 'differential-inline-comment';
if ($this->preview) {
$sigil = $sigil . ' differential-inline-comment-preview';
$sigil = $sigil.' differential-inline-comment-preview';
}
$content = $inline->getContent();

View file

@ -78,7 +78,7 @@ final class DiffusionSubversionWireProtocolTestCase
'value' => 'duck',
),
array(
'type'=> 'string',
'type' => 'string',
'value' => 'quack',
),
),

View file

@ -691,8 +691,8 @@ abstract class DiffusionRequest {
$host = php_uname('n');
$callsign = $this->getRepository()->getCallsign();
throw new DiffusionSetupException(
"The clone of this repository ('{$callsign}') on the local machine " .
"('{$host}') could not be read. Ensure that the repository is in a " .
"The clone of this repository ('{$callsign}') on the local machine ".
"('{$host}') could not be read. Ensure that the repository is in a ".
"location where the web server has read permissions.");
}

View file

@ -120,7 +120,7 @@ abstract class DiffusionView extends AphrontView {
$callsign = $repository->getCallsign();
if (strlen($summary)) {
$commit_name .= ': ' . $summary;
$commit_name .= ': '.$summary;
}
return phutil_tag(

View file

@ -44,7 +44,7 @@ final class ConduitAPI_feed_query_Method
return array(
'ERR-UNKNOWN-TYPE' =>
'Unsupported view type, possibles are: ' . $view_types
'Unsupported view type, possibles are: '.$view_types
);
}

View file

@ -483,7 +483,7 @@ abstract class HeraldAdapter {
// We add the 'S' flag because we use the regexp multiple times.
// It shouldn't cause any troubles if the flag is already there
// - /.*/S is evaluated same as /.*/SS.
$result = @preg_match($condition_value . 'S', $value);
$result = @preg_match($condition_value.'S', $value);
if ($result === false) {
throw new HeraldInvalidConditionException(
'Regular expression is not valid!');

View file

@ -643,7 +643,7 @@ final class HeraldRuleController extends HeraldController {
foreach ($all_rules as $current_rule) {
if ($current_rule->getIsDisabled()) {
$current_rule->makeEphemeral();
$current_rule->setName($rule->getName(). ' '.pht('(Disabled)'));
$current_rule->setName($rule->getName().' '.pht('(Disabled)'));
}
}

View file

@ -54,7 +54,7 @@ final class PhabricatorApplicationUninstallController
if ($selected->canUninstall()) {
$dialog->setTitle('Confirmation')
->appendChild(
'Install '. $selected->getName(). ' application?')
'Install '.$selected->getName().' application?')
->addSubmitButton('Install');
} else {
@ -65,7 +65,7 @@ final class PhabricatorApplicationUninstallController
if ($selected->canUninstall()) {
$dialog->setTitle('Confirmation')
->appendChild(
'Really Uninstall '. $selected->getName(). ' application?')
'Really Uninstall '.$selected->getName().' application?')
->addSubmitButton('Uninstall');
} else {
$dialog->setTitle('Information')

View file

@ -49,7 +49,7 @@ EOEMAIL;
$bodies = $this->getEmailBodies();
$with_commands = array();
foreach ($bodies as $body) {
$with_commands[] = "!whatevs dude\n" . $body;
$with_commands[] = "!whatevs dude\n".$body;
}
return $with_commands;
}
@ -58,7 +58,7 @@ EOEMAIL;
$bodies = $this->getEmailBodies();
$with_commands = array();
foreach ($bodies as $body) {
$with_commands[] = "!whatevs\n" . $body;
$with_commands[] = "!whatevs\n".$body;
}
return $with_commands;
}

View file

@ -239,7 +239,7 @@ abstract class PhabricatorMailReplyHandler {
$single_handle_prefix = PhabricatorEnv::getEnvConfig(
'metamta.single-reply-handler-prefix');
return ($single_handle_prefix)
? $single_handle_prefix . '+' . $address
? $single_handle_prefix.'+'.$address
: $address;
}

View file

@ -7,9 +7,9 @@ final class ConduitAPI_owners_query_Method
extends ConduitAPI_owners_Method {
public function getMethodDescription() {
return 'Query for packages by one of the following: repository/path, ' .
'packages with a given user or project owner, or packages affiliated ' .
'with a user (owned by either the user or a project they are a member ' .
return 'Query for packages by one of the following: repository/path, '.
'packages with a given user or project owner, or packages affiliated '.
'with a user (owned by either the user or a project they are a member '.
'of.) You should only provide at most one search query.';
}
@ -31,7 +31,7 @@ final class ConduitAPI_owners_query_Method
public function defineErrorTypes() {
return array(
'ERR-INVALID-USAGE' =>
'Provide one of a single owner phid (user/project), a single ' .
'Provide one of a single owner phid (user/project), a single '.
'affiliated user phid (user), or a repository/path.',
'ERR-INVALID-PARAMETER' => 'parameter should be a phid',
'ERR_REP_NOT_FOUND' => 'The repository callsign is not recognized',

View file

@ -44,7 +44,7 @@ abstract class PackageMail extends PhabricatorMail {
$handles = $this->getHandles();
$section = array();
$section[] = ' In repository '.$handles[$repository_phid]->getName().
' - '. PhabricatorEnv::getProductionURI($handles[$repository_phid]
' - '.PhabricatorEnv::getProductionURI($handles[$repository_phid]
->getURI());
foreach ($paths as $path => $excluded) {
$section[] = ' '.($excluded ? 'Excluded' : 'Included').' '.$path;

View file

@ -81,9 +81,9 @@ final class PackageModifyMail extends PackageMail {
$section = array();
$section[] = 'PRIMARY OWNER CHANGE';
$section[] = ' Old owner: ' .
$section[] = ' Old owner: '.
$handles[$old_primary_owner_phid]->getName();
$section[] = ' New owner: ' .
$section[] = ' New owner: '.
$handles[$primary_owner_phid]->getName();
return implode("\n", $section);

View file

@ -20,9 +20,9 @@ final class PhabricatorOwnerPathQuery {
$result = array();
foreach ($paths as $path) {
$basic_path = '/' . $path->getPath();
$basic_path = '/'.$path->getPath();
if ($path->getFileType() == DifferentialChangeType::FILE_DIRECTORY) {
$basic_path = rtrim($basic_path, '/') . '/';
$basic_path = rtrim($basic_path, '/').'/';
}
$result[] = $basic_path;
}

View file

@ -41,9 +41,9 @@ final class PholioMockSearchEngine
->execute();
$statuses = array(
''=>pht('Any Status'),
'closed'=>pht('Closed'),
'open'=>pht('Open'));
'' => pht('Any Status'),
'closed' => pht('Closed'),
'open' => pht('Open'));
$status = $saved_query->getParameter('statuses', array());
$status = head($status);

View file

@ -23,7 +23,7 @@ final class PhrequentTrackController
if (!$this->isStartingTracking() &&
!$this->isStoppingTracking()) {
throw new Exception('Unrecognized verb: ' . $this->verb);
throw new Exception('Unrecognized verb: '.$this->verb);
}
switch ($this->verb) {

View file

@ -66,7 +66,7 @@ final class PhabricatorProjectEditIconController
if ($icon == $project->getIcon()) {
$class_extra = ' selected';
$tip = $label . pht(' - selected');
$tip = $label.pht(' - selected');
} else {
$class_extra = null;
$tip = $label;

View file

@ -162,7 +162,7 @@ final class ReleephProductEditController extends ReleephProductController {
->setValue($pick_failure_instructions)
->setName('pickFailureInstructions')
->setCaption(
pht('Instructions for pick failures, which will be used ' .
pht('Instructions for pick failures, which will be used '.
'in emails generated by failed picks')))
->appendChild(
id(new AphrontFormTextAreaControl())

View file

@ -196,7 +196,7 @@ final class ReleephRequestEditController extends ReleephBranchController {
$age_string = '';
if ($is_edit) {
$age_string = phabricator_format_relative_time(
time() - $pull->getDateCreated()) . ' ago';
time() - $pull->getDateCreated()).' ago';
}
// Warn the user if we've been redirected here because we tried to

View file

@ -113,10 +113,10 @@ EXAMPLE;
->setOptions(
array(
'glyph' =>
pht("In page titles, show Tool names as unicode glyphs: " .
pht("In page titles, show Tool names as unicode glyphs: ".
"\xE2\x9A\x99"),
'text' =>
pht('In page titles, show Tool names as plain text: ' .
pht('In page titles, show Tool names as plain text: '.
'[Differential]'),
)))
->appendChild(

View file

@ -104,7 +104,7 @@ final class PhabricatorBotFeedNotificationHandler
$latest = $this->getConduit()->callMethodSynchronous(
'feed.query',
array(
'limit'=>1
'limit' => 1,
));
foreach ($latest as $story) {
@ -127,9 +127,9 @@ final class PhabricatorBotFeedNotificationHandler
$stories = $this->getConduit()->callMethodSynchronous(
'feed.query',
array(
'limit'=>$config_page_size,
'after'=>$chrono_key_cursor,
'view'=>'text'
'limit' => $config_page_size,
'after' => $chrono_key_cursor,
'view' => 'text',
));
foreach ($stories as $story) {

View file

@ -93,7 +93,7 @@ final class PhabricatorSMSImplementationTwilioAdapter
$prepend = '+1';
break;
}
return $prepend . $number;
return $prepend.$number;
}
}

View file

@ -146,7 +146,7 @@ final class AphrontCursorPagerView extends AphrontView {
array(
'href' => $first_uri,
),
"\xC2\xAB ". pht('First'));
"\xC2\xAB ".pht('First'));
}
$prev_uri = $this->getPrevPageURI();
@ -156,7 +156,7 @@ final class AphrontCursorPagerView extends AphrontView {
array(
'href' => $prev_uri,
),
"\xE2\x80\xB9 " . pht('Prev'));
"\xE2\x80\xB9 ".pht('Prev'));
}
$next_uri = $this->getNextPageURI();
@ -166,7 +166,7 @@ final class AphrontCursorPagerView extends AphrontView {
array(
'href' => $next_uri,
),
pht('Next') . " \xE2\x80\xBA");
pht('Next')." \xE2\x80\xBA");
}
return phutil_tag(

View file

@ -71,7 +71,7 @@ final class PhabricatorSourceCodeView extends AphrontView {
}
if ($this->canClickHighlight) {
$line_uri = $this->uri . '$' . $line_number;
$line_uri = $this->uri.'$'.$line_number;
$line_href = (string) new PhutilURI($line_uri);
$tag_number = javelin_tag(