Fix some odd looking arrays

Summary: These arrays looks a little odd, most likely due to the autofix applied by `ArcanistXHPASTLinter::LINT_ARRAY_SEPARATOR`. See D12296 in which I attempt to improve the autocorrection from this linter rule.

Test Plan: N/A

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: epriestley

Differential Revision: https://secure.phabricator.com/D12281
This commit is contained in:
Joshua Spence
2015-04-05 22:29:39 +10:00
parent 5b1d0f9ed7
commit ea376685ae
31 changed files with 95 additions and 50 deletions

View File

@@ -6,7 +6,8 @@ $conn_w = $table->establishConnection('w');
echo "Converting Maniphest project transactions to modern EDGE ". echo "Converting Maniphest project transactions to modern EDGE ".
"transactions...\n"; "transactions...\n";
$metadata = array( $metadata = array(
'edge:type' => PhabricatorProjectObjectHasProjectEdgeType::EDGECONST,); 'edge:type' => PhabricatorProjectObjectHasProjectEdgeType::EDGECONST,
);
foreach (new LiskMigrationIterator($table) as $txn) { foreach (new LiskMigrationIterator($table) as $txn) {
// ManiphestTransaction::TYPE_PROJECTS // ManiphestTransaction::TYPE_PROJECTS
if ($txn->getTransactionType() == 'projects') { if ($txn->getTransactionType() == 'projects') {

View File

@@ -18,7 +18,8 @@ final class PhabricatorAuthManagementTrustOAuthClientWorkflow
'name' => 'id', 'name' => 'id',
'param' => 'id', 'param' => 'id',
'help' => pht('The id of the OAuth client.'), 'help' => pht('The id of the OAuth client.'),
),)); ),
));
} }
public function execute(PhutilArgumentParser $args) { public function execute(PhutilArgumentParser $args) {

View File

@@ -18,7 +18,8 @@ final class PhabricatorAuthManagementUntrustOAuthClientWorkflow
'name' => 'id', 'name' => 'id',
'param' => 'id', 'param' => 'id',
'help' => pht('The id of the OAuth client.'), 'help' => pht('The id of the OAuth client.'),
),)); ),
));
} }
public function execute(PhutilArgumentParser $args) { public function execute(PhutilArgumentParser $args) {

View File

@@ -256,7 +256,8 @@ abstract class PhabricatorController extends AphrontController {
if ($must_sign_docs) { if ($must_sign_docs) {
$controller = new LegalpadDocumentSignController(); $controller = new LegalpadDocumentSignController();
$this->getRequest()->setURIMap(array( $this->getRequest()->setURIMap(array(
'id' => head($must_sign_docs)->getID(),)); 'id' => head($must_sign_docs)->getID(),
));
$this->setCurrentApplication($legalpad); $this->setCurrentApplication($legalpad);
return $this->delegateToController($controller); return $this->delegateToController($controller);
} else { } else {

View File

@@ -283,7 +283,8 @@ final class PhabricatorConduitAPIController
pht( pht(
'This request originates from outside of the Phabricator '. 'This request originates from outside of the Phabricator '.
'cluster address range. Requests signed with trusted '. 'cluster address range. Requests signed with trusted '.
'device keys must originate from within the cluster.'),); 'device keys must originate from within the cluster.'),
);
} }
$user = PhabricatorUser::getOmnipotentUser(); $user = PhabricatorUser::getOmnipotentUser();
@@ -384,7 +385,8 @@ final class PhabricatorConduitAPIController
pht( pht(
'This request originates from outside of the Phabricator '. 'This request originates from outside of the Phabricator '.
'cluster address range. Requests signed with cluster API '. 'cluster address range. Requests signed with cluster API '.
'tokens must originate from within the cluster.'),); 'tokens must originate from within the cluster.'),
);
} }
// Flag this as an intracluster request. // Flag this as an intracluster request.

View File

@@ -107,20 +107,25 @@ final class PhabricatorBinariesSetupCheck extends PhabricatorSetupCheck {
case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
$minimum_version = '1.5'; $minimum_version = '1.5';
$bad_versions = array( $bad_versions = array(
'1.7.1' => pht('This version of Subversion has a bug where '. '1.7.1' => pht(
'"svn diff -c N" does not work for files added '. 'This version of Subversion has a bug where `%s` does not work '.
'in rN (Subversion issue #2873), fixed in 1.7.2.'),); 'for files added in rN (Subversion issue #2873), fixed in 1.7.2.',
'svn diff -c N'),
);
list($err, $stdout, $stderr) = exec_manual('svn --version --quiet'); list($err, $stdout, $stderr) = exec_manual('svn --version --quiet');
$version = trim($stdout); $version = trim($stdout);
break; break;
case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
$minimum_version = '1.9'; $minimum_version = '1.9';
$bad_versions = array( $bad_versions = array(
'2.1' => pht('This version of Mercurial returns a bad exit code '. '2.1' => pht(
'This version of Mercurial returns a bad exit code '.
'after a successful pull.'), 'after a successful pull.'),
'2.2' => pht('This version of Mercurial has a significant memory '. '2.2' => pht(
'leak, fixed in 2.2.1. Pushing fails with this '. 'This version of Mercurial has a significant memory leak, fixed '.
'version as well; see T3046#54922.'),); 'in 2.2.1. Pushing fails with this version as well; see %s.',
'T3046#54922'),
);
$version = PhabricatorRepositoryVersion::getMercurialVersion(); $version = PhabricatorRepositoryVersion::getMercurialVersion();
break; break;
} }

View File

@@ -9,7 +9,8 @@ abstract class ConpherenceTestCase extends PhabricatorTestCase {
$xactions = array(id(new ConpherenceTransaction()) $xactions = array(id(new ConpherenceTransaction())
->setTransactionType(ConpherenceTransactionType::TYPE_PARTICIPANTS) ->setTransactionType(ConpherenceTransactionType::TYPE_PARTICIPANTS)
->setNewValue(array('+' => $participant_phids)),); ->setNewValue(array('+' => $participant_phids)),
);
$editor = id(new ConpherenceEditor()) $editor = id(new ConpherenceEditor())
->setActor($actor) ->setActor($actor)
->setContentSource(PhabricatorContentSource::newConsoleSource()) ->setContentSource(PhabricatorContentSource::newConsoleSource())
@@ -24,7 +25,8 @@ abstract class ConpherenceTestCase extends PhabricatorTestCase {
$xactions = array(id(new ConpherenceTransaction()) $xactions = array(id(new ConpherenceTransaction())
->setTransactionType(ConpherenceTransactionType::TYPE_PARTICIPANTS) ->setTransactionType(ConpherenceTransactionType::TYPE_PARTICIPANTS)
->setNewValue(array('-' => $participant_phids)),); ->setNewValue(array('-' => $participant_phids)),
);
$editor = id(new ConpherenceEditor()) $editor = id(new ConpherenceEditor())
->setActor($actor) ->setActor($actor)
->setContentSource(PhabricatorContentSource::newConsoleSource()) ->setContentSource(PhabricatorContentSource::newConsoleSource())

View File

@@ -125,7 +125,8 @@ final class ConpherenceListController extends ConpherenceController {
->execute(); ->execute();
return array( return array(
'all_participation' => $all_participation,); 'all_participation' => $all_participation,
);
} }
private function loadConpherenceThreadData($participation) { private function loadConpherenceThreadData($participation) {

View File

@@ -178,7 +178,8 @@ final class ConpherenceThreadSearchEngine
return array( return array(
'rooms' => pht('Rooms'), 'rooms' => pht('Rooms'),
'messages' => pht('Messages'), 'messages' => pht('Messages'),
'both' => pht('Both'),); 'both' => pht('Both'),
);
} }
} }

View File

@@ -60,7 +60,8 @@ final class ConpherenceThread extends ConpherenceDAO
), ),
self::CONFIG_KEY_SCHEMA => array( self::CONFIG_KEY_SCHEMA => array(
'key_room' => array( 'key_room' => array(
'columns' => array('isRoom', 'dateModified'),), 'columns' => array('isRoom', 'dateModified'),
),
'key_phid' => null, 'key_phid' => null,
'phid' => array( 'phid' => array(
'columns' => array('phid'), 'columns' => array('phid'),

View File

@@ -375,8 +375,8 @@ final class ConpherenceDurableColumnView extends AphrontTagView {
), ),
$header), $header),
$settings_button, $settings_button,
$settings_menu,)); $settings_menu,
));
} }
private function getHeaderActionsConfig(ConpherenceThread $conpherence) { private function getHeaderActionsConfig(ConpherenceThread $conpherence) {
@@ -418,7 +418,8 @@ final class ConpherenceDurableColumnView extends AphrontTagView {
'href' => '#', 'href' => '#',
'icon' => 'fa-times', 'icon' => 'fa-times',
'key' => 'hide_column', 'key' => 'hide_column',
),); ),
);
} }
private function buildTransactions() { private function buildTransactions() {
@@ -441,7 +442,8 @@ final class ConpherenceDurableColumnView extends AphrontTagView {
'class' => 'button grey', 'class' => 'button grey',
'sigil' => 'workflow', 'sigil' => 'workflow',
), ),
pht('Send a Message')),); pht('Send a Message')),
);
} }
$data = ConpherenceTransactionView::renderTransactions( $data = ConpherenceTransactionView::renderTransactions(
@@ -501,7 +503,8 @@ final class ConpherenceDurableColumnView extends AphrontTagView {
'type' => 'hidden', 'type' => 'hidden',
'name' => 'action', 'name' => 'action',
'value' => ConpherenceUpdateActions::MESSAGE, 'value' => ConpherenceUpdateActions::MESSAGE,
)),)); )),
));
} }
private function buildStatusText() { private function buildStatusText() {

View File

@@ -179,7 +179,8 @@ EOTEXT
phutil_tag( phutil_tag(
'a', 'a',
array( array(
'href' => $this->getInboundEmailSupportLink(),), 'href' => $this->getInboundEmailSupportLink(),
),
pht('Learn More'))); pht('Learn More')));
} }

View File

@@ -163,11 +163,13 @@ final class DifferentialCreateDiffConduitAPIMethod
$request->getValue('sourceControlBaseRevision'), $request->getValue('sourceControlBaseRevision'),
'arcanistProjectPHID' => $project_phid, 'arcanistProjectPHID' => $project_phid,
'lintStatus' => $lint_status, 'lintStatus' => $lint_status,
'unitStatus' => $unit_status,); 'unitStatus' => $unit_status,
);
$xactions = array(id(new DifferentialTransaction()) $xactions = array(id(new DifferentialTransaction())
->setTransactionType(DifferentialDiffTransaction::TYPE_DIFF_CREATE) ->setTransactionType(DifferentialDiffTransaction::TYPE_DIFF_CREATE)
->setNewValue($diff_data_dict),); ->setNewValue($diff_data_dict),
);
id(new DifferentialDiffEditor()) id(new DifferentialDiffEditor())
->setActor($viewer) ->setActor($viewer)

View File

@@ -53,11 +53,13 @@ final class DifferentialCreateRawDiffConduitAPIMethod
'authorPHID' => $viewer->getPHID(), 'authorPHID' => $viewer->getPHID(),
'repositoryPHID' => $repository_phid, 'repositoryPHID' => $repository_phid,
'lintStatus' => DifferentialLintStatus::LINT_SKIP, 'lintStatus' => DifferentialLintStatus::LINT_SKIP,
'unitStatus' => DifferentialUnitStatus::UNIT_SKIP,); 'unitStatus' => DifferentialUnitStatus::UNIT_SKIP,
);
$xactions = array(id(new DifferentialTransaction()) $xactions = array(id(new DifferentialTransaction())
->setTransactionType(DifferentialDiffTransaction::TYPE_DIFF_CREATE) ->setTransactionType(DifferentialDiffTransaction::TYPE_DIFF_CREATE)
->setNewValue($diff_data_dict),); ->setNewValue($diff_data_dict),
);
if ($request->getValue('viewPolicy')) { if ($request->getValue('viewPolicy')) {
$xactions[] = id(new DifferentialTransaction()) $xactions[] = id(new DifferentialTransaction())

View File

@@ -62,7 +62,8 @@ final class DifferentialRevisionCloseDetailsController
phutil_tag( phutil_tag(
'a', 'a',
array( array(
'href' => $obj_handle->getURI(),), 'href' => $obj_handle->getURI(),
),
$obj_handle->getName())); $obj_handle->getName()));
} else if ($revision_match_data['foundURI']) { } else if ($revision_match_data['foundURI']) {
$body_why[] = pht( $body_why[] = pht(
@@ -96,7 +97,8 @@ final class DifferentialRevisionCloseDetailsController
$diff_link = phutil_tag( $diff_link = phutil_tag(
'a', 'a',
array( array(
'href' => $obj_handle->getURI(),), 'href' => $obj_handle->getURI(),
),
$obj_handle->getName()); $obj_handle->getName());
$body_why = pht( $body_why = pht(
'This commit and the active diff of %s had the same %s hash '. 'This commit and the active diff of %s had the same %s hash '.

View File

@@ -59,7 +59,8 @@ final class DifferentialCreateMailReceiver extends PhabricatorMailReceiver {
$call = new ConduitCall( $call = new ConduitCall(
'differential.createrawdiff', 'differential.createrawdiff',
array( array(
'diff' => $body,)); 'diff' => $body,
));
$call->setUser($sender); $call->setUser($sender);
try { try {
$result = $call->execute(); $result = $call->execute();

View File

@@ -51,7 +51,8 @@ final class PhabricatorFilesApplication extends PhabricatorApplication {
phutil_tag( phutil_tag(
'a', 'a',
array( array(
'href' => $this->getInboundEmailSupportLink(),), 'href' => $this->getInboundEmailSupportLink(),
),
pht('Learn More'))); pht('Learn More')));
} }

View File

@@ -122,7 +122,8 @@ final class PhabricatorManiphestApplication extends PhabricatorApplication {
phutil_tag( phutil_tag(
'a', 'a',
array( array(
'href' => $this->getInboundEmailSupportLink(),), 'href' => $this->getInboundEmailSupportLink(),
),
pht('Learn More'))); pht('Learn More')));
} }

View File

@@ -55,7 +55,8 @@ final class PhabricatorPasteApplication extends PhabricatorApplication {
phutil_tag( phutil_tag(
'a', 'a',
array( array(
'href' => $this->getInboundEmailSupportLink(),), 'href' => $this->getInboundEmailSupportLink(),
),
pht('Learn More'))); pht('Learn More')));
} }

View File

@@ -376,7 +376,8 @@ final class PhrictionDocumentController
$child_dict = array( $child_dict = array(
'slug' => $child->getSlug(), 'slug' => $child->getSlug(),
'depth' => $child->getDepth(), 'depth' => $child->getDepth(),
'title' => $child->getContent()->getTitle(),); 'title' => $child->getContent()->getTitle(),
);
if ($child->getDepth() == $d_child) { if ($child->getDepth() == $d_child) {
$children_dicts[] = $child_dict; $children_dicts[] = $child_dict;
continue; continue;

View File

@@ -132,7 +132,8 @@ final class PhrictionTransactionEditor
'id' => $document->getID(), 'id' => $document->getID(),
'phid' => $document->getPHID(), 'phid' => $document->getPHID(),
'content' => $document->getContent()->getContent(), 'content' => $document->getContent()->getContent(),
'title' => $document->getContent()->getTitle(),); 'title' => $document->getContent()->getTitle(),
);
return $dict; return $dict;
case PhrictionTransaction::TYPE_MOVE_AWAY: case PhrictionTransaction::TYPE_MOVE_AWAY:
$document = $xaction->getNewValue(); $document = $xaction->getNewValue();
@@ -140,7 +141,8 @@ final class PhrictionTransactionEditor
'id' => $document->getID(), 'id' => $document->getID(),
'phid' => $document->getPHID(), 'phid' => $document->getPHID(),
'content' => $document->getContent()->getContent(), 'content' => $document->getContent()->getContent(),
'title' => $document->getContent()->getTitle(),); 'title' => $document->getContent()->getTitle(),
);
return $dict; return $dict;
} }
} }

View File

@@ -22,7 +22,8 @@ final class PhabricatorPolicyConfigOptions
public function getOptions() { public function getOptions() {
$policy_locked_type = 'custom:PolicyLockOptionType'; $policy_locked_type = 'custom:PolicyLockOptionType';
$policy_locked_example = array( $policy_locked_example = array(
'people.create.users' => 'admin',); 'people.create.users' => 'admin',
);
$json = new PhutilJSON(); $json = new PhutilJSON();
$policy_locked_example = $json->encodeFormatted($policy_locked_example); $policy_locked_example = $json->encodeFormatted($policy_locked_example);

View File

@@ -49,7 +49,8 @@ final class PhabricatorApplicationTransactionShowOlderController
return id(new AphrontAjaxResponse()) return id(new AphrontAjaxResponse())
->setContent(array( ->setContent(array(
'timeline' => hsprintf('%s', $events),)); 'timeline' => hsprintf('%s', $events),
));
} }
} }

View File

@@ -39,7 +39,8 @@ final class PhabricatorInlineSummaryView extends AphrontView {
), ),
array( array(
$icon, $icon,
$group,)); $group,
));
$rows[] = phutil_tag('tr', array(), $header); $rows[] = phutil_tag('tr', array(), $header);
foreach ($items as $item) { foreach ($items as $item) {

View File

@@ -305,7 +305,8 @@ final class AphrontTableView extends AphrontView {
$html = phutil_tag( $html = phutil_tag(
'table', 'table',
array( array(
'class' => implode(' ', $classes),), 'class' => implode(' ', $classes),
),
$table); $table);
return phutil_tag_div('aphront-table-wrap', $html); return phutil_tag_div('aphront-table-wrap', $html);
} }

View File

@@ -212,7 +212,8 @@ abstract class AphrontFormControl extends AphrontView {
), ),
array( array(
$this->getLabel(), $this->getLabel(),
$error,)); $error,
));
} else { } else {
$label = null; $label = null;
$custom_class .= ' aphront-form-control-nolabel'; $custom_class .= ' aphront-form-control-nolabel';

View File

@@ -81,7 +81,8 @@ final class PhabricatorTransactionView extends AphrontView {
array( array(
$image, $image,
phutil_tag_div('phabricator-transaction-detail grouped', phutil_tag_div('phabricator-transaction-detail grouped',
array($header, $content)),)); array($header, $content)),
));
} }
@@ -129,7 +130,8 @@ final class PhabricatorTransactionView extends AphrontView {
return phutil_tag( return phutil_tag(
'span', 'span',
array( array(
'class' => 'phabricator-transaction-info',), 'class' => 'phabricator-transaction-info',
),
$info); $info);
} }

View File

@@ -174,7 +174,8 @@ final class PHUIDocumentView extends AphrontTagView {
'map' => array( 'map' => array(
$this->actionListID => 'phabricator-action-list-toggle', $this->actionListID => 'phabricator-action-list-toggle',
$icon_id => 'phuix-dropdown-open', $icon_id => 'phuix-dropdown-open',
),); ),
);
$mobile_menu = id(new PHUIButtonView()) $mobile_menu = id(new PHUIButtonView())
->setTag('a') ->setTag('a')
->setText(pht('Actions')) ->setText(pht('Actions'))

View File

@@ -171,7 +171,8 @@ final class PHUIObjectBoxView extends AphrontView {
'map' => array( 'map' => array(
$this->actionListID => 'phabricator-action-list-toggle', $this->actionListID => 'phabricator-action-list-toggle',
$icon_id => 'phuix-dropdown-open', $icon_id => 'phuix-dropdown-open',
),); ),
);
$mobile_menu = id(new PHUIButtonView()) $mobile_menu = id(new PHUIButtonView())
->setTag('a') ->setTag('a')
->setText(pht('Actions')) ->setText(pht('Actions'))

View File

@@ -581,7 +581,8 @@ final class PHUIObjectItemView extends AphrontTagView {
), ),
array( array(
$icons, $icons,
$bylines,)); $bylines,
));
} }
$table = phutil_tag( $table = phutil_tag(

View File

@@ -435,7 +435,8 @@ final class PHUITimelineEventView extends AphrontView {
'class' => 'phui-timeline-event-view '. 'class' => 'phui-timeline-event-view '.
'phui-timeline-spacer '. 'phui-timeline-spacer '.
'phui-timeline-spacer-bold', 'phui-timeline-spacer-bold',
'',)); '',
));
} }
return array( return array(
@@ -453,7 +454,8 @@ final class PHUITimelineEventView extends AphrontView {
'class' => implode(' ', $classes), 'class' => implode(' ', $classes),
), ),
$content)), $content)),
$major_event,); $major_event,
);
} }
private function renderExtra(array $events) { private function renderExtra(array $events) {