D10585.diff
No OneTemporary
Actions

Size

203 KB

Referenced Files

None

Subscribers

None

D10585.diff
View Options

	diff --git a/scripts/symbols/generate_php_symbols.php b/scripts/symbols/generate_php_symbols.php
	--- a/scripts/symbols/generate_php_symbols.php
	+++ b/scripts/symbols/generate_php_symbols.php
	@@ -98,7 +98,7 @@
	}
	}

	-function print_symbol($file, $type, $token, $context=null) {
	+function print_symbol($file, $type, $token, $context = null) {
	$parts = array(
	$context ? $context->getConcreteString() : '',
	// variable tokens are `$name`, not just `name`, so strip the $ off of
	diff --git a/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php b/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php
	--- a/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php
	+++ b/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php
	@@ -306,7 +306,8 @@
	array(
	'uri' => $uri,
	'external' => $external,
	- ));
	+ ),
	+ );
	}

	}
	diff --git a/src/aphront/console/plugin/DarkConsoleRequestPlugin.php b/src/aphront/console/plugin/DarkConsoleRequestPlugin.php
	--- a/src/aphront/console/plugin/DarkConsoleRequestPlugin.php
	+++ b/src/aphront/console/plugin/DarkConsoleRequestPlugin.php
	@@ -47,7 +47,8 @@
	if (isset($mask[$key])) {
	$rows[] = array(
	$key,
	- phutil_tag('em', array(), '(Masked)'));
	+ phutil_tag('em', array(), '(Masked)'),
	+ );
	} else {
	$rows[] = array(
	$key,
	diff --git a/src/aphront/response/AphrontFileResponse.php b/src/aphront/response/AphrontFileResponse.php
	--- a/src/aphront/response/AphrontFileResponse.php
	+++ b/src/aphront/response/AphrontFileResponse.php
	@@ -82,7 +82,8 @@
	if ($this->allowOrigins) {
	$headers[] = array(
	'Access-Control-Allow-Origin',
	- implode(',', $this->allowOrigins));
	+ implode(',', $this->allowOrigins),
	+ );
	}

	$headers = array_merge(parent::getHeaders(), $headers);
	diff --git a/src/aphront/response/AphrontResponse.php b/src/aphront/response/AphrontResponse.php
	--- a/src/aphront/response/AphrontResponse.php
	+++ b/src/aphront/response/AphrontResponse.php
	@@ -109,23 +109,28 @@
	if ($this->cacheable) {
	$headers[] = array(
	'Expires',
	- $this->formatEpochTimestampForHTTPHeader(time() + $this->cacheable));
	+ $this->formatEpochTimestampForHTTPHeader(time() + $this->cacheable),
	+ );
	} else {
	$headers[] = array(
	'Cache-Control',
	- 'private, no-cache, no-store, must-revalidate');
	+ 'private, no-cache, no-store, must-revalidate',
	+ );
	$headers[] = array(
	'Pragma',
	- 'no-cache');
	+ 'no-cache',
	+ );
	$headers[] = array(
	'Expires',
	- 'Sat, 01 Jan 2000 00:00:00 GMT');
	+ 'Sat, 01 Jan 2000 00:00:00 GMT',
	+ );
	}

	if ($this->lastModified) {
	$headers[] = array(
	'Last-Modified',
	- $this->formatEpochTimestampForHTTPHeader($this->lastModified));
	+ $this->formatEpochTimestampForHTTPHeader($this->lastModified),
	+ );
	}

	// IE has a feature where it may override an explicit Content-Type
	diff --git a/src/applications/audit/query/PhabricatorCommitSearchEngine.php b/src/applications/audit/query/PhabricatorCommitSearchEngine.php
	--- a/src/applications/audit/query/PhabricatorCommitSearchEngine.php
	+++ b/src/applications/audit/query/PhabricatorCommitSearchEngine.php
	@@ -82,7 +82,8 @@
	array(
	$auditor_phids,
	$commit_author_phids,
	- $repository_phids));
	+ $repository_phids,
	+ ));

	$handles = id(new PhabricatorHandleQuery())
	->setViewer($this->requireViewer())
	diff --git a/src/applications/auth/controller/PhabricatorAuthValidateController.php b/src/applications/auth/controller/PhabricatorAuthValidateController.php
	--- a/src/applications/auth/controller/PhabricatorAuthValidateController.php
	+++ b/src/applications/auth/controller/PhabricatorAuthValidateController.php
	@@ -22,7 +22,8 @@
	array(
	pht(
	'Login validation is missing expected parameter ("%s").',
	- 'phusr')));
	+ 'phusr'),
	+ ));
	}

	$expect_phusr = $request->getStr('expect');
	diff --git a/src/applications/auth/provider/PhabricatorAuthProvider.php b/src/applications/auth/provider/PhabricatorAuthProvider.php
	--- a/src/applications/auth/provider/PhabricatorAuthProvider.php
	+++ b/src/applications/auth/provider/PhabricatorAuthProvider.php
	@@ -243,7 +243,7 @@
	$image_uri,
	array(
	'name' => $name,
	- 'canCDN' => true
	+ 'canCDN' => true,
	));
	unset($unguarded);

	diff --git a/src/applications/calendar/__tests__/CalendarTimeUtilTestCase.php b/src/applications/calendar/__tests__/CalendarTimeUtilTestCase.php
	--- a/src/applications/calendar/__tests__/CalendarTimeUtilTestCase.php
	+++ b/src/applications/calendar/__tests__/CalendarTimeUtilTestCase.php
	@@ -55,7 +55,8 @@
	'Wednesday',
	'Thursday',
	'Friday',
	- 'Saturday');
	+ 'Saturday',
	+ );
	}

	}
	diff --git a/src/applications/calendar/controller/PhabricatorCalendarViewController.php b/src/applications/calendar/controller/PhabricatorCalendarViewController.php
	--- a/src/applications/calendar/controller/PhabricatorCalendarViewController.php
	+++ b/src/applications/calendar/controller/PhabricatorCalendarViewController.php
	@@ -103,7 +103,8 @@
	phutil_tag(
	'a',
	array(
	- 'href' => $login_uri),
	+ 'href' => $login_uri,
	+ ),
	pht('Log in'))));
	}

	diff --git a/src/applications/calendar/util/CalendarTimeUtil.php b/src/applications/calendar/util/CalendarTimeUtil.php
	--- a/src/applications/calendar/util/CalendarTimeUtil.php
	+++ b/src/applications/calendar/util/CalendarTimeUtil.php
	@@ -24,7 +24,8 @@

	return array(
	'start_epoch' => $start_day->format('U'),
	- 'end_epoch' => $end_day->format('U'));
	+ 'end_epoch' => $end_day->format('U'),
	+ );
	}

	public static function getCalendarWeekTimestamps(
	@@ -56,7 +57,8 @@
	}
	return array(
	'today' => $objects['today'],
	- 'epoch_stamps' => $timestamps);
	+ 'epoch_stamps' => $timestamps,
	+ );
	}

	private static function getStartDateTimeObjects(
	@@ -80,7 +82,8 @@
	}
	return array(
	'today' => $today,
	- 'start_day' => $start_day);
	+ 'start_day' => $start_day,
	+ );
	}

	}
	diff --git a/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php b/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php
	--- a/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php
	+++ b/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php
	@@ -120,7 +120,7 @@
	'a',
	array(
	'href' => $href,
	- 'class' => 'timestamp'
	+ 'class' => 'timestamp',
	),
	$timestamp);

	@@ -129,11 +129,12 @@
	$message = phutil_tag(
	'td',
	array(
	- 'class' => 'message'
	+ 'class' => 'message',
	),
	array(
	$timestamp,
	- $message));
	+ $message,
	+ ));

	$out[] = phutil_tag(
	'tr',
	@@ -142,7 +143,8 @@
	),
	array(
	$author,
	- $message));
	+ $message,
	+ ));
	}

	$links = array();
	@@ -210,41 +212,41 @@
	$table = phutil_tag(
	'table',
	array(
	- 'class' => 'phabricator-chat-log'
	+ 'class' => 'phabricator-chat-log',
	),
	$out);

	$log = phutil_tag(
	'div',
	array(
	- 'class' => 'phabricator-chat-log-panel'
	+ 'class' => 'phabricator-chat-log-panel',
	),
	$table);

	$jump_link = phutil_tag(
	'a',
	array(
	- 'href' => '#latest'
	+ 'href' => '#latest',
	),
	pht('Jump to Bottom')." \xE2\x96\xBE");

	$jump = phutil_tag(
	'div',
	array(
	- 'class' => 'phabricator-chat-log-jump'
	+ 'class' => 'phabricator-chat-log-jump',
	),
	$jump_link);

	$jump_target = phutil_tag(
	'div',
	array(
	- 'id' => 'latest'
	+ 'id' => 'latest',
	));

	$content = phutil_tag(
	'div',
	array(
	- 'class' => 'phabricator-chat-log-wrap'
	+ 'class' => 'phabricator-chat-log-wrap',
	),
	array(
	$jump,
	diff --git a/src/applications/conduit/controller/PhabricatorConduitAPIController.php b/src/applications/conduit/controller/PhabricatorConduitAPIController.php
	--- a/src/applications/conduit/controller/PhabricatorConduitAPIController.php
	+++ b/src/applications/conduit/controller/PhabricatorConduitAPIController.php
	@@ -279,7 +279,7 @@
	if (!$session_key) {
	return array(
	'ERR-INVALID-SESSION',
	- 'Session key is not present.'
	+ 'Session key is not present.',
	);
	}

	diff --git a/src/applications/config/check/PhabricatorSetupCheckDaemons.php b/src/applications/config/check/PhabricatorSetupCheckDaemons.php
	--- a/src/applications/config/check/PhabricatorSetupCheckDaemons.php
	+++ b/src/applications/config/check/PhabricatorSetupCheckDaemons.php
	@@ -31,7 +31,7 @@
	'a',
	array(
	'href' => $doc_href,
	- 'target' => '_blank'
	+ 'target' => '_blank',
	),
	pht('Managing Daemons with phd')));

	@@ -100,14 +100,14 @@
	'a',
	array(
	'href' => '/daemon/',
	- 'target' => '_blank'
	+ 'target' => '_blank',
	),
	pht('Daemon Console')),
	phutil_tag(
	'a',
	array(
	'href' => $doc_href,
	- 'target' => '_blank'
	+ 'target' => '_blank',
	),
	pht('Managing Daemons with phd')),
	phutil_tag('tt', array(), 'PHABRICATOR_ENV'),
	diff --git a/src/applications/config/controller/PhabricatorConfigDatabaseIssueController.php b/src/applications/config/controller/PhabricatorConfigDatabaseIssueController.php
	--- a/src/applications/config/controller/PhabricatorConfigDatabaseIssueController.php
	+++ b/src/applications/config/controller/PhabricatorConfigDatabaseIssueController.php
	@@ -25,7 +25,8 @@
	null,
	null,
	null,
	- $issue);
	+ $issue,
	+ );
	}
	foreach ($database->getTables() as $table_name => $table) {
	foreach ($table->getLocalIssues() as $issue) {
	@@ -34,7 +35,8 @@
	$table_name,
	null,
	null,
	- $issue);
	+ $issue,
	+ );
	}
	foreach ($table->getColumns() as $column_name => $column) {
	foreach ($column->getLocalIssues() as $issue) {
	@@ -43,7 +45,8 @@
	$table_name,
	'column',
	$column_name,
	- $issue);
	+ $issue,
	+ );
	}
	}
	foreach ($table->getKeys() as $key_name => $key) {
	@@ -53,7 +56,8 @@
	$table_name,
	'key',
	$key_name,
	- $issue);
	+ $issue,
	+ );
	}
	}
	}
	diff --git a/src/applications/config/controller/PhabricatorConfigDatabaseStatusController.php b/src/applications/config/controller/PhabricatorConfigDatabaseStatusController.php
	--- a/src/applications/config/controller/PhabricatorConfigDatabaseStatusController.php
	+++ b/src/applications/config/controller/PhabricatorConfigDatabaseStatusController.php
	@@ -372,7 +372,7 @@
	null,
	null,
	null,
	- null
	+ null,
	));

	$key_rows = array();
	diff --git a/src/applications/config/controller/PhabricatorConfigListController.php b/src/applications/config/controller/PhabricatorConfigListController.php
	--- a/src/applications/config/controller/PhabricatorConfigListController.php
	+++ b/src/applications/config/controller/PhabricatorConfigListController.php
	@@ -21,7 +21,7 @@

	$nav->appendChild(
	array(
	- $box
	+ $box,
	));

	$crumbs = $this
	diff --git a/src/applications/config/editor/PhabricatorConfigEditor.php b/src/applications/config/editor/PhabricatorConfigEditor.php
	--- a/src/applications/config/editor/PhabricatorConfigEditor.php
	+++ b/src/applications/config/editor/PhabricatorConfigEditor.php
	@@ -122,7 +122,7 @@
	->setNewValue(
	array(
	'deleted' => false,
	- 'value' => $value
	+ 'value' => $value,
	));

	$editor = id(new PhabricatorConfigEditor())
	diff --git a/src/applications/config/option/PhabricatorAuthenticationConfigOptions.php b/src/applications/config/option/PhabricatorAuthenticationConfigOptions.php
	--- a/src/applications/config/option/PhabricatorAuthenticationConfigOptions.php
	+++ b/src/applications/config/option/PhabricatorAuthenticationConfigOptions.php
	@@ -17,7 +17,7 @@
	->setBoolOptions(
	array(
	pht('Require email verification'),
	- pht("Don't require email verification")
	+ pht("Don't require email verification"),
	))
	->setSummary(
	pht('Require email verification before a user can log in.'))
	@@ -77,7 +77,7 @@
	->setBoolOptions(
	array(
	pht('Allow editing'),
	- pht('Prevent editing')
	+ pht('Prevent editing'),
	))
	->setSummary(
	pht(
	diff --git a/src/applications/config/option/PhabricatorCoreConfigOptions.php b/src/applications/config/option/PhabricatorCoreConfigOptions.php
	--- a/src/applications/config/option/PhabricatorCoreConfigOptions.php
	+++ b/src/applications/config/option/PhabricatorCoreConfigOptions.php
	@@ -94,7 +94,7 @@
	->setBoolOptions(
	array(
	pht('Enable Prototypes'),
	- pht('Disable Prototypes')
	+ pht('Disable Prototypes'),
	))
	->setSummary(
	pht(
	diff --git a/src/applications/config/option/PhabricatorGarbageCollectorConfigOptions.php b/src/applications/config/option/PhabricatorGarbageCollectorConfigOptions.php
	--- a/src/applications/config/option/PhabricatorGarbageCollectorConfigOptions.php
	+++ b/src/applications/config/option/PhabricatorGarbageCollectorConfigOptions.php
	@@ -16,25 +16,32 @@
	$options = array(
	'gcdaemon.ttl.herald-transcripts' => array(
	30,
	- pht('Number of seconds to retain Herald transcripts for.')),
	+ pht('Number of seconds to retain Herald transcripts for.'),
	+ ),
	'gcdaemon.ttl.daemon-logs' => array(
	7,
	- pht('Number of seconds to retain Daemon logs for.')),
	+ pht('Number of seconds to retain Daemon logs for.'),
	+ ),
	'gcdaemon.ttl.differential-parse-cache' => array(
	14,
	- pht('Number of seconds to retain Differential parse caches for.')),
	+ pht('Number of seconds to retain Differential parse caches for.'),
	+ ),
	'gcdaemon.ttl.markup-cache' => array(
	30,
	- pht('Number of seconds to retain Markup cache entries for.')),
	+ pht('Number of seconds to retain Markup cache entries for.'),
	+ ),
	'gcdaemon.ttl.task-archive' => array(
	14,
	- pht('Number of seconds to retain archived background tasks for.')),
	+ pht('Number of seconds to retain archived background tasks for.'),
	+ ),
	'gcdaemon.ttl.general-cache' => array(
	30,
	- pht('Number of seconds to retain general cache entries for.')),
	+ pht('Number of seconds to retain general cache entries for.'),
	+ ),
	'gcdaemon.ttl.conduit-logs' => array(
	180,
	- pht('Number of seconds to retain Conduit call logs for.'))
	+ pht('Number of seconds to retain Conduit call logs for.'),
	+ ),
	);

	$result = array();
	diff --git a/src/applications/config/option/PhabricatorSMSConfigOptions.php b/src/applications/config/option/PhabricatorSMSConfigOptions.php
	--- a/src/applications/config/option/PhabricatorSMSConfigOptions.php
	+++ b/src/applications/config/option/PhabricatorSMSConfigOptions.php
	@@ -48,7 +48,7 @@
	->setDescription(pht('Authorization token from Twilio service.'))
	->setLocked(true)
	->setHidden(true)
	- ->addExample('f3jsi4i67wiwt6w54hf2zwvy3fjf5h', pht('30 characters'))
	+ ->addExample('f3jsi4i67wiwt6w54hf2zwvy3fjf5h', pht('30 characters')),
	);
	}

	diff --git a/src/applications/conpherence/conduit/ConpherenceCreateThreadConduitAPIMethod.php b/src/applications/conpherence/conduit/ConpherenceCreateThreadConduitAPIMethod.php
	--- a/src/applications/conpherence/conduit/ConpherenceCreateThreadConduitAPIMethod.php
	+++ b/src/applications/conpherence/conduit/ConpherenceCreateThreadConduitAPIMethod.php
	@@ -15,7 +15,7 @@
	return array(
	'title' => 'optional string',
	'message' => 'required string',
	- 'participantPHIDs' => 'required list<phids>'
	+ 'participantPHIDs' => 'required list<phids>',
	);
	}

	@@ -28,7 +28,7 @@
	'ERR_EMPTY_PARTICIPANT_PHIDS' => pht(
	'You must specify participant phids.'),
	'ERR_EMPTY_MESSAGE' => pht(
	- 'You must specify a message.')
	+ 'You must specify a message.'),
	);
	}

	diff --git a/src/applications/conpherence/conduit/ConpherenceQueryThreadConduitAPIMethod.php b/src/applications/conpherence/conduit/ConpherenceQueryThreadConduitAPIMethod.php
	--- a/src/applications/conpherence/conduit/ConpherenceQueryThreadConduitAPIMethod.php
	+++ b/src/applications/conpherence/conduit/ConpherenceQueryThreadConduitAPIMethod.php
	@@ -20,7 +20,7 @@
	'ids' => 'optional array<int>',
	'phids' => 'optional array<phids>',
	'limit' => 'optional int',
	- 'offset' => 'optional int'
	+ 'offset' => 'optional int',
	);
	}

	@@ -78,7 +78,8 @@
	'messageCount' => $conpherence->getMessageCount(),
	'recentParticipantPHIDs' => $conpherence->getRecentParticipantPHIDs(),
	'filePHIDs' => $conpherence->getFilePHIDs(),
	- 'conpherenceURI' => $this->getConpherenceURI($conpherence));
	+ 'conpherenceURI' => $this->getConpherenceURI($conpherence),
	+ );
	}
	return $data;
	}
	diff --git a/src/applications/conpherence/conduit/ConpherenceQueryTransactionConduitAPIMethod.php b/src/applications/conpherence/conduit/ConpherenceQueryTransactionConduitAPIMethod.php
	--- a/src/applications/conpherence/conduit/ConpherenceQueryTransactionConduitAPIMethod.php
	+++ b/src/applications/conpherence/conduit/ConpherenceQueryTransactionConduitAPIMethod.php
	@@ -20,7 +20,7 @@
	'threadID' => 'optional int',
	'threadPHID' => 'optional phid',
	'limit' => 'optional int',
	- 'offset' => 'optional int'
	+ 'offset' => 'optional int',
	);
	}

	@@ -32,7 +32,7 @@
	return array(
	'ERR_USAGE_NO_THREAD_ID' => pht(
	'You must specify a thread id or thread phid to query transactions '.
	- 'from.')
	+ 'from.'),
	);
	}

	@@ -88,7 +88,8 @@
	'authorPHID' => $transaction->getAuthorPHID(),
	'dateCreated' => $transaction->getDateCreated(),
	'conpherenceID' => $conpherence->getID(),
	- 'conpherencePHID' => $conpherence->getPHID());
	+ 'conpherencePHID' => $conpherence->getPHID(),
	+ );
	}
	return $data;
	}
	diff --git a/src/applications/conpherence/conduit/ConpherenceUpdateThreadConduitAPIMethod.php b/src/applications/conpherence/conduit/ConpherenceUpdateThreadConduitAPIMethod.php
	--- a/src/applications/conpherence/conduit/ConpherenceUpdateThreadConduitAPIMethod.php
	+++ b/src/applications/conpherence/conduit/ConpherenceUpdateThreadConduitAPIMethod.php
	@@ -18,7 +18,7 @@
	'title' => 'optional string',
	'message' => 'optional string',
	'addParticipantPHIDs' => 'optional list<phids>',
	- 'removeParticipantPHID' => 'optional phid'
	+ 'removeParticipantPHID' => 'optional phid',
	);
	}

	@@ -36,7 +36,7 @@
	'ERR_USAGE_ONLY_SELF_REMOVE' => pht(
	'Only a user can remove themselves from a thread.'),
	'ERR_USAGE_NO_UPDATES' => pht(
	- 'You must specify data that actually updates the conpherence.')
	+ 'You must specify data that actually updates the conpherence.'),
	);
	}

	diff --git a/src/applications/conpherence/controller/ConpherenceController.php b/src/applications/conpherence/controller/ConpherenceController.php
	--- a/src/applications/conpherence/controller/ConpherenceController.php
	+++ b/src/applications/conpherence/controller/ConpherenceController.php
	@@ -70,10 +70,11 @@
	phutil_tag(
	'div',
	array(
	- 'class' => 'header-loading-mask'
	+ 'class' => 'header-loading-mask',
	),
	''),
	- $crumbs));
	+ $crumbs,
	+ ));
	}

	protected function renderConpherenceTransactions(
	diff --git a/src/applications/conpherence/controller/ConpherenceListController.php b/src/applications/conpherence/controller/ConpherenceListController.php
	--- a/src/applications/conpherence/controller/ConpherenceListController.php
	+++ b/src/applications/conpherence/controller/ConpherenceListController.php
	@@ -140,7 +140,8 @@
	$phids = array_keys($participation);
	$content = array(
	'html' => $thread_html,
	- 'phids' => $phids);
	+ 'phids' => $phids,
	+ );
	$response = id(new AphrontAjaxResponse())->setContent($content);
	break;
	case self::UNSELECTED_MODE:
	diff --git a/src/applications/conpherence/controller/ConpherenceViewController.php b/src/applications/conpherence/controller/ConpherenceViewController.php
	--- a/src/applications/conpherence/controller/ConpherenceViewController.php
	+++ b/src/applications/conpherence/controller/ConpherenceViewController.php
	@@ -72,7 +72,7 @@
	$content = array(
	'header' => $header,
	'messages' => $messages,
	- 'form' => $form
	+ 'form' => $form,
	);
	}

	@@ -114,8 +114,8 @@
	'sigil' => 'show-older-messages',
	'class' => 'conpherence-show-older-messages',
	'meta' => array(
	- 'oldest_transaction_id' => $oldest_transaction_id
	- )
	+ 'oldest_transaction_id' => $oldest_transaction_id,
	+ ),
	),
	pht('Show Older Messages'));
	}
	diff --git a/src/applications/conpherence/controller/ConpherenceWidgetController.php b/src/applications/conpherence/controller/ConpherenceWidgetController.php
	--- a/src/applications/conpherence/controller/ConpherenceWidgetController.php
	+++ b/src/applications/conpherence/controller/ConpherenceWidgetController.php
	@@ -100,7 +100,7 @@
	'class' => 'widgets-body',
	'id' => 'widgets-files',
	'sigil' => 'widgets-files',
	- 'style' => 'display: none;'
	+ 'style' => 'display: none;',
	),
	id(new ConpherenceFileWidgetView())
	->setUser($user)
	@@ -111,7 +111,7 @@
	array(
	'class' => 'widgets-body',
	'id' => 'widgets-calendar',
	- 'style' => 'display: none;'
	+ 'style' => 'display: none;',
	),
	$this->renderCalendarWidgetPaneContent());
	$widgets[] = phutil_tag(
	@@ -119,7 +119,7 @@
	array(
	'class' => 'widgets-body',
	'id' => 'widgets-settings',
	- 'style' => 'display: none'
	+ 'style' => 'display: none',
	),
	$this->renderSettingsWidgetPaneContent());

	@@ -166,7 +166,7 @@
	array(
	'type' => 'hidden',
	'name' => 'action',
	- 'value' => 'notifications'
	+ 'value' => 'notifications',
	)),
	phutil_tag(
	'button',
	@@ -174,7 +174,7 @@
	'type' => 'submit',
	'class' => 'notifications-update',
	),
	- pht('Save'))
	+ pht('Save')),
	);

	return phabricator_form(
	@@ -222,21 +222,22 @@
	$content[] = phutil_tag(
	'div',
	array(
	- 'class' => 'day-header '.$active_class
	+ 'class' => 'day-header '.$active_class,
	),
	array(
	phutil_tag(
	'div',
	array(
	- 'class' => 'day-name'
	+ 'class' => 'day-name',
	),
	$day->format('l')),
	phutil_tag(
	'div',
	array(
	- 'class' => 'day-date'
	+ 'class' => 'day-date',
	),
	- $day->format('m/d/y'))));
	+ $day->format('m/d/y')),
	+ ));
	}

	$week_day_number = $day->format('w');
	@@ -298,16 +299,18 @@
	phutil_tag(
	'div',
	array(
	- 'class' => 'description'
	+ 'class' => 'description',
	),
	array(
	$status->getTerseSummary($user),
	phutil_tag(
	'div',
	array(
	- 'class' => 'participant'
	+ 'class' => 'participant',
	),
	- $secondary_info)))));
	+ $secondary_info),
	+ )),
	+ ));
	}
	$first_status_of_the_day = false;
	}
	@@ -332,14 +335,14 @@
	$inner_layout[] = phutil_tag(
	'div',
	array(
	- 'class' => $status->getTextStatus()
	+ 'class' => $status->getTextStatus(),
	),
	'');
	} else {
	$inner_layout[] = phutil_tag(
	'div',
	array(
	- 'class' => 'present'
	+ 'class' => 'present',
	),
	'');
	}
	@@ -348,13 +351,13 @@
	phutil_tag(
	'div',
	array(
	- 'class' => 'day-column'.$active_class
	+ 'class' => 'day-column'.$active_class,
	),
	array(
	phutil_tag(
	'div',
	array(
	- 'class' => 'day-name'
	+ 'class' => 'day-name',
	),
	$day->format('D')),
	phutil_tag(
	@@ -363,17 +366,16 @@
	'class' => 'day-number',
	),
	$day->format('j')),
	- $inner_layout
	+ $inner_layout,
	)));
	$calendar_columns++;
	}
	}

	- return
	- array(
	- $layout,
	- $content
	- );
	+ return array(
	+ $layout,
	+ $content,
	+ );
	}

	private function getWidgetURI() {
	diff --git a/src/applications/conpherence/query/ConpherenceThreadQuery.php b/src/applications/conpherence/query/ConpherenceThreadQuery.php
	--- a/src/applications/conpherence/query/ConpherenceThreadQuery.php
	+++ b/src/applications/conpherence/query/ConpherenceThreadQuery.php
	@@ -279,7 +279,7 @@
	$widget_data = array(
	'statuses' => $statuses,
	'files' => $conpherence_files,
	- 'files_authors' => $files_authors
	+ 'files_authors' => $files_authors,
	);
	$conpherence->attachWidgetData($widget_data);
	}
	diff --git a/src/applications/conpherence/view/ConpherenceFileWidgetView.php b/src/applications/conpherence/view/ConpherenceFileWidgetView.php
	--- a/src/applications/conpherence/view/ConpherenceFileWidgetView.php
	+++ b/src/applications/conpherence/view/ConpherenceFileWidgetView.php
	@@ -15,7 +15,7 @@
	$icon_view = phutil_tag(
	'div',
	array(
	- 'class' => 'file-icon sprite-docs '.$icon_class
	+ 'class' => 'file-icon sprite-docs '.$icon_class,
	),
	'');
	$file_view = id(new PhabricatorFileLinkView())
	@@ -41,19 +41,19 @@
	$who_done_it = phutil_tag(
	'div',
	array(
	- 'class' => 'file-uploaded-by'
	+ 'class' => 'file-uploaded-by',
	),
	pht('%s%s.', $who_done_it_text, $date_text));

	$files_html[] = phutil_tag(
	'div',
	array(
	- 'class' => 'file-entry'
	+ 'class' => 'file-entry',
	),
	array(
	$icon_view,
	$file_view,
	- $who_done_it
	+ $who_done_it,
	));
	}

	@@ -62,7 +62,8 @@
	'div',
	array(
	'class' => 'no-files',
	- 'sigil' => 'no-files'),
	+ 'sigil' => 'no-files',
	+ ),
	pht('No files.'));
	}

	diff --git a/src/applications/conpherence/view/ConpherenceLayoutView.php b/src/applications/conpherence/view/ConpherenceLayoutView.php
	--- a/src/applications/conpherence/view/ConpherenceLayoutView.php
	+++ b/src/applications/conpherence/view/ConpherenceLayoutView.php
	@@ -83,7 +83,7 @@
	'name' => pht('Thread'),
	'icon' => 'fa-comment',
	'deviceOnly' => true,
	- 'hasCreate' => false
	+ 'hasCreate' => false,
	),
	'widgets-people' => array(
	'name' => pht('Participants'),
	@@ -93,14 +93,14 @@
	'createData' => array(
	'refreshFromResponse' => true,
	'action' => ConpherenceUpdateActions::ADD_PERSON,
	- 'customHref' => null
	- )
	+ 'customHref' => null,
	+ ),
	),
	'widgets-files' => array(
	'name' => pht('Files'),
	'icon' => 'fa-files-o',
	'deviceOnly' => false,
	- 'hasCreate' => false
	+ 'hasCreate' => false,
	),
	'widgets-calendar' => array(
	'name' => pht('Calendar'),
	@@ -110,16 +110,17 @@
	'createData' => array(
	'refreshFromResponse' => false,
	'action' => ConpherenceUpdateActions::ADD_STATUS,
	- 'customHref' => '/calendar/event/create/'
	- )
	+ 'customHref' => '/calendar/event/create/',
	+ ),
	),
	'widgets-settings' => array(
	'name' => pht('Settings'),
	'icon' => 'fa-wrench',
	'deviceOnly' => false,
	- 'hasCreate' => false
	+ 'hasCreate' => false,
	),
	- )));
	+ ),
	+ ));


	return javelin_tag(
	@@ -170,7 +171,7 @@
	phutil_tag(
	'div',
	array(
	- 'class' => 'text'
	+ 'class' => 'text',
	),
	pht('You do not have any messages yet.')),
	javelin_tag(
	@@ -180,7 +181,7 @@
	'class' => 'button grey',
	'sigil' => 'workflow',
	),
	- pht('Send a Message'))
	+ pht('Send a Message')),
	)),
	javelin_tag(
	'div',
	@@ -193,21 +194,22 @@
	phutil_tag(
	'div',
	array(
	- 'class' => 'widgets-loading-mask'
	+ 'class' => 'widgets-loading-mask',
	),
	''),
	javelin_tag(
	'div',
	array(
	- 'sigil' => 'conpherence-widgets-holder'
	+ 'sigil' => 'conpherence-widgets-holder',
	),
	- ''))),
	+ ''),
	+ )),
	javelin_tag(
	'div',
	array(
	'class' => 'conpherence-message-pane',
	'id' => 'conpherence-message-pane',
	- 'sigil' => 'conpherence-message-pane'
	+ 'sigil' => 'conpherence-message-pane',
	),
	array(
	javelin_tag(
	@@ -228,9 +230,9 @@
	'div',
	array(
	'id' => 'conpherence-form',
	- 'sigil' => 'conpherence-form'
	+ 'sigil' => 'conpherence-form',
	),
	- nonempty($this->replyForm, ''))
	+ nonempty($this->replyForm, '')),
	)),
	)),
	));
	diff --git a/src/applications/conpherence/view/ConpherenceMenuItemView.php b/src/applications/conpherence/view/ConpherenceMenuItemView.php
	--- a/src/applications/conpherence/view/ConpherenceMenuItemView.php
	+++ b/src/applications/conpherence/view/ConpherenceMenuItemView.php
	@@ -77,7 +77,7 @@
	'span',
	array(
	'class' => 'conpherence-menu-item-image',
	- 'style' => 'background-image: url('.$this->imageURI.');'
	+ 'style' => 'background-image: url('.$this->imageURI.');',
	),
	'');
	}
	@@ -104,7 +104,7 @@
	$unread_count = phutil_tag(
	'span',
	array(
	- 'class' => 'conpherence-menu-item-unread-count'
	+ 'class' => 'conpherence-menu-item-unread-count',
	),
	(int)$this->unreadCount);
	}
	diff --git a/src/applications/conpherence/view/ConpherencePeopleWidgetView.php b/src/applications/conpherence/view/ConpherencePeopleWidgetView.php
	--- a/src/applications/conpherence/view/ConpherencePeopleWidgetView.php
	+++ b/src/applications/conpherence/view/ConpherencePeopleWidgetView.php
	@@ -25,14 +25,14 @@
	'meta' => array(
	'remove_person' => $handle->getPHID(),
	'action' => 'remove_person',
	- )
	+ ),
	),
	hsprintf('<span class="close-icon">×</span>'));
	}
	$body[] = phutil_tag(
	'div',
	array(
	- 'class' => 'person-entry grouped'
	+ 'class' => 'person-entry grouped',
	),
	array(
	phutil_tag(
	@@ -43,11 +43,12 @@
	phutil_tag(
	'img',
	array(
	- 'src' => $handle->getImageURI()
	+ 'src' => $handle->getImageURI(),
	),
	'')),
	$handle->renderLink(),
	- $remove_html));
	+ $remove_html,
	+ ));
	}

	return $body;
	diff --git a/src/applications/conpherence/view/ConpherenceThreadListView.php b/src/applications/conpherence/view/ConpherenceThreadListView.php
	--- a/src/applications/conpherence/view/ConpherenceThreadListView.php
	+++ b/src/applications/conpherence/view/ConpherenceThreadListView.php
	@@ -148,7 +148,8 @@
	'participant_id' => $participant->getID(),
	'conpherence_phid' => $participant->getConpherencePHID(),
	'date_touched' => $participant->getDateTouched(),
	- 'direction' => $direction));
	+ 'direction' => $direction,
	+ ));
	return $item;
	}

	@@ -156,7 +157,7 @@
	$message = phutil_tag(
	'div',
	array(
	- 'class' => 'no-conpherences-menu-item'
	+ 'class' => 'no-conpherences-menu-item',
	),
	pht('No conpherences.'));

	diff --git a/src/applications/conpherence/view/ConpherenceTransactionView.php b/src/applications/conpherence/view/ConpherenceTransactionView.php
	--- a/src/applications/conpherence/view/ConpherenceTransactionView.php
	+++ b/src/applications/conpherence/view/ConpherenceTransactionView.php
	@@ -38,7 +38,7 @@
	return phutil_tag(
	'div',
	array(
	- 'class' => 'date-marker'
	+ 'class' => 'date-marker',
	),
	array(
	phutil_tag(
	@@ -49,7 +49,8 @@
	phabricator_format_local_time(
	$transaction->getDateCreated(),
	$user,
	- 'M jS, Y'))));
	+ 'M jS, Y')),
	+ ));
	break;
	}

	@@ -92,7 +93,7 @@
	phutil_tag(
	'div',
	array(
	- 'class' => $content_class
	+ 'class' => $content_class,
	),
	$content));

	diff --git a/src/applications/countdown/application/PhabricatorCountdownApplication.php b/src/applications/countdown/application/PhabricatorCountdownApplication.php
	--- a/src/applications/countdown/application/PhabricatorCountdownApplication.php
	+++ b/src/applications/countdown/application/PhabricatorCountdownApplication.php
	@@ -43,7 +43,7 @@
	=> 'PhabricatorCountdownListController',
	'(?P<id>[1-9]\d*)/' => 'PhabricatorCountdownViewController',
	'edit/(?:(?P<id>[1-9]\d*)/)?' => 'PhabricatorCountdownEditController',
	- 'delete/(?P<id>[1-9]\d*)/' => 'PhabricatorCountdownDeleteController'
	+ 'delete/(?P<id>[1-9]\d*)/' => 'PhabricatorCountdownDeleteController',
	),
	);
	}
	diff --git a/src/applications/dashboard/controller/PhabricatorDashboardInstallController.php b/src/applications/dashboard/controller/PhabricatorDashboardInstallController.php
	--- a/src/applications/dashboard/controller/PhabricatorDashboardInstallController.php
	+++ b/src/applications/dashboard/controller/PhabricatorDashboardInstallController.php
	@@ -52,7 +52,8 @@

	$handles = $this->loadHandles(array(
	$object_phid,
	- $installer_phid));
	+ $installer_phid,
	+ ));

	if ($request->isFormPost()) {
	$dashboard_install = id(new PhabricatorDashboardInstall())
	diff --git a/src/applications/dashboard/customfield/PhabricatorDashboardPanelSearchQueryCustomField.php b/src/applications/dashboard/customfield/PhabricatorDashboardPanelSearchQueryCustomField.php
	--- a/src/applications/dashboard/customfield/PhabricatorDashboardPanelSearchQueryCustomField.php
	+++ b/src/applications/dashboard/customfield/PhabricatorDashboardPanelSearchQueryCustomField.php
	@@ -52,8 +52,8 @@
	'options' => $queries,
	'value' => array(
	'key' => strlen($value) ? $value : null,
	- 'name' => $name
	- )
	+ 'name' => $name,
	+ ),
	));

	return id(new AphrontFormSelectControl())
	diff --git a/src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php b/src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php
	--- a/src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php
	+++ b/src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php
	@@ -193,11 +193,14 @@
	'id' => $id,
	'sigil' => 'dashboard-panel',
	'meta' => array(
	- 'objectPHID' => $panel->getPHID()),
	- 'class' => 'dashboard-panel'),
	+ 'objectPHID' => $panel->getPHID(),
	+ ),
	+ 'class' => 'dashboard-panel',
	+ ),
	array(
	$header,
	- $content));
	+ $content,
	+ ));
	}


	diff --git a/src/applications/dashboard/layoutconfig/PhabricatorDashboardLayoutConfig.php b/src/applications/dashboard/layoutconfig/PhabricatorDashboardLayoutConfig.php
	--- a/src/applications/dashboard/layoutconfig/PhabricatorDashboardLayoutConfig.php
	+++ b/src/applications/dashboard/layoutconfig/PhabricatorDashboardLayoutConfig.php
	@@ -120,7 +120,8 @@
	case self::MODE_THIRDS_AND_THIRD:
	return array(
	0 => pht('Left'),
	- 1 => pht('Right'));
	+ 1 => pht('Right'),
	+ );
	break;
	case self::MODE_FULL:
	throw new Exception('There is only one column in mode full.');
	@@ -156,7 +157,7 @@
	public function toDictionary() {
	return array(
	'layoutMode' => $this->getLayoutMode(),
	- 'panelLocations' => $this->getPanelLocations()
	+ 'panelLocations' => $this->getPanelLocations(),
	);
	}

	diff --git a/src/applications/dashboard/query/PhabricatorDashboardSearchEngine.php b/src/applications/dashboard/query/PhabricatorDashboardSearchEngine.php
	--- a/src/applications/dashboard/query/PhabricatorDashboardSearchEngine.php
	+++ b/src/applications/dashboard/query/PhabricatorDashboardSearchEngine.php
	@@ -60,8 +60,10 @@
	$installs = id(new PhabricatorDashboardInstall())
	->loadAllWhere(
	'objectPHID IN (%Ls) AND dashboardPHID IN (%Ls)',
	- array(PhabricatorHomeApplication::DASHBOARD_DEFAULT,
	- $viewer->getPHID()),
	+ array(
	+ PhabricatorHomeApplication::DASHBOARD_DEFAULT,
	+ $viewer->getPHID(),
	+ ),
	array_keys($dashboards));
	$installs = mpull($installs, null, 'getDashboardPHID');
	} else {
	@@ -87,12 +89,14 @@
	if ($install->getObjectPHID() == $viewer->getPHID()) {
	$attrs = array(
	'tip' => pht(
	- 'This dashboard is installed to your personal homepage.'));
	+ 'This dashboard is installed to your personal homepage.'),
	+ );
	$item->addIcon('fa-user', pht('Installed'), $attrs);
	} else {
	$attrs = array(
	'tip' => pht(
	- 'This dashboard is the default homepage for all users.'));
	+ 'This dashboard is the default homepage for all users.'),
	+ );
	$item->addIcon('fa-globe', pht('Installed'), $attrs);
	}
	}
	diff --git a/src/applications/differential/conduit/DifferentialCreateInlineConduitAPIMethod.php b/src/applications/differential/conduit/DifferentialCreateInlineConduitAPIMethod.php
	--- a/src/applications/differential/conduit/DifferentialCreateInlineConduitAPIMethod.php
	+++ b/src/applications/differential/conduit/DifferentialCreateInlineConduitAPIMethod.php
	@@ -33,7 +33,7 @@
	'ERR-BAD-DIFF' => 'Bad diff ID, or diff does not belong to revision.',
	'ERR-NEED-DIFF' => 'Neither revision ID nor diff ID was provided.',
	'ERR-NEED-FILE' => 'A file path was not provided.',
	- 'ERR-BAD-FILE' => "Requested file doesn't exist in this revision."
	+ 'ERR-BAD-FILE' => "Requested file doesn't exist in this revision.",
	);
	}

	diff --git a/src/applications/differential/conduit/DifferentialFinishPostponedLintersConduitAPIMethod.php b/src/applications/differential/conduit/DifferentialFinishPostponedLintersConduitAPIMethod.php
	--- a/src/applications/differential/conduit/DifferentialFinishPostponedLintersConduitAPIMethod.php
	+++ b/src/applications/differential/conduit/DifferentialFinishPostponedLintersConduitAPIMethod.php
	@@ -101,7 +101,8 @@
	array(
	'diff_id' => $diff_id,
	'name' => 'arc:lint',
	- 'data' => json_encode($messages)));
	+ 'data' => json_encode($messages),
	+ ));
	$call->setForceLocal(true);
	$call->setUser($request->getUser());
	$call->execute();
	@@ -110,7 +111,8 @@
	array(
	'diff_id' => $diff_id,
	'name' => 'arc:lint-postponed',
	- 'data' => json_encode($postponed_linters)));
	+ 'data' => json_encode($postponed_linters),
	+ ));
	$call->setForceLocal(true);
	$call->setUser($request->getUser());
	$call->execute();
	diff --git a/src/applications/differential/conduit/DifferentialGetRevisionConduitAPIMethod.php b/src/applications/differential/conduit/DifferentialGetRevisionConduitAPIMethod.php
	--- a/src/applications/differential/conduit/DifferentialGetRevisionConduitAPIMethod.php
	+++ b/src/applications/differential/conduit/DifferentialGetRevisionConduitAPIMethod.php
	@@ -94,7 +94,7 @@
	'reviewerPHIDs' => $reviewer_phids,
	'diffs' => $diff_dicts,
	'commits' => $commit_dicts,
	- 'auxiliary' => idx($field_data, $revision->getPHID(), array())
	+ 'auxiliary' => idx($field_data, $revision->getPHID(), array()),
	);

	return $dict;
	diff --git a/src/applications/differential/conduit/DifferentialUpdateUnitResultsConduitAPIMethod.php b/src/applications/differential/conduit/DifferentialUpdateUnitResultsConduitAPIMethod.php
	--- a/src/applications/differential/conduit/DifferentialUpdateUnitResultsConduitAPIMethod.php
	+++ b/src/applications/differential/conduit/DifferentialUpdateUnitResultsConduitAPIMethod.php
	@@ -115,7 +115,8 @@
	DifferentialUnitTestResult::RESULT_SKIP =>
	DifferentialUnitStatus::UNIT_OKAY,
	DifferentialUnitTestResult::RESULT_POSTPONED =>
	- DifferentialUnitStatus::UNIT_POSTPONED);
	+ DifferentialUnitStatus::UNIT_POSTPONED,
	+ );

	// These are the relative priorities for the unit test results
	$status_codes_priority =
	@@ -123,7 +124,8 @@
	DifferentialUnitStatus::UNIT_OKAY => 1,
	DifferentialUnitStatus::UNIT_WARN => 2,
	DifferentialUnitStatus::UNIT_POSTPONED => 3,
	- DifferentialUnitStatus::UNIT_FAIL => 4);
	+ DifferentialUnitStatus::UNIT_FAIL => 4,
	+ );

	// Walk the now-current list of status codes to find the overall diff
	// status
	diff --git a/src/applications/differential/controller/DifferentialRevisionLandController.php b/src/applications/differential/controller/DifferentialRevisionLandController.php
	--- a/src/applications/differential/controller/DifferentialRevisionLandController.php
	+++ b/src/applications/differential/controller/DifferentialRevisionLandController.php
	@@ -145,8 +145,8 @@
	$looksoon = new ConduitCall(
	'diffusion.looksoon',
	array(
	- 'callsigns' => array($repository->getCallsign())
	- ));
	+ 'callsigns' => array($repository->getCallsign()),
	+ ));
	$looksoon->setUser($request->getUser());
	$looksoon->execute();

	diff --git a/src/applications/differential/render/DifferentialChangesetHTMLRenderer.php b/src/applications/differential/render/DifferentialChangesetHTMLRenderer.php
	--- a/src/applications/differential/render/DifferentialChangesetHTMLRenderer.php
	+++ b/src/applications/differential/render/DifferentialChangesetHTMLRenderer.php
	@@ -328,7 +328,7 @@
	$row = array(
	$readable_key,
	$oval,
	- $nval
	+ $nval,
	);
	$rows[] = $row;

	diff --git a/src/applications/differential/render/DifferentialChangesetTwoUpRenderer.php b/src/applications/differential/render/DifferentialChangesetTwoUpRenderer.php
	--- a/src/applications/differential/render/DifferentialChangesetTwoUpRenderer.php
	+++ b/src/applications/differential/render/DifferentialChangesetTwoUpRenderer.php
	@@ -25,7 +25,7 @@
	'td',
	array(
	'colspan' => 6,
	- 'class' => 'show-more'
	+ 'class' => 'show-more',
	),
	pht('Context not available.')));
	}
	@@ -302,7 +302,7 @@
	array('class' => $n_classes, 'colspan' => $n_colspan),
	array(
	phutil_tag('span', array('class' => 'zwsp'), $zero_space),
	- $n_text
	+ $n_text,
	)),
	$n_cov,
	));
	@@ -365,7 +365,7 @@
	$old = phutil_tag(
	'div',
	array(
	- 'class' => 'differential-image-stage'
	+ 'class' => 'differential-image-stage',
	),
	phutil_tag(
	'img',
	@@ -379,7 +379,7 @@
	$new = phutil_tag(
	'div',
	array(
	- 'class' => 'differential-image-stage'
	+ 'class' => 'differential-image-stage',
	),
	phutil_tag(
	'img',
	diff --git a/src/applications/differential/storage/DifferentialDiff.php b/src/applications/differential/storage/DifferentialDiff.php
	--- a/src/applications/differential/storage/DifferentialDiff.php
	+++ b/src/applications/differential/storage/DifferentialDiff.php
	@@ -229,7 +229,7 @@
	'lintStatus' => $this->getLintStatus(),
	'changes' => array(),
	'properties' => array(),
	- 'projectName' => $this->getArcanistProjectName()
	+ 'projectName' => $this->getArcanistProjectName(),
	);

	$dict['changes'] = $this->buildChangesList();
	diff --git a/src/applications/differential/view/DifferentialChangesetDetailView.php b/src/applications/differential/view/DifferentialChangesetDetailView.php
	--- a/src/applications/differential/view/DifferentialChangesetDetailView.php
	+++ b/src/applications/differential/view/DifferentialChangesetDetailView.php
	@@ -215,7 +215,8 @@
	$buttons,
	phutil_tag('h1',
	array(
	- 'class' => 'differential-file-icon-header'),
	+ 'class' => 'differential-file-icon-header',
	+ ),
	array(
	$icon,
	$display_filename,
	diff --git a/src/applications/differential/view/DifferentialChangesetListView.php b/src/applications/differential/view/DifferentialChangesetListView.php
	--- a/src/applications/differential/view/DifferentialChangesetListView.php
	+++ b/src/applications/differential/view/DifferentialChangesetListView.php
	@@ -110,8 +110,9 @@
	Javelin::initBehavior('differential-toggle-files', array(
	'pht' => array(
	'undo' => pht('Undo'),
	- 'collapsed' => pht('This file content has been collapsed.'))
	- ));
	+ 'collapsed' => pht('This file content has been collapsed.'),
	+ ),
	+ ));
	Javelin::initBehavior(
	'differential-dropdown-menus',
	array(
	diff --git a/src/applications/differential/view/DifferentialDiffTableOfContentsView.php b/src/applications/differential/view/DifferentialDiffTableOfContentsView.php
	--- a/src/applications/differential/view/DifferentialDiffTableOfContentsView.php
	+++ b/src/applications/differential/view/DifferentialDiffTableOfContentsView.php
	@@ -160,7 +160,7 @@
	$meta = phutil_tag(
	'div',
	array(
	- 'class' => 'differential-toc-meta'
	+ 'class' => 'differential-toc-meta',
	),
	$meta);
	}
	@@ -176,7 +176,7 @@
	$desc,
	array($link, $lines, $meta),
	$cov,
	- $mcov
	+ $mcov,
	);
	}

	@@ -210,11 +210,11 @@
	$buttons = phutil_tag(
	'div',
	array(
	- 'class' => 'differential-toc-buttons grouped'
	+ 'class' => 'differential-toc-buttons grouped',
	),
	array(
	$editor_link,
	- $reveal_link
	+ $reveal_link,
	));

	$table = id(new AphrontTableView($rows));
	diff --git a/src/applications/differential/view/DifferentialLocalCommitsView.php b/src/applications/differential/view/DifferentialLocalCommitsView.php
	--- a/src/applications/differential/view/DifferentialLocalCommitsView.php
	+++ b/src/applications/differential/view/DifferentialLocalCommitsView.php
	@@ -144,7 +144,8 @@
	$link = phutil_tag(
	'a',
	array(
	- 'href' => $commit_for_link->getURI()),
	+ 'href' => $commit_for_link->getURI(),
	+ ),
	$commit_hash);
	} else {
	$link = $commit_hash;
	diff --git a/src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php b/src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php
	--- a/src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php
	+++ b/src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php
	@@ -314,7 +314,7 @@
	DifferentialLintStatus::LINT_FAIL => self::STAR_FAIL,
	DifferentialLintStatus::LINT_SKIP => self::STAR_SKIP,
	DifferentialLintStatus::LINT_AUTO_SKIP => self::STAR_SKIP,
	- DifferentialLintStatus::LINT_POSTPONED => self::STAR_SKIP
	+ DifferentialLintStatus::LINT_POSTPONED => self::STAR_SKIP,
	);

	$star = idx($map, $diff->getLintStatus(), self::STAR_FAIL);
	diff --git a/src/applications/diffusion/conduit/DiffusionDiffQueryConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionDiffQueryConduitAPIMethod.php
	--- a/src/applications/diffusion/conduit/DiffusionDiffQueryConduitAPIMethod.php
	+++ b/src/applications/diffusion/conduit/DiffusionDiffQueryConduitAPIMethod.php
	@@ -81,7 +81,8 @@
	if ($path->getTargetPath()) {
	$old = array(
	$path->getTargetPath(),
	- $path->getTargetCommitIdentifier());
	+ $path->getTargetCommitIdentifier(),
	+ );
	} else {
	$old = array($path->getPath(), $path->getCommitIdentifier() - 1);
	}
	@@ -99,7 +100,8 @@
	case DifferentialChangeType::TYPE_COPY_HERE:
	$old = array(
	$path->getTargetPath(),
	- $path->getTargetCommitIdentifier());
	+ $path->getTargetCommitIdentifier(),
	+ );
	$new = array($path->getPath(), $path->getCommitIdentifier());
	$old_name = $path->getTargetPath();
	$new_name = $path->getPath();
	@@ -107,7 +109,8 @@
	case DifferentialChangeType::TYPE_MOVE_AWAY:
	$old = array(
	$path->getPath(),
	- $path->getCommitIdentifier() - 1);
	+ $path->getCommitIdentifier() - 1,
	+ );
	$old_name = $path->getPath();
	$new_name = null;
	$new = null;
	diff --git a/src/applications/diffusion/conduit/DiffusionExistsQueryConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionExistsQueryConduitAPIMethod.php
	--- a/src/applications/diffusion/conduit/DiffusionExistsQueryConduitAPIMethod.php
	+++ b/src/applications/diffusion/conduit/DiffusionExistsQueryConduitAPIMethod.php
	@@ -17,7 +17,7 @@

	protected function defineCustomParamTypes() {
	return array(
	- 'commit' => 'required string'
	+ 'commit' => 'required string',
	);
	}

	diff --git a/src/applications/diffusion/conduit/DiffusionGetRecentCommitsByPathConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionGetRecentCommitsByPathConduitAPIMethod.php
	--- a/src/applications/diffusion/conduit/DiffusionGetRecentCommitsByPathConduitAPIMethod.php
	+++ b/src/applications/diffusion/conduit/DiffusionGetRecentCommitsByPathConduitAPIMethod.php
	@@ -54,7 +54,8 @@
	'offset' => 0,
	'limit' => $limit,
	'needDirectChanges' => true,
	- 'needChildChanges' => true));
	+ 'needChildChanges' => true,
	+ ));
	$history = DiffusionPathChange::newFromConduit(
	$history_result['pathChanges']);

	diff --git a/src/applications/diffusion/conduit/DiffusionQueryCommitsConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionQueryCommitsConduitAPIMethod.php
	--- a/src/applications/diffusion/conduit/DiffusionQueryCommitsConduitAPIMethod.php
	+++ b/src/applications/diffusion/conduit/DiffusionQueryCommitsConduitAPIMethod.php
	@@ -119,7 +119,8 @@
	foreach ($lowlevel_commitref->getHashes() as $hash) {
	$dict['hashes'][] = array(
	'type' => $hash->getHashType(),
	- 'value' => $hash->getHashValue());
	+ 'value' => $hash->getHashValue(),
	+ );
	}
	}

	diff --git a/src/applications/diffusion/conduit/DiffusionQueryConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionQueryConduitAPIMethod.php
	--- a/src/applications/diffusion/conduit/DiffusionQueryConduitAPIMethod.php
	+++ b/src/applications/diffusion/conduit/DiffusionQueryConduitAPIMethod.php
	@@ -42,7 +42,8 @@
	'ERR-UNKNOWN-VCS-TYPE' =>
	pht('Unknown repository VCS type.'),
	'ERR-UNSUPPORTED-VCS' =>
	- pht('VCS is not supported for this method.'));
	+ pht('VCS is not supported for this method.'),
	+ );
	}

	/**
	diff --git a/src/applications/diffusion/conduit/DiffusionRefsQueryConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionRefsQueryConduitAPIMethod.php
	--- a/src/applications/diffusion/conduit/DiffusionRefsQueryConduitAPIMethod.php
	+++ b/src/applications/diffusion/conduit/DiffusionRefsQueryConduitAPIMethod.php
	@@ -49,7 +49,8 @@
	array(
	'action' => 'browse',
	'branch' => $ref,
	- )));
	+ )),
	+ );
	}

	return $ref_links;
	diff --git a/src/applications/diffusion/conduit/DiffusionSearchQueryConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionSearchQueryConduitAPIMethod.php
	--- a/src/applications/diffusion/conduit/DiffusionSearchQueryConduitAPIMethod.php
	+++ b/src/applications/diffusion/conduit/DiffusionSearchQueryConduitAPIMethod.php
	@@ -27,7 +27,8 @@

	protected function defineCustomErrorTypes() {
	return array(
	- 'ERR-GREP-COMMAND' => 'Grep command failed.');
	+ 'ERR-GREP-COMMAND' => 'Grep command failed.',
	+ );
	}

	protected function getResult(ConduitAPIRequest $request) {
	diff --git a/src/applications/diffusion/controller/DiffusionBranchTableController.php b/src/applications/diffusion/controller/DiffusionBranchTableController.php
	--- a/src/applications/diffusion/controller/DiffusionBranchTableController.php
	+++ b/src/applications/diffusion/controller/DiffusionBranchTableController.php
	@@ -22,7 +22,7 @@
	'diffusion.branchquery',
	array(
	'offset' => $pager->getOffset(),
	- 'limit' => $pager->getPageSize() + 1
	+ 'limit' => $pager->getPageSize() + 1,
	));
	$branches = $pager->sliceResults($branches);

	diff --git a/src/applications/diffusion/controller/DiffusionBrowseFileController.php b/src/applications/diffusion/controller/DiffusionBrowseFileController.php
	--- a/src/applications/diffusion/controller/DiffusionBrowseFileController.php
	+++ b/src/applications/diffusion/controller/DiffusionBrowseFileController.php
	@@ -1016,7 +1016,8 @@
	array(
	'commit' => $drequest->getCommit(),
	'path' => $drequest->getPath(),
	- 'againstCommit' => $target_commit));
	+ 'againstCommit' => $target_commit,
	+ ));
	$old_line = 0;
	$new_line = 0;

	diff --git a/src/applications/diffusion/controller/DiffusionChangeController.php b/src/applications/diffusion/controller/DiffusionChangeController.php
	--- a/src/applications/diffusion/controller/DiffusionChangeController.php
	+++ b/src/applications/diffusion/controller/DiffusionChangeController.php
	@@ -43,7 +43,7 @@
	$changeset_view->setVisibleChangesets($changesets);
	$changeset_view->setRenderingReferences(
	array(
	- 0 => $drequest->generateURI(array('action' => 'rendering-ref'))
	+ 0 => $drequest->generateURI(array('action' => 'rendering-ref')),
	));

	$raw_params = array(
	diff --git a/src/applications/diffusion/controller/DiffusionCommitController.php b/src/applications/diffusion/controller/DiffusionCommitController.php
	--- a/src/applications/diffusion/controller/DiffusionCommitController.php
	+++ b/src/applications/diffusion/controller/DiffusionCommitController.php
	@@ -796,7 +796,7 @@
	'aphront-panel-preview aphront-panel-flush',
	array(
	phutil_tag('div', array('id' => 'audit-preview'), $loading),
	- phutil_tag('div', array('id' => 'inline-comment-preview'))
	+ phutil_tag('div', array('id' => 'inline-comment-preview')),
	));

	// TODO: This is pretty awkward, unify the CSS between Diffusion and
	@@ -911,7 +911,8 @@
	'diffusion.mergedcommitsquery',
	array(
	'commit' => $drequest->getCommit(),
	- 'limit' => $limit + 1));
	+ 'limit' => $limit + 1,
	+ ));
	} catch (ConduitException $ex) {
	if ($ex->getMessage() != 'ERR-UNSUPPORTED-VCS') {
	throw $ex;
	@@ -1026,7 +1027,8 @@
	'diffusion.rawdiffquery',
	array(
	'commit' => $drequest->getCommit(),
	- 'path' => $drequest->getPath()));
	+ 'path' => $drequest->getPath(),
	+ ));

	$file = PhabricatorFile::buildFromFileDataOrHash(
	$raw_diff,
	diff --git a/src/applications/diffusion/controller/DiffusionCommitTagsController.php b/src/applications/diffusion/controller/DiffusionCommitTagsController.php
	--- a/src/applications/diffusion/controller/DiffusionCommitTagsController.php
	+++ b/src/applications/diffusion/controller/DiffusionCommitTagsController.php
	@@ -22,7 +22,8 @@
	'diffusion.tagsquery',
	array(
	'commit' => $request->getCommit(),
	- 'limit' => $tag_limit + 1)));
	+ 'limit' => $tag_limit + 1,
	+ )));
	} catch (ConduitException $ex) {
	if ($ex->getMessage() != 'ERR-UNSUPPORTED-VCS') {
	throw $ex;
	diff --git a/src/applications/diffusion/controller/DiffusionController.php b/src/applications/diffusion/controller/DiffusionController.php
	--- a/src/applications/diffusion/controller/DiffusionController.php
	+++ b/src/applications/diffusion/controller/DiffusionController.php
	@@ -184,7 +184,8 @@
	$divider = phutil_tag(
	'span',
	array(
	- 'class' => 'phui-header-divider'),
	+ 'class' => 'phui-header-divider',
	+ ),
	'/');

	$links = array();
	diff --git a/src/applications/diffusion/controller/DiffusionDiffController.php b/src/applications/diffusion/controller/DiffusionDiffController.php
	--- a/src/applications/diffusion/controller/DiffusionDiffController.php
	+++ b/src/applications/diffusion/controller/DiffusionDiffController.php
	@@ -50,7 +50,8 @@
	'diffusion.diffquery',
	array(
	'commit' => $drequest->getCommit(),
	- 'path' => $drequest->getPath()));
	+ 'path' => $drequest->getPath(),
	+ ));
	$drequest->updateSymbolicCommit($data['effectiveCommit']);
	$raw_changes = ArcanistDiffChange::newFromConduit($data['changes']);
	$diff = DifferentialDiff::newFromRawChanges($raw_changes);
	@@ -66,7 +67,8 @@
	$parser->setChangeset($changeset);
	$parser->setRenderingReference($drequest->generateURI(
	array(
	- 'action' => 'rendering-ref')));
	+ 'action' => 'rendering-ref',
	+ )));

	$parser->setCharacterEncoding($request->getStr('encoding'));
	$parser->setHighlightAs($request->getStr('highlight'));
	diff --git a/src/applications/diffusion/controller/DiffusionHistoryController.php b/src/applications/diffusion/controller/DiffusionHistoryController.php
	--- a/src/applications/diffusion/controller/DiffusionHistoryController.php
	+++ b/src/applications/diffusion/controller/DiffusionHistoryController.php
	@@ -19,7 +19,8 @@
	'commit' => $drequest->getCommit(),
	'path' => $drequest->getPath(),
	'offset' => $offset,
	- 'limit' => $page_size + 1);
	+ 'limit' => $page_size + 1,
	+ );

	if (!$request->getBool('copies')) {
	$params['needDirectChanges'] = true;
	diff --git a/src/applications/diffusion/controller/DiffusionLastModifiedController.php b/src/applications/diffusion/controller/DiffusionLastModifiedController.php
	--- a/src/applications/diffusion/controller/DiffusionLastModifiedController.php
	+++ b/src/applications/diffusion/controller/DiffusionLastModifiedController.php
	@@ -145,10 +145,12 @@
	if ($lint !== null) {
	$return['lint'] = phutil_tag(
	'a',
	- array('href' => $drequest->generateURI(array(
	- 'action' => 'lint',
	- 'lint' => null,
	- ))),
	+ array(
	+ 'href' => $drequest->generateURI(array(
	+ 'action' => 'lint',
	+ 'lint' => null,
	+ )),
	+ ),
	number_format($lint));
	}

	diff --git a/src/applications/diffusion/controller/DiffusionLintDetailsController.php b/src/applications/diffusion/controller/DiffusionLintDetailsController.php
	--- a/src/applications/diffusion/controller/DiffusionLintDetailsController.php
	+++ b/src/applications/diffusion/controller/DiffusionLintDetailsController.php
	@@ -17,20 +17,24 @@
	foreach ($messages as $message) {
	$path = phutil_tag(
	'a',
	- array('href' => $drequest->generateURI(array(
	- 'action' => 'lint',
	- 'path' => $message['path'],
	- ))),
	+ array(
	+ 'href' => $drequest->generateURI(array(
	+ 'action' => 'lint',
	+ 'path' => $message['path'],
	+ )),
	+ ),
	substr($message['path'], strlen($drequest->getPath()) + 1));

	$line = phutil_tag(
	'a',
	- array('href' => $drequest->generateURI(array(
	- 'action' => 'browse',
	- 'path' => $message['path'],
	- 'line' => $message['line'],
	- 'commit' => $branch->getLintCommit(),
	- ))),
	+ array(
	+ 'href' => $drequest->generateURI(array(
	+ 'action' => 'browse',
	+ 'path' => $message['path'],
	+ 'line' => $message['line'],
	+ 'commit' => $branch->getLintCommit(),
	+ )),
	+ ),
	$message['line']);

	$author = $message['authorPHID'];
	@@ -90,7 +94,8 @@
	array(
	pht('Lint'),
	$drequest->getRepository()->getCallsign(),
	- )));
	+ ),
	+ ));
	}

	private function loadLintMessages(
	diff --git a/src/applications/diffusion/controller/DiffusionRepositoryController.php b/src/applications/diffusion/controller/DiffusionRepositoryController.php
	--- a/src/applications/diffusion/controller/DiffusionRepositoryController.php
	+++ b/src/applications/diffusion/controller/DiffusionRepositoryController.php
	@@ -96,7 +96,8 @@
	'commit' => $drequest->getCommit(),
	'path' => $drequest->getPath(),
	'offset' => 0,
	- 'limit' => 15));
	+ 'limit' => 15,
	+ ));
	$history = DiffusionPathChange::newFromConduit(
	$history_results['pathChanges']);

	diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditBasicController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditBasicController.php
	--- a/src/applications/diffusion/controller/DiffusionRepositoryEditBasicController.php
	+++ b/src/applications/diffusion/controller/DiffusionRepositoryEditBasicController.php
	@@ -144,7 +144,8 @@
	return $this->buildApplicationPage(
	array(
	$crumbs,
	- $object_box),
	+ $object_box,
	+ ),
	array(
	'title' => $title,
	));
	diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditHostingController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditHostingController.php
	--- a/src/applications/diffusion/controller/DiffusionRepositoryEditHostingController.php
	+++ b/src/applications/diffusion/controller/DiffusionRepositoryEditHostingController.php
	@@ -186,7 +186,8 @@
	'%s: This repository is hosted elsewhere, so Phabricator can not '.
	'perform writes. This mode will act like "Read Only" for '.
	'repositories hosted elsewhere.',
	- phutil_tag('strong', array(), 'WARNING')));
	+ phutil_tag('strong', array(), 'WARNING')),
	+ );
	}

	$ssh_control =
	diff --git a/src/applications/diffusion/controller/DiffusionTagListController.php b/src/applications/diffusion/controller/DiffusionTagListController.php
	--- a/src/applications/diffusion/controller/DiffusionTagListController.php
	+++ b/src/applications/diffusion/controller/DiffusionTagListController.php
	@@ -19,7 +19,8 @@

	$params = array(
	'limit' => $pager->getPageSize() + 1,
	- 'offset' => $pager->getOffset());
	+ 'offset' => $pager->getOffset(),
	+ );

	if ($drequest->getSymbolicCommit()) {
	$is_commit = true;
	diff --git a/src/applications/diffusion/data/DiffusionBrowseResultSet.php b/src/applications/diffusion/data/DiffusionBrowseResultSet.php
	--- a/src/applications/diffusion/data/DiffusionBrowseResultSet.php
	+++ b/src/applications/diffusion/data/DiffusionBrowseResultSet.php
	@@ -64,7 +64,8 @@
	'isValidResults' => $this->isValidResults(),
	'reasonForEmptyResultSet' => $this->getReasonForEmptyResultSet(),
	'existedAtCommit' => $this->getExistedAtCommit(),
	- 'deletedAtCommit' => $this->getDeletedAtCommit());
	+ 'deletedAtCommit' => $this->getDeletedAtCommit(),
	+ );
	}

	public function getPathDicts() {
	diff --git a/src/applications/diffusion/data/DiffusionFileContent.php b/src/applications/diffusion/data/DiffusionFileContent.php
	--- a/src/applications/diffusion/data/DiffusionFileContent.php
	+++ b/src/applications/diffusion/data/DiffusionFileContent.php
	@@ -48,7 +48,7 @@
	'corpus' => $this->getCorpus(),
	'blameDict' => $this->getBlameDict(),
	'revList' => $this->getRevList(),
	- 'textList' => $this->getTextList()
	+ 'textList' => $this->getTextList(),
	);
	}

	diff --git a/src/applications/diffusion/data/DiffusionPathChange.php b/src/applications/diffusion/data/DiffusionPathChange.php
	--- a/src/applications/diffusion/data/DiffusionPathChange.php
	+++ b/src/applications/diffusion/data/DiffusionPathChange.php
	@@ -171,7 +171,8 @@
	'changeType' => $this->getChangeType(),
	'targetPath' => $this->getTargetPath(),
	'targetCommitIdentifier' => $this->getTargetCommitIdentifier(),
	- 'awayPaths' => $this->getAwayPaths());
	+ 'awayPaths' => $this->getAwayPaths(),
	+ );
	}

	public static function newFromConduit(array $dicts) {
	diff --git a/src/applications/diffusion/view/DiffusionBranchTableView.php b/src/applications/diffusion/view/DiffusionBranchTableView.php
	--- a/src/applications/diffusion/view/DiffusionBranchTableView.php
	+++ b/src/applications/diffusion/view/DiffusionBranchTableView.php
	@@ -83,7 +83,7 @@
	array(
	'action' => 'history',
	'branch' => $branch->getShortName(),
	- ))
	+ )),
	),
	pht('History')),
	phutil_tag(
	diff --git a/src/applications/diffusion/view/DiffusionHistoryTableView.php b/src/applications/diffusion/view/DiffusionHistoryTableView.php
	--- a/src/applications/diffusion/view/DiffusionHistoryTableView.php
	+++ b/src/applications/diffusion/view/DiffusionHistoryTableView.php
	@@ -171,7 +171,8 @@
	'span',
	array(
	'sigil' => 'has-tooltip',
	- 'meta' => array('tip' => $name)),
	+ 'meta' => array('tip' => $name),
	+ ),
	$icon_view);

	Javelin::initBehavior('phabricator-tooltips');
	diff --git a/src/applications/diviner/controller/DivinerAtomController.php b/src/applications/diviner/controller/DivinerAtomController.php
	--- a/src/applications/diviner/controller/DivinerAtomController.php
	+++ b/src/applications/diviner/controller/DivinerAtomController.php
	@@ -174,7 +174,8 @@
	$item = array(
	$item,
	" \xE2\x80\x94 ",
	- $atom->getSummary());
	+ $atom->getSummary(),
	+ );
	}

	$list_items[] = phutil_tag('li', array(), $item);
	@@ -280,7 +281,8 @@
	$items[] = array(
	$this->renderAtomTag($iface),
	" \xE2\x97\x80 ",
	- $this->renderAtomTag($via));
	+ $this->renderAtomTag($via),
	+ );
	}
	}

	diff --git a/src/applications/diviner/view/DivinerBookItemView.php b/src/applications/diviner/view/DivinerBookItemView.php
	--- a/src/applications/diviner/view/DivinerBookItemView.php
	+++ b/src/applications/diviner/view/DivinerBookItemView.php
	@@ -44,21 +44,21 @@
	$title = phutil_tag(
	'span',
	array(
	- 'class' => 'diviner-book-item-title'
	+ 'class' => 'diviner-book-item-title',
	),
	$this->title);

	$subtitle = phutil_tag(
	'span',
	array(
	- 'class' => 'diviner-book-item-subtitle'
	+ 'class' => 'diviner-book-item-subtitle',
	),
	$this->subtitle);

	$type = phutil_tag(
	'span',
	array(
	- 'class' => 'diviner-book-item-type'
	+ 'class' => 'diviner-book-item-type',
	),
	$this->type);

	diff --git a/src/applications/diviner/view/DivinerParameterTableView.php b/src/applications/diviner/view/DivinerParameterTableView.php
	--- a/src/applications/diviner/view/DivinerParameterTableView.php
	+++ b/src/applications/diviner/view/DivinerParameterTableView.php
	@@ -67,13 +67,14 @@
	$table = phutil_tag(
	'table',
	array(
	- 'class' => 'diviner-parameter-table-view'),
	+ 'class' => 'diviner-parameter-table-view',
	+ ),
	$rows);

	$header = phutil_tag(
	'span',
	array(
	- 'class' => 'diviner-table-header'
	+ 'class' => 'diviner-table-header',
	),
	$this->header);

	diff --git a/src/applications/diviner/view/DivinerReturnTableView.php b/src/applications/diviner/view/DivinerReturnTableView.php
	--- a/src/applications/diviner/view/DivinerReturnTableView.php
	+++ b/src/applications/diviner/view/DivinerReturnTableView.php
	@@ -61,13 +61,14 @@
	$table = phutil_tag(
	'table',
	array(
	- 'class' => 'diviner-return-table-view'),
	+ 'class' => 'diviner-return-table-view',
	+ ),
	$rows);

	$header = phutil_tag(
	'span',
	array(
	- 'class' => 'diviner-table-header'
	+ 'class' => 'diviner-table-header',
	),
	$this->header);

	diff --git a/src/applications/doorkeeper/bridge/__tests__/DoorkeeperBridgeJIRATestCase.php b/src/applications/doorkeeper/bridge/__tests__/DoorkeeperBridgeJIRATestCase.php
	--- a/src/applications/doorkeeper/bridge/__tests__/DoorkeeperBridgeJIRATestCase.php
	+++ b/src/applications/doorkeeper/bridge/__tests__/DoorkeeperBridgeJIRATestCase.php
	@@ -8,13 +8,13 @@
	// Installed at domain root.
	'http://jira.example.com/rest/api/2/issue/1',
	'TP-1',
	- 'http://jira.example.com/browse/TP-1'
	+ 'http://jira.example.com/browse/TP-1',
	),
	array(
	// Installed on path.
	'http://jira.example.com/jira/rest/api/2/issue/1',
	'TP-1',
	- 'http://jira.example.com/jira/browse/TP-1'
	+ 'http://jira.example.com/jira/browse/TP-1',
	),
	array(
	// A URI we don't understand.
	diff --git a/src/applications/doorkeeper/option/PhabricatorAsanaConfigOptions.php b/src/applications/doorkeeper/option/PhabricatorAsanaConfigOptions.php
	--- a/src/applications/doorkeeper/option/PhabricatorAsanaConfigOptions.php
	+++ b/src/applications/doorkeeper/option/PhabricatorAsanaConfigOptions.php
	@@ -30,7 +30,7 @@
	'object in Phabricator comes from. For example, you can add code '.
	'reviews in Asana to a "Differential" project.'.
	"\n\n".
	- 'NOTE: This feature is new and experimental.'))
	+ 'NOTE: This feature is new and experimental.')),
	);
	}

	diff --git a/src/applications/drydock/blueprint/DrydockPreallocatedHostBlueprintImplementation.php b/src/applications/drydock/blueprint/DrydockPreallocatedHostBlueprintImplementation.php
	--- a/src/applications/drydock/blueprint/DrydockPreallocatedHostBlueprintImplementation.php
	+++ b/src/applications/drydock/blueprint/DrydockPreallocatedHostBlueprintImplementation.php
	@@ -108,14 +108,16 @@
	'host' => $resource->getAttribute('host'),
	'port' => $resource->getAttribute('port'),
	'credential' => $resource->getAttribute('credential'),
	- 'platform' => $resource->getAttribute('platform')))
	+ 'platform' => $resource->getAttribute('platform'),
	+ ))
	->setWorkingDirectory($lease->getAttribute('path'));
	case 'filesystem':
	return id(new DrydockSFTPFilesystemInterface())
	->setConfiguration(array(
	'host' => $resource->getAttribute('host'),
	'port' => $resource->getAttribute('port'),
	- 'credential' => $resource->getAttribute('credential')));
	+ 'credential' => $resource->getAttribute('credential'),
	+ ));
	}

	throw new Exception("No interface of type '{$type}'.");
	diff --git a/src/applications/fact/management/PhabricatorFactManagementCursorsWorkflow.php b/src/applications/fact/management/PhabricatorFactManagementCursorsWorkflow.php
	--- a/src/applications/fact/management/PhabricatorFactManagementCursorsWorkflow.php
	+++ b/src/applications/fact/management/PhabricatorFactManagementCursorsWorkflow.php
	@@ -17,7 +17,7 @@
	'param' => 'cursor',
	'repeat' => true,
	'help' => 'Reset cursor __cursor__.',
	- )
	+ ),
	));
	}

	diff --git a/src/applications/feed/conduit/FeedQueryConduitAPIMethod.php b/src/applications/feed/conduit/FeedQueryConduitAPIMethod.php
	--- a/src/applications/feed/conduit/FeedQueryConduitAPIMethod.php
	+++ b/src/applications/feed/conduit/FeedQueryConduitAPIMethod.php
	@@ -128,7 +128,7 @@
	'authorPHID' => $story_data->getAuthorPHID(),
	'chronologicalKey' => $story_data->getChronologicalKey(),
	'objectPHID' => $story->getPrimaryObjectPHID(),
	- 'text' => $story->renderText()
	+ 'text' => $story->renderText(),
	);
	break;
	default:
	diff --git a/src/applications/files/PhabricatorImageTransformer.php b/src/applications/files/PhabricatorImageTransformer.php
	--- a/src/applications/files/PhabricatorImageTransformer.php
	+++ b/src/applications/files/PhabricatorImageTransformer.php
	@@ -215,7 +215,7 @@
	'dx' => $dx,
	'dy' => $dy,
	'sdx' => $sdx,
	- 'sdy' => $sdy
	+ 'sdy' => $sdy,
	);
	}

	diff --git a/src/applications/files/config/PhabricatorFilesConfigOptions.php b/src/applications/files/config/PhabricatorFilesConfigOptions.php
	--- a/src/applications/files/config/PhabricatorFilesConfigOptions.php
	+++ b/src/applications/files/config/PhabricatorFilesConfigOptions.php
	@@ -184,7 +184,7 @@
	->setBoolOptions(
	array(
	pht('Enable'),
	- pht('Disable')
	+ pht('Disable'),
	))->setDescription(
	pht("This option will enable animated gif images".
	"to be set as profile pictures. The 'convert' binary ".
	diff --git a/src/applications/files/controller/PhabricatorFileInfoController.php b/src/applications/files/controller/PhabricatorFileInfoController.php
	--- a/src/applications/files/controller/PhabricatorFileInfoController.php
	+++ b/src/applications/files/controller/PhabricatorFileInfoController.php
	@@ -78,7 +78,7 @@
	array(
	$crumbs,
	$object_box,
	- $timeline
	+ $timeline,
	),
	array(
	'title' => $file->getName(),
	@@ -126,7 +126,8 @@

	return array(
	$timeline,
	- $add_comment_form);
	+ $add_comment_form,
	+ );
	}

	private function buildActionView(PhabricatorFile $file) {
	diff --git a/src/applications/flag/query/PhabricatorFlagSearchEngine.php b/src/applications/flag/query/PhabricatorFlagSearchEngine.php
	--- a/src/applications/flag/query/PhabricatorFlagSearchEngine.php
	+++ b/src/applications/flag/query/PhabricatorFlagSearchEngine.php
	@@ -116,7 +116,8 @@
	// sort it alphabetically...
	asort($options);
	$default_option = array(
	- 0 => pht('All Object Types'));
	+ 0 => pht('All Object Types'),
	+ );
	// ...and stick the default option on front
	$options = array_merge($default_option, $options);

	diff --git a/src/applications/harbormaster/controller/HarbormasterBuildViewController.php b/src/applications/harbormaster/controller/HarbormasterBuildViewController.php
	--- a/src/applications/harbormaster/controller/HarbormasterBuildViewController.php
	+++ b/src/applications/harbormaster/controller/HarbormasterBuildViewController.php
	@@ -299,7 +299,8 @@
	'div',
	array(
	'style' => 'display: none',
	- 'id' => $id),
	+ 'id' => $id,
	+ ),
	$log_box);
	}

	@@ -377,7 +378,8 @@
	$link_100,
	' - ',
	$link_0,
	- ' Lines'));
	+ ' Lines',
	+ ));
	}

	private function buildActionList(HarbormasterBuild $build) {
	@@ -440,7 +442,8 @@
	->setViewer($viewer)
	->withPHIDs(array(
	$build->getBuildablePHID(),
	- $build->getBuildPlanPHID()))
	+ $build->getBuildPlanPHID(),
	+ ))
	->execute();

	$properties->addProperty(
	diff --git a/src/applications/harbormaster/controller/HarbormasterPlanViewController.php b/src/applications/harbormaster/controller/HarbormasterPlanViewController.php
	--- a/src/applications/harbormaster/controller/HarbormasterPlanViewController.php
	+++ b/src/applications/harbormaster/controller/HarbormasterPlanViewController.php
	@@ -391,7 +391,8 @@
	$note = array(
	phutil_tag('strong', array(), pht('ERROR:')),
	' ',
	- $error);
	+ $error,
	+ );
	} else {
	$note = $bound;
	}
	@@ -457,7 +458,8 @@
	$note = array(
	phutil_tag('strong', array(), pht('ERROR:')),
	' ',
	- $error);
	+ $error,
	+ );
	} else {
	$note = $bound;
	}
	diff --git a/src/applications/harbormaster/editor/HarbormasterBuildTransactionEditor.php b/src/applications/harbormaster/editor/HarbormasterBuildTransactionEditor.php
	--- a/src/applications/harbormaster/editor/HarbormasterBuildTransactionEditor.php
	+++ b/src/applications/harbormaster/editor/HarbormasterBuildTransactionEditor.php
	@@ -94,7 +94,7 @@
	PhabricatorWorker::scheduleTask(
	'HarbormasterBuildWorker',
	array(
	- 'buildID' => $build->getID()
	+ 'buildID' => $build->getID(),
	));
	}

	diff --git a/src/applications/harbormaster/engine/HarbormasterBuildGraph.php b/src/applications/harbormaster/engine/HarbormasterBuildGraph.php
	--- a/src/applications/harbormaster/engine/HarbormasterBuildGraph.php
	+++ b/src/applications/harbormaster/engine/HarbormasterBuildGraph.php
	@@ -33,7 +33,8 @@
	$results[] = array(
	'node' => $steps_by_phid[$node['node']],
	'depth' => $node['depth'],
	- 'cycle' => $node['cycle']);
	+ 'cycle' => $node['cycle'],
	+ );
	}

	return $results;
	diff --git a/src/applications/harbormaster/step/HarbormasterLeaseHostBuildStepImplementation.php b/src/applications/harbormaster/step/HarbormasterLeaseHostBuildStepImplementation.php
	--- a/src/applications/harbormaster/step/HarbormasterLeaseHostBuildStepImplementation.php
	+++ b/src/applications/harbormaster/step/HarbormasterLeaseHostBuildStepImplementation.php
	@@ -37,7 +37,8 @@
	$settings['name'],
	HarbormasterBuildArtifact::TYPE_HOST);
	$artifact->setArtifactData(array(
	- 'drydock-lease' => $lease->getID()));
	+ 'drydock-lease' => $lease->getID(),
	+ ));
	$artifact->save();
	}

	diff --git a/src/applications/harbormaster/step/HarbormasterUploadArtifactBuildStepImplementation.php b/src/applications/harbormaster/step/HarbormasterUploadArtifactBuildStepImplementation.php
	--- a/src/applications/harbormaster/step/HarbormasterUploadArtifactBuildStepImplementation.php
	+++ b/src/applications/harbormaster/step/HarbormasterUploadArtifactBuildStepImplementation.php
	@@ -45,7 +45,8 @@
	$settings['name'],
	HarbormasterBuildArtifact::TYPE_FILE);
	$artifact->setArtifactData(array(
	- 'filePHID' => $file->getPHID()));
	+ 'filePHID' => $file->getPHID(),
	+ ));
	$artifact->save();
	}

	diff --git a/src/applications/harbormaster/step/HarbormasterWaitForPreviousBuildStepImplementation.php b/src/applications/harbormaster/step/HarbormasterWaitForPreviousBuildStepImplementation.php
	--- a/src/applications/harbormaster/step/HarbormasterWaitForPreviousBuildStepImplementation.php
	+++ b/src/applications/harbormaster/step/HarbormasterWaitForPreviousBuildStepImplementation.php
	@@ -60,7 +60,7 @@
	'diffusion.commitparentsquery',
	array(
	'commit' => $commit->getCommitIdentifier(),
	- 'callsign' => $commit->getRepository()->getCallsign()
	+ 'callsign' => $commit->getRepository()->getCallsign(),
	));
	$call->setUser(PhabricatorUser::getOmnipotentUser());
	$parents = $call->execute();
	diff --git a/src/applications/harbormaster/storage/HarbormasterBuildable.php b/src/applications/harbormaster/storage/HarbormasterBuildable.php
	--- a/src/applications/harbormaster/storage/HarbormasterBuildable.php
	+++ b/src/applications/harbormaster/storage/HarbormasterBuildable.php
	@@ -146,7 +146,7 @@
	PhabricatorWorker::scheduleTask(
	'HarbormasterBuildWorker',
	array(
	- 'buildID' => $build->getID()
	+ 'buildID' => $build->getID(),
	));

	return $build;
	diff --git a/src/applications/harbormaster/view/ShellLogView.php b/src/applications/harbormaster/view/ShellLogView.php
	--- a/src/applications/harbormaster/view/ShellLogView.php
	+++ b/src/applications/harbormaster/view/ShellLogView.php
	@@ -95,13 +95,13 @@
	'div',
	array(
	'class' => 'phabricator-source-code-container',
	- 'style' => 'background-color: black; color: white;'
	+ 'style' => 'background-color: black; color: white;',
	),
	phutil_tag(
	'table',
	array(
	'class' => implode(' ', $classes),
	- 'style' => 'background-color: black'
	+ 'style' => 'background-color: black',
	),
	phutil_implode_html('', $rows)));
	}
	diff --git a/src/applications/herald/adapter/HeraldAdapter.php b/src/applications/herald/adapter/HeraldAdapter.php
	--- a/src/applications/herald/adapter/HeraldAdapter.php
	+++ b/src/applications/herald/adapter/HeraldAdapter.php
	@@ -1052,7 +1052,7 @@
	$match_title = phutil_tag(
	'p',
	array(
	- 'class' => 'herald-list-description'
	+ 'class' => 'herald-list-description',
	),
	$match_text);

	@@ -1061,11 +1061,12 @@
	$match_list[] = phutil_tag(
	'div',
	array(
	- 'class' => 'herald-list-item'
	+ 'class' => 'herald-list-item',
	),
	array(
	$icon,
	- $this->renderConditionAsText($condition, $handles)));
	+ $this->renderConditionAsText($condition, $handles),
	+ ));
	}

	$integer_code_for_every = HeraldRepetitionPolicyConfig::toInt(
	@@ -1082,7 +1083,7 @@
	$action_title = phutil_tag(
	'p',
	array(
	- 'class' => 'herald-list-description'
	+ 'class' => 'herald-list-description',
	),
	$action_text);

	@@ -1091,17 +1092,20 @@
	$action_list[] = phutil_tag(
	'div',
	array(
	- 'class' => 'herald-list-item'
	+ 'class' => 'herald-list-item',
	),
	array(
	$icon,
	- $this->renderActionAsText($action, $handles))); }
	+ $this->renderActionAsText($action, $handles),
	+ ));
	+ }

	return array(
	$match_title,
	$match_list,
	$action_title,
	- $action_list);
	+ $action_list,
	+ );
	}

	private function renderConditionAsText(
	diff --git a/src/applications/herald/adapter/HeraldCommitAdapter.php b/src/applications/herald/adapter/HeraldCommitAdapter.php
	--- a/src/applications/herald/adapter/HeraldCommitAdapter.php
	+++ b/src/applications/herald/adapter/HeraldCommitAdapter.php
	@@ -141,7 +141,7 @@
	self::ACTION_EMAIL,
	self::ACTION_AUDIT,
	self::ACTION_APPLY_BUILD_PLANS,
	- self::ACTION_NOTHING
	+ self::ACTION_NOTHING,
	),
	parent::getActions($rule_type));
	case HeraldRuleTypeConfig::RULE_TYPE_PERSONAL:
	diff --git a/src/applications/herald/application/PhabricatorHeraldApplication.php b/src/applications/herald/application/PhabricatorHeraldApplication.php
	--- a/src/applications/herald/application/PhabricatorHeraldApplication.php
	+++ b/src/applications/herald/application/PhabricatorHeraldApplication.php
	@@ -56,8 +56,8 @@
	'(?:query/(?P<queryKey>[^/]+)/)?' => 'HeraldTranscriptListController',
	'(?P<id>[1-9]\d*)/(?:(?P<filter>\w+)/)?'
	=> 'HeraldTranscriptController',
	- )
	- )
	+ ),
	+ ),
	);
	}

	diff --git a/src/applications/herald/controller/HeraldRuleController.php b/src/applications/herald/controller/HeraldRuleController.php
	--- a/src/applications/herald/controller/HeraldRuleController.php
	+++ b/src/applications/herald/controller/HeraldRuleController.php
	@@ -177,7 +177,7 @@
	'href' => '#',
	'class' => 'button green',
	'sigil' => 'create-condition',
	- 'mustcapture' => true
	+ 'mustcapture' => true,
	),
	pht('New Condition')))
	->setDescription(
	@@ -186,7 +186,7 @@
	'table',
	array(
	'sigil' => 'rule-conditions',
	- 'class' => 'herald-condition-table'
	+ 'class' => 'herald-condition-table',
	),
	'')))
	->appendChild(
	@@ -494,8 +494,10 @@
	'template' => $this->buildTokenizerTemplates($handles) + array(
	'rules' => $all_rules,
	),
	- 'author' => array($rule->getAuthorPHID() =>
	- $handles[$rule->getAuthorPHID()]->getName()),
	+ 'author' => array(
	+ $rule->getAuthorPHID() =>
	+ $handles[$rule->getAuthorPHID()]->getName(),
	+ ),
	'info' => $config_info,
	));
	}
	diff --git a/src/applications/herald/storage/__tests__/HeraldRuleTestCase.php b/src/applications/herald/storage/__tests__/HeraldRuleTestCase.php
	--- a/src/applications/herald/storage/__tests__/HeraldRuleTestCase.php
	+++ b/src/applications/herald/storage/__tests__/HeraldRuleTestCase.php
	@@ -32,7 +32,7 @@
	// Global
	1,
	2,
	- 5
	+ 5,
	),
	array_values(mpull($rules, 'getID')));
	}
	diff --git a/src/applications/home/controller/PhabricatorHomeMainController.php b/src/applications/home/controller/PhabricatorHomeMainController.php
	--- a/src/applications/home/controller/PhabricatorHomeMainController.php
	+++ b/src/applications/home/controller/PhabricatorHomeMainController.php
	@@ -327,7 +327,7 @@
	),
	array(
	phutil_tag('strong', array(), $title.': '),
	- $body
	+ $body,
	)));
	$this->minipanels[] = $panel;
	}
	diff --git a/src/applications/legalpad/application/PhabricatorLegalpadApplication.php b/src/applications/legalpad/application/PhabricatorLegalpadApplication.php
	--- a/src/applications/legalpad/application/PhabricatorLegalpadApplication.php
	+++ b/src/applications/legalpad/application/PhabricatorLegalpadApplication.php
	@@ -63,7 +63,8 @@
	'document/' => array(
	'preview/' => 'PhabricatorMarkupPreviewController',
	),
	- ));
	+ ),
	+ );
	}

	protected function getCustomCapabilities() {
	diff --git a/src/applications/legalpad/config/PhabricatorLegalpadConfigOptions.php b/src/applications/legalpad/config/PhabricatorLegalpadConfigOptions.php
	--- a/src/applications/legalpad/config/PhabricatorLegalpadConfigOptions.php
	+++ b/src/applications/legalpad/config/PhabricatorLegalpadConfigOptions.php
	@@ -17,7 +17,7 @@
	'metamta.legalpad.subject-prefix',
	'string',
	'[Legalpad]')
	- ->setDescription(pht('Subject prefix for Legalpad email.'))
	+ ->setDescription(pht('Subject prefix for Legalpad email.')),
	);
	}

	diff --git a/src/applications/legalpad/controller/LegalpadDocumentEditController.php b/src/applications/legalpad/controller/LegalpadDocumentEditController.php
	--- a/src/applications/legalpad/controller/LegalpadDocumentEditController.php
	+++ b/src/applications/legalpad/controller/LegalpadDocumentEditController.php
	@@ -218,7 +218,7 @@
	array(
	$crumbs,
	$form_box,
	- $preview
	+ $preview,
	),
	array(
	'title' => $title,
	diff --git a/src/applications/macro/config/PhabricatorMacroConfigOptions.php b/src/applications/macro/config/PhabricatorMacroConfigOptions.php
	--- a/src/applications/macro/config/PhabricatorMacroConfigOptions.php
	+++ b/src/applications/macro/config/PhabricatorMacroConfigOptions.php
	@@ -17,7 +17,7 @@
	->setDescription(pht(
	'As {{metamta.maniphest.reply-handler-domain}}, but affects Macro.')),
	$this->newOption('metamta.macro.subject-prefix', 'string', '[Macro]')
	- ->setDescription(pht('Subject prefix for Macro email.'))
	+ ->setDescription(pht('Subject prefix for Macro email.')),
	);
	}

	diff --git a/src/applications/maniphest/conduit/ManiphestQueryStatusesConduitAPIMethod.php b/src/applications/maniphest/conduit/ManiphestQueryStatusesConduitAPIMethod.php
	--- a/src/applications/maniphest/conduit/ManiphestQueryStatusesConduitAPIMethod.php
	+++ b/src/applications/maniphest/conduit/ManiphestQueryStatusesConduitAPIMethod.php
	@@ -31,7 +31,7 @@
	'openStatuses' => ManiphestTaskStatus::getOpenStatusConstants(),
	'closedStatuses' => ManiphestTaskStatus::getClosedStatusConstants(),
	'allStatuses' => array_keys(ManiphestTaskStatus::getTaskStatusMap()),
	- 'statusMap' => ManiphestTaskStatus::getTaskStatusMap()
	+ 'statusMap' => ManiphestTaskStatus::getTaskStatusMap(),
	);
	return $results;
	}
	diff --git a/src/applications/maniphest/controller/ManiphestBatchEditController.php b/src/applications/maniphest/controller/ManiphestBatchEditController.php
	--- a/src/applications/maniphest/controller/ManiphestBatchEditController.php
	+++ b/src/applications/maniphest/controller/ManiphestBatchEditController.php
	@@ -84,7 +84,7 @@
	'cc' => array(
	'src' => $mailable_source->getDatasourceURI(),
	'placeholder' => $mailable_source->getPlaceholderText(),
	- )
	+ ),
	),
	'input' => 'batch-form-actions',
	'priorityMap' => ManiphestTaskPriority::getTaskPriorityMap(),
	diff --git a/src/applications/maniphest/controller/ManiphestReportController.php b/src/applications/maniphest/controller/ManiphestReportController.php
	--- a/src/applications/maniphest/controller/ManiphestReportController.php
	+++ b/src/applications/maniphest/controller/ManiphestReportController.php
	@@ -383,7 +383,8 @@
	$label,
	number_format($info['open']),
	number_format($info['close']),
	- $fmt);
	+ $fmt,
	+ );
	}

	public function renderOpenTasks() {
	@@ -611,7 +612,7 @@
	'sigil' => 'has-tooltip',
	'meta' => array(
	'tip' => pht('Closed after %s', $edate),
	- 'size' => 260
	+ 'size' => 260,
	),
	),
	pht('Recently Closed'));
	diff --git a/src/applications/maniphest/controller/ManiphestSubpriorityController.php b/src/applications/maniphest/controller/ManiphestSubpriorityController.php
	--- a/src/applications/maniphest/controller/ManiphestSubpriorityController.php
	+++ b/src/applications/maniphest/controller/ManiphestSubpriorityController.php
	@@ -43,7 +43,9 @@
	->setNewValue(array(
	'newPriority' => $after_pri,
	'newSubpriorityBase' => $after_sub,
	- 'direction' => '>')));
	+ 'direction' => '>',
	+ )),
	+ );
	$editor = id(new ManiphestTransactionEditor())
	->setActor($user)
	->setContinueOnMissingFields(true)
	diff --git a/src/applications/maniphest/controller/ManiphestTaskDetailController.php b/src/applications/maniphest/controller/ManiphestTaskDetailController.php
	--- a/src/applications/maniphest/controller/ManiphestTaskDetailController.php
	+++ b/src/applications/maniphest/controller/ManiphestTaskDetailController.php
	@@ -525,7 +525,7 @@
	phutil_tag(
	'a',
	array(
	- 'href' => 'mailto:'.$source.'?subject='.$subject
	+ 'href' => 'mailto:'.$source.'?subject='.$subject,
	),
	$source));
	}
	diff --git a/src/applications/maniphest/controller/ManiphestTaskEditController.php b/src/applications/maniphest/controller/ManiphestTaskEditController.php
	--- a/src/applications/maniphest/controller/ManiphestTaskEditController.php
	+++ b/src/applications/maniphest/controller/ManiphestTaskEditController.php
	@@ -246,10 +246,13 @@
	array(
	'new' => array(
	'projectPHID' => $column->getProjectPHID(),
	- 'columnPHIDs' => array($column_phid)),
	+ 'columnPHIDs' => array($column_phid),
	+ ),
	'old' => array(
	'projectPHID' => $column->getProjectPHID(),
	- 'columnPHIDs' => array()));
	+ 'columnPHIDs' => array(),
	+ ),
	+ );
	}
	}
	}
	diff --git a/src/applications/maniphest/view/ManiphestTaskResultListView.php b/src/applications/maniphest/view/ManiphestTaskResultListView.php
	--- a/src/applications/maniphest/view/ManiphestTaskResultListView.php
	+++ b/src/applications/maniphest/view/ManiphestTaskResultListView.php
	@@ -93,7 +93,7 @@
	$lists[] = phutil_tag(
	'div',
	array(
	- 'class' => 'maniphest-task-group'
	+ 'class' => 'maniphest-task-group',
	),
	array(
	$header,
	diff --git a/src/applications/metamta/adapter/PhabricatorMailImplementationTestAdapter.php b/src/applications/metamta/adapter/PhabricatorMailImplementationTestAdapter.php
	--- a/src/applications/metamta/adapter/PhabricatorMailImplementationTestAdapter.php
	+++ b/src/applications/metamta/adapter/PhabricatorMailImplementationTestAdapter.php
	@@ -49,7 +49,7 @@
	$this->guts['attachments'][] = array(
	'data' => $data,
	'filename' => $filename,
	- 'mimetype' => $mimetype
	+ 'mimetype' => $mimetype,
	);
	return $this;
	}
	diff --git a/src/applications/metamta/parser/PhabricatorMetaMTAEmailBodyParser.php b/src/applications/metamta/parser/PhabricatorMetaMTAEmailBodyParser.php
	--- a/src/applications/metamta/parser/PhabricatorMetaMTAEmailBodyParser.php
	+++ b/src/applications/metamta/parser/PhabricatorMetaMTAEmailBodyParser.php
	@@ -42,7 +42,8 @@
	return array(
	'body' => $body,
	'command' => $command,
	- 'command_value' => $command_value);
	+ 'command_value' => $command_value,
	+ );
	}

	public function stripTextBody($body) {
	diff --git a/src/applications/metamta/view/PhabricatorMetaMTAMailBody.php b/src/applications/metamta/view/PhabricatorMetaMTAMailBody.php
	--- a/src/applications/metamta/view/PhabricatorMetaMTAMailBody.php
	+++ b/src/applications/metamta/view/PhabricatorMetaMTAMailBody.php
	@@ -80,7 +80,8 @@
	public function addHTMLSection($header, $html_fragment) {
	$this->htmlSections[] = array(
	phutil_tag('div', array('style' => 'font-weight:800;'), $header),
	- $html_fragment);
	+ $html_fragment,
	+ );

	return $this;
	}
	diff --git a/src/applications/notification/controller/PhabricatorNotificationPanelController.php b/src/applications/notification/controller/PhabricatorNotificationPanelController.php
	--- a/src/applications/notification/controller/PhabricatorNotificationPanelController.php
	+++ b/src/applications/notification/controller/PhabricatorNotificationPanelController.php
	@@ -60,7 +60,7 @@
	$connection_ui = phutil_tag(
	'div',
	array(
	- 'class' => 'phabricator-notification-footer'
	+ 'class' => 'phabricator-notification-footer',
	),
	$connection_status);

	diff --git a/src/applications/oauthserver/__tests__/PhabricatorOAuthServerTestCase.php b/src/applications/oauthserver/__tests__/PhabricatorOAuthServerTestCase.php
	--- a/src/applications/oauthserver/__tests__/PhabricatorOAuthServerTestCase.php
	+++ b/src/applications/oauthserver/__tests__/PhabricatorOAuthServerTestCase.php
	@@ -9,7 +9,7 @@
	'http://www.google.com/' => true,
	'http://www.google.com/auth' => true,
	'www.google.com' => false,
	- 'http://www.google.com/auth#invalid' => false
	+ 'http://www.google.com/auth#invalid' => false,
	);
	$server = new PhabricatorOAuthServer();
	foreach ($map as $input => $expected) {
	@@ -32,7 +32,7 @@
	'http://www.google.com/?auth' => true,
	'www.google.com' => false,
	'http://www.google.com/auth#invalid' => false,
	- 'http://www.example.com' => false
	+ 'http://www.example.com' => false,
	);
	foreach ($test_domain_map as $input => $expected) {
	$uri = new PhutilURI($input);
	diff --git a/src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php b/src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php
	--- a/src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php
	+++ b/src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php
	@@ -196,7 +196,7 @@
	} else {
	$desired_scopes = array(
	PhabricatorOAuthServerScope::SCOPE_WHOAMI => 1,
	- PhabricatorOAuthServerScope::SCOPE_OFFLINE_ACCESS => 1
	+ PhabricatorOAuthServerScope::SCOPE_OFFLINE_ACCESS => 1,
	);
	}

	diff --git a/src/applications/owners/conduit/OwnersQueryConduitAPIMethod.php b/src/applications/owners/conduit/OwnersQueryConduitAPIMethod.php
	--- a/src/applications/owners/conduit/OwnersQueryConduitAPIMethod.php
	+++ b/src/applications/owners/conduit/OwnersQueryConduitAPIMethod.php
	@@ -107,7 +107,7 @@
	'description' => $package->getDescription(),
	'primaryOwner' => $package->getPrimaryOwnerPHID(),
	'owners' => $owners,
	- 'paths' => $paths
	+ 'paths' => $paths,
	);
	}
	return $result;
	diff --git a/src/applications/owners/config/PhabricatorOwnersConfigOptions.php b/src/applications/owners/config/PhabricatorOwnersConfigOptions.php
	--- a/src/applications/owners/config/PhabricatorOwnersConfigOptions.php
	+++ b/src/applications/owners/config/PhabricatorOwnersConfigOptions.php
	@@ -20,7 +20,7 @@
	->setBaseClass('PhabricatorMailReplyHandler')
	->setDescription(pht('Reply handler for owners mail.')),
	$this->newOption('metamta.package.subject-prefix', 'string', '[Package]')
	- ->setDescription(pht('Subject prefix for Owners email.'))
	+ ->setDescription(pht('Subject prefix for Owners email.')),
	);
	}

	diff --git a/src/applications/owners/controller/PhabricatorOwnersDetailController.php b/src/applications/owners/controller/PhabricatorOwnersDetailController.php
	--- a/src/applications/owners/controller/PhabricatorOwnersDetailController.php
	+++ b/src/applications/owners/controller/PhabricatorOwnersDetailController.php
	@@ -86,7 +86,7 @@
	'callsign' => $repo->getCallsign(),
	'branch' => $repo->getDefaultBranch(),
	'path' => $path->getPath(),
	- 'action' => 'browse'
	+ 'action' => 'browse',
	));
	$repo_name = phutil_tag('strong', array(), $repo->getName());
	$path_link = phutil_tag(
	diff --git a/src/applications/owners/controller/PhabricatorOwnersListController.php b/src/applications/owners/controller/PhabricatorOwnersListController.php
	--- a/src/applications/owners/controller/PhabricatorOwnersListController.php
	+++ b/src/applications/owners/controller/PhabricatorOwnersListController.php
	@@ -310,7 +310,7 @@
	array(
	'href' => '/audit/view/packagecommits/?phid='.$package->getPHID(),
	),
	- pht('Related Commits'))
	+ pht('Related Commits')),
	);
	}

	diff --git a/src/applications/owners/storage/PhabricatorOwnersPackage.php b/src/applications/owners/storage/PhabricatorOwnersPackage.php
	--- a/src/applications/owners/storage/PhabricatorOwnersPackage.php
	+++ b/src/applications/owners/storage/PhabricatorOwnersPackage.php
	@@ -344,7 +344,8 @@
	array(
	'commit' => $drequest->getCommit(),
	'path' => $path,
	- 'needValidityOnly' => true)));
	+ 'needValidityOnly' => true,
	+ )));
	$valid = $results->isValidResults();
	$is_directory = true;
	if (!$valid) {
	diff --git a/src/applications/passphrase/application/PhabricatorPassphraseApplication.php b/src/applications/passphrase/application/PhabricatorPassphraseApplication.php
	--- a/src/applications/passphrase/application/PhabricatorPassphraseApplication.php
	+++ b/src/applications/passphrase/application/PhabricatorPassphraseApplication.php
	@@ -47,7 +47,8 @@
	'public/(?P<id>\d+)/' => 'PassphraseCredentialPublicController',
	'lock/(?P<id>\d+)/' => 'PassphraseCredentialLockController',
	'conduit/(?P<id>\d+)/' => 'PassphraseCredentialConduitController',
	- ));
	+ ),
	+ );
	}

	public function getRemarkupRules() {
	diff --git a/src/applications/passphrase/controller/PassphraseCredentialRevealController.php b/src/applications/passphrase/controller/PassphraseCredentialRevealController.php
	--- a/src/applications/passphrase/controller/PassphraseCredentialRevealController.php
	+++ b/src/applications/passphrase/controller/PassphraseCredentialRevealController.php
	@@ -75,7 +75,8 @@
	$type_secret = PassphraseCredentialTransaction::TYPE_LOOKEDATSECRET;
	$xactions = array(id(new PassphraseCredentialTransaction())
	->setTransactionType($type_secret)
	- ->setNewValue(true));
	+ ->setNewValue(true),
	+ );

	$editor = id(new PassphraseCredentialTransactionEditor())
	->setActor($viewer)
	diff --git a/src/applications/paste/config/PhabricatorPasteConfigOptions.php b/src/applications/paste/config/PhabricatorPasteConfigOptions.php
	--- a/src/applications/paste/config/PhabricatorPasteConfigOptions.php
	+++ b/src/applications/paste/config/PhabricatorPasteConfigOptions.php
	@@ -22,7 +22,7 @@
	'metamta.paste.subject-prefix',
	'string',
	'[Paste]')
	- ->setDescription(pht('Subject prefix for Paste email.'))
	+ ->setDescription(pht('Subject prefix for Paste email.')),
	);
	}

	diff --git a/src/applications/paste/lipsum/PhabricatorPasteTestDataGenerator.php b/src/applications/paste/lipsum/PhabricatorPasteTestDataGenerator.php
	--- a/src/applications/paste/lipsum/PhabricatorPasteTestDataGenerator.php
	+++ b/src/applications/paste/lipsum/PhabricatorPasteTestDataGenerator.php
	@@ -6,7 +6,8 @@
	// Better Support for this in the future
	public $supportedLanguages = array(
	'Java' => 'java',
	- 'PHP' => 'php');
	+ 'PHP' => 'php',
	+ );

	public function generate() {
	$authorphid = $this->loadPhabrictorUserPHID();
	diff --git a/src/applications/paste/view/PasteEmbedView.php b/src/applications/paste/view/PasteEmbedView.php
	--- a/src/applications/paste/view/PasteEmbedView.php
	+++ b/src/applications/paste/view/PasteEmbedView.php
	@@ -37,14 +37,14 @@
	$link = phutil_tag(
	'a',
	array(
	- 'href' => '/P'.$this->paste->getID()
	+ 'href' => '/P'.$this->paste->getID(),
	),
	$this->handle->getFullName());

	$head = phutil_tag(
	'div',
	array(
	- 'class' => 'paste-embed-head'
	+ 'class' => 'paste-embed-head',
	),
	$link);

	diff --git a/src/applications/people/conduit/UserFindConduitAPIMethod.php b/src/applications/people/conduit/UserFindConduitAPIMethod.php
	--- a/src/applications/people/conduit/UserFindConduitAPIMethod.php
	+++ b/src/applications/people/conduit/UserFindConduitAPIMethod.php
	@@ -20,7 +20,7 @@

	public function defineParamTypes() {
	return array(
	- 'aliases' => 'required list<string>'
	+ 'aliases' => 'required list<string>',
	);
	}

	diff --git a/src/applications/people/controller/PhabricatorPeopleCalendarController.php b/src/applications/people/controller/PhabricatorPeopleCalendarController.php
	--- a/src/applications/people/controller/PhabricatorPeopleCalendarController.php
	+++ b/src/applications/people/controller/PhabricatorPeopleCalendarController.php
	@@ -81,11 +81,12 @@
	$crumbs->addTextCrumb($date->format('F Y'));

	return $this->buildApplicationPage(
	+ array(
	+ $crumbs,
	+ $month_view,
	+ ),
	array(
	- $crumbs,
	- $month_view),
	- array(
	- 'title' => pht('Calendar'),
	- ));
	+ 'title' => pht('Calendar'),
	+ ));
	}
	}
	diff --git a/src/applications/people/controller/PhabricatorPeopleProfileController.php b/src/applications/people/controller/PhabricatorPeopleProfileController.php
	--- a/src/applications/people/controller/PhabricatorPeopleProfileController.php
	+++ b/src/applications/people/controller/PhabricatorPeopleProfileController.php
	@@ -150,7 +150,7 @@
	),
	array(
	$calendar,
	- $feed
	+ $feed,
	));

	$object_box = id(new PHUIObjectBoxView())
	@@ -271,7 +271,7 @@
	$header = phutil_tag(
	'a',
	array(
	- 'href' => $this->getRequest()->getRequestURI().'calendar/'
	+ 'href' => $this->getRequest()->getRequestURI().'calendar/',
	),
	$headertext);

	diff --git a/src/applications/people/controller/PhabricatorPeopleProfilePictureController.php b/src/applications/people/controller/PhabricatorPeopleProfilePictureController.php
	--- a/src/applications/people/controller/PhabricatorPeopleProfilePictureController.php
	+++ b/src/applications/people/controller/PhabricatorPeopleProfilePictureController.php
	@@ -237,7 +237,8 @@
	'name' => 'phid',
	'value' => $phid,
	)),
	- $button);
	+ $button,
	+ );

	$button = phabricator_form(
	$viewer,
	diff --git a/src/applications/people/storage/PhabricatorUser.php b/src/applications/people/storage/PhabricatorUser.php
	--- a/src/applications/people/storage/PhabricatorUser.php
	+++ b/src/applications/people/storage/PhabricatorUser.php
	@@ -445,7 +445,8 @@
	PhabricatorUserPreferences::PREFERENCE_TITLES => 'glyph',
	PhabricatorUserPreferences::PREFERENCE_EDITOR => '',
	PhabricatorUserPreferences::PREFERENCE_MONOSPACED => '',
	- PhabricatorUserPreferences::PREFERENCE_DARK_CONSOLE => 0);
	+ PhabricatorUserPreferences::PREFERENCE_DARK_CONSOLE => 0,
	+ );

	$preferences->setPreferences($default_dict);
	}
	diff --git a/src/applications/phame/application/PhabricatorPhameApplication.php b/src/applications/phame/application/PhabricatorPhameApplication.php
	--- a/src/applications/phame/application/PhabricatorPhameApplication.php
	+++ b/src/applications/phame/application/PhabricatorPhameApplication.php
	@@ -50,7 +50,7 @@
	'preview/' => 'PhamePostPreviewController',
	'framed/(?P<id>\d+)/' => 'PhamePostFramedController',
	'new/' => 'PhamePostNewController',
	- 'move/(?P<id>\d+)/' => 'PhamePostNewController'
	+ 'move/(?P<id>\d+)/' => 'PhamePostNewController',
	),
	'blog/' => array(
	'(?:(?P<filter>user\|all)/)?' => 'PhameBlogListController',
	diff --git a/src/applications/phame/controller/blog/PhameBlogEditController.php b/src/applications/phame/controller/blog/PhameBlogEditController.php
	--- a/src/applications/phame/controller/blog/PhameBlogEditController.php
	+++ b/src/applications/phame/controller/blog/PhameBlogEditController.php
	@@ -19,7 +19,7 @@
	->withIDs(array($this->id))
	->requireCapabilities(
	array(
	- PhabricatorPolicyCapability::CAN_EDIT
	+ PhabricatorPolicyCapability::CAN_EDIT,
	))
	->executeOne();
	if (!$blog) {
	diff --git a/src/applications/phame/controller/blog/PhameBlogFeedController.php b/src/applications/phame/controller/blog/PhameBlogFeedController.php
	--- a/src/applications/phame/controller/blog/PhameBlogFeedController.php
	+++ b/src/applications/phame/controller/blog/PhameBlogFeedController.php
	@@ -39,7 +39,7 @@
	array(
	'rel' => 'self',
	'type' => 'application/atom+xml',
	- 'href' => $blog_uri
	+ 'href' => $blog_uri,
	));

	$updated = $blog->getDateModified();
	diff --git a/src/applications/phame/controller/blog/PhameBlogViewController.php b/src/applications/phame/controller/blog/PhameBlogViewController.php
	--- a/src/applications/phame/controller/blog/PhameBlogViewController.php
	+++ b/src/applications/phame/controller/blog/PhameBlogViewController.php
	@@ -105,7 +105,7 @@
	'meta' => array(
	'tip' => pht('Atom URI does not support custom domains.'),
	'size' => 320,
	- )
	+ ),
	),
	$feed_uri));

	diff --git a/src/applications/phame/storage/PhameBlog.php b/src/applications/phame/storage/PhameBlog.php
	--- a/src/applications/phame/storage/PhameBlog.php
	+++ b/src/applications/phame/storage/PhameBlog.php
	@@ -94,43 +94,52 @@
	// so just use it to test if there's a protocol specified
	$uri = new PhutilURI($custom_domain);
	if ($uri->getProtocol()) {
	- return array($label,
	+ return array(
	+ $label,
	pht(
	'The custom domain should not include a protocol. Just provide '.
	'the bare domain name (for example, "%s").',
	- $example_domain));
	+ $example_domain),
	+ );
	}

	if ($uri->getPort()) {
	- return array($label,
	+ return array(
	+ $label,
	pht(
	'The custom domain should not include a port number. Just provide '.
	'the bare domain name (for example, "%s").',
	- $example_domain));
	+ $example_domain),
	+ );
	}

	if (strpos($custom_domain, '/') !== false) {
	- return array($label,
	+ return array(
	+ $label,
	pht(
	'The custom domain should not specify a path (hosting a Phame '.
	'blog at a path is currently not supported). Instead, just provide '.
	'the bare domain name (for example, "%s").',
	- $example_domain));
	+ $example_domain),
	+ );
	}

	if (strpos($custom_domain, '.') === false) {
	- return array($label,
	+ return array(
	+ $label,
	pht(
	'The custom domain should contain at least one dot (.) because '.
	'some browsers fail to set cookies on domains without a dot. '.
	'Instead, use a normal looking domain name like "%s".',
	- $example_domain));
	+ $example_domain),
	+ );
	}

	if (!PhabricatorEnv::getEnvConfig('policy.allow-public')) {
	$href = PhabricatorEnv::getProductionURI(
	'/config/edit/policy.allow-public/');
	- return array(pht('Fix Configuration'),
	+ return array(
	+ pht('Fix Configuration'),
	pht(
	'For custom domains to work, this Phabricator instance must be '.
	'configured to allow the public access policy. Configure this '.
	@@ -140,7 +149,8 @@
	phutil_tag(
	'a',
	array('href' => $href),
	- pht('here'))));
	+ pht('here'))),
	+ );
	}

	return null;
	diff --git a/src/applications/phame/view/PhamePostView.php b/src/applications/phame/view/PhamePostView.php
	--- a/src/applications/phame/view/PhamePostView.php
	+++ b/src/applications/phame/view/PhamePostView.php
	@@ -203,7 +203,7 @@

	$disqus_thread = phutil_tag('div',
	array(
	- 'id' => 'disqus_thread'
	+ 'id' => 'disqus_thread',
	));

	// protip - try some var disqus_developer = 1; action to test locally
	diff --git a/src/applications/phlux/storage/PhluxVariable.php b/src/applications/phlux/storage/PhluxVariable.php
	--- a/src/applications/phlux/storage/PhluxVariable.php
	+++ b/src/applications/phlux/storage/PhluxVariable.php
	@@ -14,7 +14,7 @@
	return array(
	self::CONFIG_AUX_PHID => true,
	self::CONFIG_SERIALIZATION => array(
	- 'variableValue' => self::SERIALIZATION_JSON
	+ 'variableValue' => self::SERIALIZATION_JSON,
	),
	self::CONFIG_COLUMN_SCHEMA => array(
	'variableKey' => 'text64',
	diff --git a/src/applications/pholio/application/PhabricatorPholioApplication.php b/src/applications/pholio/application/PhabricatorPholioApplication.php
	--- a/src/applications/pholio/application/PhabricatorPholioApplication.php
	+++ b/src/applications/pholio/application/PhabricatorPholioApplication.php
	@@ -49,7 +49,7 @@
	'inline/' => array(
	'(?:(?P<id>\d+)/)?' => 'PholioInlineController',
	'list/(?P<id>\d+)/' => 'PholioInlineListController',
	- 'thumb/(?P<imageid>\d+)/' => 'PholioInlineThumbController'
	+ 'thumb/(?P<imageid>\d+)/' => 'PholioInlineThumbController',
	),
	'image/' => array(
	'upload/' => 'PholioImageUploadController',
	diff --git a/src/applications/pholio/config/PhabricatorPholioConfigOptions.php b/src/applications/pholio/config/PhabricatorPholioConfigOptions.php
	--- a/src/applications/pholio/config/PhabricatorPholioConfigOptions.php
	+++ b/src/applications/pholio/config/PhabricatorPholioConfigOptions.php
	@@ -19,7 +19,7 @@
	'Like {{metamta.maniphest.reply-handler-domain}}, but affects '.
	'Pholio.')),
	$this->newOption('metamta.pholio.subject-prefix', 'string', '[Pholio]')
	- ->setDescription(pht('Subject prefix for Pholio email.'))
	+ ->setDescription(pht('Subject prefix for Pholio email.')),
	);
	}

	diff --git a/src/applications/pholio/query/PholioMockSearchEngine.php b/src/applications/pholio/query/PholioMockSearchEngine.php
	--- a/src/applications/pholio/query/PholioMockSearchEngine.php
	+++ b/src/applications/pholio/query/PholioMockSearchEngine.php
	@@ -46,7 +46,8 @@
	$statuses = array(
	'' => pht('Any Status'),
	'closed' => pht('Closed'),
	- 'open' => pht('Open'));
	+ 'open' => pht('Open'),
	+ );

	$status = $saved_query->getParameter('statuses', array());
	$status = head($status);
	diff --git a/src/applications/pholio/view/PholioMockImagesView.php b/src/applications/pholio/view/PholioMockImagesView.php
	--- a/src/applications/pholio/view/PholioMockImagesView.php
	+++ b/src/applications/pholio/view/PholioMockImagesView.php
	@@ -142,7 +142,7 @@
	array(
	'id' => $viewport_id,
	'sigil' => 'mock-viewport',
	- 'class' => 'pholio-mock-image-viewport'
	+ 'class' => 'pholio-mock-image-viewport',
	),
	'');

	@@ -171,7 +171,7 @@
	array(
	'id' => 'mock-image-description',
	'sigil' => 'mock-image-description',
	- 'class' => 'mock-image-description'
	+ 'class' => 'mock-image-description',
	),
	'');

	@@ -179,7 +179,7 @@
	'div',
	array(
	'class' => 'pholio-mock-image-container',
	- 'id' => 'pholio-mock-image-container'
	+ 'id' => 'pholio-mock-image-container',
	),
	array($mock_wrapper, $inline_comments_holder));

	diff --git a/src/applications/phortune/provider/PhortuneWePayPaymentProvider.php b/src/applications/phortune/provider/PhortuneWePayPaymentProvider.php
	--- a/src/applications/phortune/provider/PhortuneWePayPaymentProvider.php
	+++ b/src/applications/phortune/provider/PhortuneWePayPaymentProvider.php
	@@ -152,7 +152,7 @@
	'shipping_fee' => 0,
	'charge_tax' => 0,
	'mode' => 'regular',
	- 'funding_sources' => 'bank,cc'
	+ 'funding_sources' => 'bank,cc',
	);

	$charge = $cart->willApplyCharge($viewer, $this);
	diff --git a/src/applications/phortune/view/PhortuneCreditCardForm.php b/src/applications/phortune/view/PhortuneCreditCardForm.php
	--- a/src/applications/phortune/view/PhortuneCreditCardForm.php
	+++ b/src/applications/phortune/view/PhortuneCreditCardForm.php
	@@ -82,7 +82,7 @@
	'tip' => 'We support Visa, Mastercard, American Express, '.
	'Discover, JCB, and Diners Club.',
	'size' => 440,
	- )
	+ ),
	))))
	->appendChild(
	id(new AphrontFormTextControl())
	diff --git a/src/applications/phpast/controller/PhabricatorXHPASTViewFrameController.php b/src/applications/phpast/controller/PhabricatorXHPASTViewFrameController.php
	--- a/src/applications/phpast/controller/PhabricatorXHPASTViewFrameController.php
	+++ b/src/applications/phpast/controller/PhabricatorXHPASTViewFrameController.php
	@@ -19,7 +19,8 @@
	'src' => '/xhpast/frameset/'.$id.'/',
	'frameborder' => '0',
	'style' => 'width: 100%; height: 800px;',
	- '')),
	+ '',
	+ )),
	array(
	'title' => 'XHPAST View',
	));
	diff --git a/src/applications/phragment/conduit/PhragmentGetPatchConduitAPIMethod.php b/src/applications/phragment/conduit/PhragmentGetPatchConduitAPIMethod.php
	--- a/src/applications/phragment/conduit/PhragmentGetPatchConduitAPIMethod.php
	+++ b/src/applications/phragment/conduit/PhragmentGetPatchConduitAPIMethod.php
	@@ -83,7 +83,8 @@
	'fileNew' => $files[$file_phid],
	'hashOld' => $hash_caller,
	'hashNew' => $hash_current,
	- 'patchURI' => null);
	+ 'patchURI' => null,
	+ );
	}
	} else {
	// We have a record of this as a file, but there is no file
	@@ -95,7 +96,8 @@
	'fileNew' => null,
	'hashOld' => $hash_caller,
	'hashNew' => PhragmentPatchUtil::EMPTY_HASH,
	- 'patchURI' => null);
	+ 'patchURI' => null,
	+ );
	}
	} else {
	// If $mappings[$path] does not exist, then the user has a file,
	@@ -125,7 +127,8 @@
	'fileNew' => $files[$file_phid],
	'hashOld' => PhragmentPatchUtil::EMPTY_HASH,
	'hashNew' => $hash_current,
	- 'patchURI' => null);
	+ 'patchURI' => null,
	+ );
	} else {
	// We have a record of deleting this file, and the caller hasn't
	// reported it, so they've probably deleted it in a previous
	diff --git a/src/applications/phragment/conduit/PhragmentQueryFragmentsConduitAPIMethod.php b/src/applications/phragment/conduit/PhragmentQueryFragmentsConduitAPIMethod.php
	--- a/src/applications/phragment/conduit/PhragmentQueryFragmentsConduitAPIMethod.php
	+++ b/src/applications/phragment/conduit/PhragmentQueryFragmentsConduitAPIMethod.php
	@@ -74,7 +74,8 @@
	'path' => $cpath,
	'hash' => $file->getContentHash(),
	'version' => $child->getLatestVersion()->getSequence(),
	- 'uri' => $file->getViewURI());
	+ 'uri' => $file->getViewURI(),
	+ );
	}
	$results[$path] = $result;
	}
	diff --git a/src/applications/phragment/controller/PhragmentBrowseController.php b/src/applications/phragment/controller/PhragmentBrowseController.php
	--- a/src/applications/phragment/controller/PhragmentBrowseController.php
	+++ b/src/applications/phragment/controller/PhragmentBrowseController.php
	@@ -88,7 +88,8 @@
	$crumbs,
	$this->renderConfigurationWarningIfRequired(),
	$current_box,
	- $list),
	+ $list,
	+ ),
	array(
	'title' => pht('Browse Fragments'),
	));
	diff --git a/src/applications/phragment/controller/PhragmentCreateController.php b/src/applications/phragment/controller/PhragmentCreateController.php
	--- a/src/applications/phragment/controller/PhragmentCreateController.php
	+++ b/src/applications/phragment/controller/PhragmentCreateController.php
	@@ -122,7 +122,8 @@
	array(
	$crumbs,
	$this->renderConfigurationWarningIfRequired(),
	- $box),
	+ $box,
	+ ),
	array(
	'title' => pht('Create Fragment'),
	));
	diff --git a/src/applications/phragment/controller/PhragmentHistoryController.php b/src/applications/phragment/controller/PhragmentHistoryController.php
	--- a/src/applications/phragment/controller/PhragmentHistoryController.php
	+++ b/src/applications/phragment/controller/PhragmentHistoryController.php
	@@ -102,7 +102,8 @@
	$crumbs,
	$this->renderConfigurationWarningIfRequired(),
	$current_box,
	- $list),
	+ $list,
	+ ),
	array(
	'title' => pht('Fragment History'),
	));
	diff --git a/src/applications/phragment/controller/PhragmentPolicyController.php b/src/applications/phragment/controller/PhragmentPolicyController.php
	--- a/src/applications/phragment/controller/PhragmentPolicyController.php
	+++ b/src/applications/phragment/controller/PhragmentPolicyController.php
	@@ -99,7 +99,8 @@
	array(
	$crumbs,
	$this->renderConfigurationWarningIfRequired(),
	- $box),
	+ $box,
	+ ),
	array(
	'title' => pht('Edit Fragment Policies'),
	));
	diff --git a/src/applications/phragment/controller/PhragmentSnapshotCreateController.php b/src/applications/phragment/controller/PhragmentSnapshotCreateController.php
	--- a/src/applications/phragment/controller/PhragmentSnapshotCreateController.php
	+++ b/src/applications/phragment/controller/PhragmentSnapshotCreateController.php
	@@ -90,13 +90,15 @@
	array(),
	array(
	phutil_tag('th', array(), 'Fragment'),
	- phutil_tag('th', array(), 'Version')));
	+ phutil_tag('th', array(), 'Version'),
	+ ));
	$rows[] = phutil_tag(
	'tr',
	array(),
	array(
	phutil_tag('td', array(), $fragment->getPath()),
	- phutil_tag('td', array(), $fragment_sequence)));
	+ phutil_tag('td', array(), $fragment_sequence),
	+ ));
	foreach ($children as $child) {
	$sequence = '-';
	if ($child->getLatestVersion() !== null) {
	@@ -107,7 +109,8 @@
	array(),
	array(
	phutil_tag('td', array(), $child->getPath()),
	- phutil_tag('td', array(), $sequence)));
	+ phutil_tag('td', array(), $sequence),
	+ ));
	}

	$table = phutil_tag(
	@@ -125,7 +128,8 @@
	pht(
	'The snapshot will contain the following fragments at '.
	'the specified versions: ')),
	- $table));
	+ $table,
	+ ));

	$form = id(new AphrontFormView())
	->setUser($viewer)
	@@ -159,7 +163,8 @@
	array(
	$crumbs,
	$this->renderConfigurationWarningIfRequired(),
	- $box),
	+ $box,
	+ ),
	array(
	'title' => pht('Create Fragment'),
	));
	diff --git a/src/applications/phragment/controller/PhragmentSnapshotDeleteController.php b/src/applications/phragment/controller/PhragmentSnapshotDeleteController.php
	--- a/src/applications/phragment/controller/PhragmentSnapshotDeleteController.php
	+++ b/src/applications/phragment/controller/PhragmentSnapshotDeleteController.php
	@@ -16,7 +16,8 @@
	->setViewer($viewer)
	->requireCapabilities(array(
	PhabricatorPolicyCapability::CAN_VIEW,
	- PhabricatorPolicyCapability::CAN_EDIT))
	+ PhabricatorPolicyCapability::CAN_EDIT,
	+ ))
	->withIDs(array($this->id))
	->executeOne();
	if ($snapshot === null) {
	diff --git a/src/applications/phragment/controller/PhragmentSnapshotPromoteController.php b/src/applications/phragment/controller/PhragmentSnapshotPromoteController.php
	--- a/src/applications/phragment/controller/PhragmentSnapshotPromoteController.php
	+++ b/src/applications/phragment/controller/PhragmentSnapshotPromoteController.php
	@@ -25,7 +25,8 @@
	->setViewer($viewer)
	->requireCapabilities(array(
	PhabricatorPolicyCapability::CAN_VIEW,
	- PhabricatorPolicyCapability::CAN_EDIT))
	+ PhabricatorPolicyCapability::CAN_EDIT,
	+ ))
	->withPaths(array($this->dblob))
	->executeOne();
	if ($this->targetFragment === null) {
	@@ -45,7 +46,8 @@
	->setViewer($viewer)
	->requireCapabilities(array(
	PhabricatorPolicyCapability::CAN_VIEW,
	- PhabricatorPolicyCapability::CAN_EDIT))
	+ PhabricatorPolicyCapability::CAN_EDIT,
	+ ))
	->withIDs(array($this->id))
	->executeOne();
	if ($this->targetSnapshot === null) {
	@@ -55,7 +57,8 @@
	$this->snapshots = id(new PhragmentSnapshotQuery())
	->setViewer($viewer)
	->withPrimaryFragmentPHIDs(array(
	- $this->targetSnapshot->getPrimaryFragmentPHID()))
	+ $this->targetSnapshot->getPrimaryFragmentPHID(),
	+ ))
	->execute();
	}

	diff --git a/src/applications/phragment/controller/PhragmentSnapshotViewController.php b/src/applications/phragment/controller/PhragmentSnapshotViewController.php
	--- a/src/applications/phragment/controller/PhragmentSnapshotViewController.php
	+++ b/src/applications/phragment/controller/PhragmentSnapshotViewController.php
	@@ -76,7 +76,8 @@
	$crumbs,
	$this->renderConfigurationWarningIfRequired(),
	$box,
	- $list),
	+ $list,
	+ ),
	array(
	'title' => pht('View Snapshot'),
	));
	diff --git a/src/applications/phragment/controller/PhragmentUpdateController.php b/src/applications/phragment/controller/PhragmentUpdateController.php
	--- a/src/applications/phragment/controller/PhragmentUpdateController.php
	+++ b/src/applications/phragment/controller/PhragmentUpdateController.php
	@@ -73,7 +73,8 @@
	array(
	$crumbs,
	$this->renderConfigurationWarningIfRequired(),
	- $box),
	+ $box,
	+ ),
	array(
	'title' => pht('Update Fragment'),
	));
	diff --git a/src/applications/phragment/controller/PhragmentVersionController.php b/src/applications/phragment/controller/PhragmentVersionController.php
	--- a/src/applications/phragment/controller/PhragmentVersionController.php
	+++ b/src/applications/phragment/controller/PhragmentVersionController.php
	@@ -82,7 +82,8 @@
	$crumbs,
	$this->renderConfigurationWarningIfRequired(),
	$box,
	- $this->renderPreviousVersionList($version)),
	+ $this->renderPreviousVersionList($version),
	+ ),
	array(
	'title' => pht('View Version'),
	));
	diff --git a/src/applications/phragment/storage/PhragmentFragmentVersion.php b/src/applications/phragment/storage/PhragmentFragmentVersion.php
	--- a/src/applications/phragment/storage/PhragmentFragmentVersion.php
	+++ b/src/applications/phragment/storage/PhragmentFragmentVersion.php
	@@ -53,7 +53,7 @@

	public function getCapabilities() {
	return array(
	- PhabricatorPolicyCapability::CAN_VIEW
	+ PhabricatorPolicyCapability::CAN_VIEW,
	);
	}

	diff --git a/src/applications/phragment/storage/PhragmentSnapshotChild.php b/src/applications/phragment/storage/PhragmentSnapshotChild.php
	--- a/src/applications/phragment/storage/PhragmentSnapshotChild.php
	+++ b/src/applications/phragment/storage/PhragmentSnapshotChild.php
	@@ -62,7 +62,7 @@

	public function getCapabilities() {
	return array(
	- PhabricatorPolicyCapability::CAN_VIEW
	+ PhabricatorPolicyCapability::CAN_VIEW,
	);
	}

	diff --git a/src/applications/phrequent/application/PhabricatorPhrequentApplication.php b/src/applications/phrequent/application/PhabricatorPhrequentApplication.php
	--- a/src/applications/phrequent/application/PhabricatorPhrequentApplication.php
	+++ b/src/applications/phrequent/application/PhabricatorPhrequentApplication.php
	@@ -41,7 +41,7 @@
	'/phrequent/' => array(
	'(?:query/(?P<queryKey>[^/]+)/)?' => 'PhrequentListController',
	'track/(?P<verb>[a-z]+)/(?P<phid>[^/]+)/'
	- => 'PhrequentTrackController'
	+ => 'PhrequentTrackController',
	),
	);
	}
	diff --git a/src/applications/phrequent/conduit/PhrequentPopConduitAPIMethod.php b/src/applications/phrequent/conduit/PhrequentPopConduitAPIMethod.php
	--- a/src/applications/phrequent/conduit/PhrequentPopConduitAPIMethod.php
	+++ b/src/applications/phrequent/conduit/PhrequentPopConduitAPIMethod.php
	@@ -18,7 +18,7 @@
	return array(
	'objectPHID' => 'phid',
	'stopTime' => 'int',
	- 'note' => 'string'
	+ 'note' => 'string',
	);
	}

	diff --git a/src/applications/phrequent/conduit/PhrequentPushConduitAPIMethod.php b/src/applications/phrequent/conduit/PhrequentPushConduitAPIMethod.php
	--- a/src/applications/phrequent/conduit/PhrequentPushConduitAPIMethod.php
	+++ b/src/applications/phrequent/conduit/PhrequentPushConduitAPIMethod.php
	@@ -19,7 +19,7 @@
	public function defineParamTypes() {
	return array(
	'objectPHID' => 'required phid',
	- 'startTime' => 'int'
	+ 'startTime' => 'int',
	);
	}

	diff --git a/src/applications/phrequent/query/PhrequentUserTimeQuery.php b/src/applications/phrequent/query/PhrequentUserTimeQuery.php
	--- a/src/applications/phrequent/query/PhrequentUserTimeQuery.php
	+++ b/src/applications/phrequent/query/PhrequentUserTimeQuery.php
	@@ -239,7 +239,8 @@
	return array(
	self::ENDED_ALL => pht('All'),
	self::ENDED_NO => pht('No'),
	- self::ENDED_YES => pht('Yes'));
	+ self::ENDED_YES => pht('Yes'),
	+ );
	}

	public static function getOrderSearchOptions() {
	@@ -249,7 +250,8 @@
	self::ORDER_ENDED_ASC => pht('by furthest end date'),
	self::ORDER_ENDED_DESC => pht('by nearest end date'),
	self::ORDER_DURATION_ASC => pht('by smallest duration'),
	- self::ORDER_DURATION_DESC => pht('by largest duration'));
	+ self::ORDER_DURATION_DESC => pht('by largest duration'),
	+ );
	}

	public static function getUserTotalObjectsTracked(
	diff --git a/src/applications/phrequent/storage/__tests__/PhrequentTimeBlockTestCase.php b/src/applications/phrequent/storage/__tests__/PhrequentTimeBlockTestCase.php
	--- a/src/applications/phrequent/storage/__tests__/PhrequentTimeBlockTestCase.php
	+++ b/src/applications/phrequent/storage/__tests__/PhrequentTimeBlockTestCase.php
	@@ -255,7 +255,7 @@
	array(
	'T1' => array(
	array(1, 100),
	- array(900, null)
	+ array(900, null),
	),
	),
	$ranges);
	diff --git a/src/applications/phriction/controller/PhrictionDocumentController.php b/src/applications/phriction/controller/PhrictionDocumentController.php
	--- a/src/applications/phriction/controller/PhrictionDocumentController.php
	+++ b/src/applications/phriction/controller/PhrictionDocumentController.php
	@@ -40,7 +40,8 @@
	$project = id(new PhabricatorProjectQuery())
	->setViewer($user)
	->withPhrictionSlugs(array(
	- PhrictionDocument::getProjectSlugIdentifier($slug)))
	+ PhrictionDocument::getProjectSlugIdentifier($slug),
	+ ))
	->executeOne();
	if (!$project) {
	return new Aphront404Response();
	@@ -222,7 +223,7 @@
	$core_page = phutil_tag(
	'div',
	array(
	- 'class' => 'phriction-offset'
	+ 'class' => 'phriction-offset',
	),
	array(
	$page_content,
	@@ -256,7 +257,8 @@
	$project = id(new PhabricatorProjectQuery())
	->setViewer($viewer)
	->withPhrictionSlugs(array(
	- PhrictionDocument::getProjectSlugIdentifier($slug)))
	+ PhrictionDocument::getProjectSlugIdentifier($slug),
	+ ))
	->executeOne();
	if ($project) {
	$project_phid = $project->getPHID();
	diff --git a/src/applications/phriction/controller/PhrictionEditController.php b/src/applications/phriction/controller/PhrictionEditController.php
	--- a/src/applications/phriction/controller/PhrictionEditController.php
	+++ b/src/applications/phriction/controller/PhrictionEditController.php
	@@ -66,7 +66,8 @@
	$project = id(new PhabricatorProjectQuery())
	->setViewer($user)
	->withPhrictionSlugs(array(
	- PhrictionDocument::getProjectSlugIdentifier($slug)))
	+ PhrictionDocument::getProjectSlugIdentifier($slug),
	+ ))
	->executeOne();
	if (!$project) {
	return new Aphront404Response();
	diff --git a/src/applications/phriction/controller/PhrictionNewController.php b/src/applications/phriction/controller/PhrictionNewController.php
	--- a/src/applications/phriction/controller/PhrictionNewController.php
	+++ b/src/applications/phriction/controller/PhrictionNewController.php
	@@ -34,7 +34,8 @@
	$project = id(new PhabricatorProjectQuery())
	->setViewer($user)
	->withPhrictionSlugs(array(
	- PhrictionDocument::getProjectSlugIdentifier($slug)))
	+ PhrictionDocument::getProjectSlugIdentifier($slug),
	+ ))
	->executeOne();
	if (!$project) {
	$dialog = new AphrontDialogView();
	diff --git a/src/applications/phriction/editor/PhrictionDocumentEditor.php b/src/applications/phriction/editor/PhrictionDocumentEditor.php
	--- a/src/applications/phriction/editor/PhrictionDocumentEditor.php
	+++ b/src/applications/phriction/editor/PhrictionDocumentEditor.php
	@@ -243,7 +243,8 @@
	$project = id(new PhabricatorProjectQuery())
	->setViewer($this->requireActor())
	->withPhrictionSlugs(array(
	- PhrictionDocument::getProjectSlugIdentifier($slug)))
	+ PhrictionDocument::getProjectSlugIdentifier($slug),
	+ ))
	->executeOne();
	if ($project) {
	$project_phid = $project->getPHID();
	diff --git a/src/applications/policy/config/PhabricatorPolicyConfigOptions.php b/src/applications/policy/config/PhabricatorPolicyConfigOptions.php
	--- a/src/applications/policy/config/PhabricatorPolicyConfigOptions.php
	+++ b/src/applications/policy/config/PhabricatorPolicyConfigOptions.php
	@@ -17,7 +17,8 @@
	->setBoolOptions(
	array(
	pht('Allow Public Visibility'),
	- pht('Require Login')))
	+ pht('Require Login'),
	+ ))
	->setSummary(pht('Allow users to set object visibility to public.'))
	->setDescription(
	pht(
	diff --git a/src/applications/policy/controller/PhabricatorPolicyEditController.php b/src/applications/policy/controller/PhabricatorPolicyEditController.php
	--- a/src/applications/policy/controller/PhabricatorPolicyEditController.php
	+++ b/src/applications/policy/controller/PhabricatorPolicyEditController.php
	@@ -162,7 +162,7 @@
	'href' => '#',
	'class' => 'button green',
	'sigil' => 'create-rule',
	- 'mustcapture' => true
	+ 'mustcapture' => true,
	),
	pht('New Rule')))
	->setDescription(
	@@ -171,7 +171,7 @@
	'table',
	array(
	'sigil' => 'rules',
	- 'class' => 'policy-rules-table'
	+ 'class' => 'policy-rules-table',
	),
	'')))
	->appendChild(
	diff --git a/src/applications/policy/storage/PhabricatorPolicy.php b/src/applications/policy/storage/PhabricatorPolicy.php
	--- a/src/applications/policy/storage/PhabricatorPolicy.php
	+++ b/src/applications/policy/storage/PhabricatorPolicy.php
	@@ -245,7 +245,7 @@
	}
	}

	- public function renderDescription($icon=false) {
	+ public function renderDescription($icon = false) {
	$img = null;
	if ($icon) {
	$img = id(new PHUIIconView())
	diff --git a/src/applications/ponder/controller/PonderQuestionViewController.php b/src/applications/ponder/controller/PonderQuestionViewController.php
	--- a/src/applications/ponder/controller/PonderQuestionViewController.php
	+++ b/src/applications/ponder/controller/PonderQuestionViewController.php
	@@ -64,7 +64,7 @@
	$object_box,
	$question_xactions,
	$answers,
	- $answer_add_panel
	+ $answer_add_panel,
	),
	array(
	'title' => 'Q'.$question->getID().' '.$question->getTitle(),
	diff --git a/src/applications/ponder/storage/PonderQuestion.php b/src/applications/ponder/storage/PonderQuestion.php
	--- a/src/applications/ponder/storage/PonderQuestion.php
	+++ b/src/applications/ponder/storage/PonderQuestion.php
	@@ -87,7 +87,7 @@
	->withEdgeTypes(
	array(
	PhabricatorEdgeConfig::TYPE_VOTING_USER_HAS_QUESTION,
	- PhabricatorEdgeConfig::TYPE_VOTING_USER_HAS_ANSWER
	+ PhabricatorEdgeConfig::TYPE_VOTING_USER_HAS_ANSWER,
	))
	->needEdgeData(true)
	->execute();
	diff --git a/src/applications/project/controller/PhabricatorProjectBoardViewController.php b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
	--- a/src/applications/project/controller/PhabricatorProjectBoardViewController.php
	+++ b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
	@@ -300,7 +300,7 @@
	$header_link = phutil_tag(
	'a',
	array(
	- 'href' => $this->getApplicationURI('view/'.$project->getID().'/')
	+ 'href' => $this->getApplicationURI('view/'.$project->getID().'/'),
	),
	$project->getName());

	diff --git a/src/applications/project/controller/PhabricatorProjectColumnHideController.php b/src/applications/project/controller/PhabricatorProjectColumnHideController.php
	--- a/src/applications/project/controller/PhabricatorProjectColumnHideController.php
	+++ b/src/applications/project/controller/PhabricatorProjectColumnHideController.php
	@@ -35,7 +35,8 @@
	->requireCapabilities(
	array(
	PhabricatorPolicyCapability::CAN_VIEW,
	- PhabricatorPolicyCapability::CAN_EDIT))
	+ PhabricatorPolicyCapability::CAN_EDIT,
	+ ))
	->executeOne();
	if (!$column) {
	return new Aphront404Response();
	@@ -67,7 +68,8 @@
	$type_status = PhabricatorProjectColumnTransaction::TYPE_STATUS;
	$xactions = array(id(new PhabricatorProjectColumnTransaction())
	->setTransactionType($type_status)
	- ->setNewValue($new_status));
	+ ->setNewValue($new_status),
	+ );

	$editor = id(new PhabricatorProjectColumnTransactionEditor())
	->setActor($viewer)
	diff --git a/src/applications/project/controller/PhabricatorProjectEditIconController.php b/src/applications/project/controller/PhabricatorProjectEditIconController.php
	--- a/src/applications/project/controller/PhabricatorProjectEditIconController.php
	+++ b/src/applications/project/controller/PhabricatorProjectEditIconController.php
	@@ -71,7 +71,7 @@
	'sigil' => 'has-tooltip',
	'meta' => array(
	'tip' => $label,
	- )
	+ ),
	),
	array(
	$aural,
	diff --git a/src/applications/project/controller/PhabricatorProjectEditPictureController.php b/src/applications/project/controller/PhabricatorProjectEditPictureController.php
	--- a/src/applications/project/controller/PhabricatorProjectEditPictureController.php
	+++ b/src/applications/project/controller/PhabricatorProjectEditPictureController.php
	@@ -167,7 +167,8 @@
	'name' => 'phid',
	'value' => $phid,
	)),
	- $button);
	+ $button,
	+ );

	$button = phabricator_form(
	$viewer,
	diff --git a/src/applications/project/controller/PhabricatorProjectMoveController.php b/src/applications/project/controller/PhabricatorProjectMoveController.php
	--- a/src/applications/project/controller/PhabricatorProjectMoveController.php
	+++ b/src/applications/project/controller/PhabricatorProjectMoveController.php
	@@ -128,7 +128,8 @@
	->setNewValue(array(
	'newPriority' => $after_pri,
	'newSubpriorityBase' => $after_sub,
	- 'direction' => '>'));
	+ 'direction' => '>',
	+ ));

	} else if ($b_task &&
	(($b_task->getPriority() > $object->getPriority()) \|\|
	@@ -143,7 +144,8 @@
	->setNewValue(array(
	'newPriority' => $before_pri,
	'newSubpriorityBase' => $before_sub,
	- 'direction' => '<'));
	+ 'direction' => '<',
	+ ));
	}
	}

	diff --git a/src/applications/project/events/PhabricatorProjectUIEventListener.php b/src/applications/project/events/PhabricatorProjectUIEventListener.php
	--- a/src/applications/project/events/PhabricatorProjectUIEventListener.php
	+++ b/src/applications/project/events/PhabricatorProjectUIEventListener.php
	@@ -80,7 +80,8 @@

	$annotations[$project_phid] = array(
	' ',
	- $column_link);
	+ $column_link,
	+ );
	}
	}

	diff --git a/src/applications/project/query/PhabricatorProjectSearchEngine.php b/src/applications/project/query/PhabricatorProjectSearchEngine.php
	--- a/src/applications/project/query/PhabricatorProjectSearchEngine.php
	+++ b/src/applications/project/query/PhabricatorProjectSearchEngine.php
	@@ -219,14 +219,14 @@
	$workboards_url = phutil_tag(
	'a',
	array(
	- 'href' => $workboards_uri
	+ 'href' => $workboards_uri,
	),
	pht('Workboards'));

	$members_url = phutil_tag(
	'a',
	array(
	- 'href' => $members_uri
	+ 'href' => $members_uri,
	),
	pht('Members'));

	diff --git a/src/applications/releeph/application/PhabricatorReleephApplication.php b/src/applications/releeph/application/PhabricatorReleephApplication.php
	--- a/src/applications/releeph/application/PhabricatorReleephApplication.php
	+++ b/src/applications/releeph/application/PhabricatorReleephApplication.php
	@@ -74,7 +74,7 @@
	'comment/(?P<requestID>[1-9]\d*)/'
	=> 'ReleephRequestCommentController',
	),
	- )
	+ ),
	);
	}

	diff --git a/src/applications/releeph/commitfinder/ReleephCommitFinder.php b/src/applications/releeph/commitfinder/ReleephCommitFinder.php
	--- a/src/applications/releeph/commitfinder/ReleephCommitFinder.php
	+++ b/src/applications/releeph/commitfinder/ReleephCommitFinder.php
	@@ -69,7 +69,7 @@
	} else {
	$dr_data = array(
	'callsign' => $repository->getCallsign(),
	- 'commit' => $partial_string
	+ 'commit' => $partial_string,
	);
	}

	diff --git a/src/applications/releeph/conduit/ReleephQueryRequestsConduitAPIMethod.php b/src/applications/releeph/conduit/ReleephQueryRequestsConduitAPIMethod.php
	--- a/src/applications/releeph/conduit/ReleephQueryRequestsConduitAPIMethod.php
	+++ b/src/applications/releeph/conduit/ReleephQueryRequestsConduitAPIMethod.php
	@@ -15,7 +15,7 @@
	public function defineParamTypes() {
	return array(
	'revisionPHIDs' => 'optional list<phid>',
	- 'requestedCommitPHIDs' => 'optional list<phid>'
	+ 'requestedCommitPHIDs' => 'optional list<phid>',
	);
	}

	diff --git a/src/applications/releeph/controller/branch/ReleephBranchEditController.php b/src/applications/releeph/controller/branch/ReleephBranchEditController.php
	--- a/src/applications/releeph/controller/branch/ReleephBranchEditController.php
	+++ b/src/applications/releeph/controller/branch/ReleephBranchEditController.php
	@@ -81,7 +81,7 @@
	->setLabel(pht('Created By'))
	->setValue($handles[$creator_phid]->renderLink()))
	->appendChild(
	- id(new AphrontFormTextControl)
	+ id(new AphrontFormTextControl())
	->setLabel(pht('Symbolic Name'))
	->setName('symbolicName')
	->setValue($symbolic_name)
	diff --git a/src/applications/releeph/controller/request/ReleephRequestActionController.php b/src/applications/releeph/controller/request/ReleephRequestActionController.php
	--- a/src/applications/releeph/controller/request/ReleephRequestActionController.php
	+++ b/src/applications/releeph/controller/request/ReleephRequestActionController.php
	@@ -44,7 +44,8 @@
	case 'pass':
	static $action_map = array(
	'want' => ReleephRequest::INTENT_WANT,
	- 'pass' => ReleephRequest::INTENT_PASS);
	+ 'pass' => ReleephRequest::INTENT_PASS,
	+ );
	$intent = $action_map[$action];
	$xactions[] = id(new ReleephRequestTransaction())
	->setTransactionType(ReleephRequestTransaction::TYPE_USER_INTENT)
	diff --git a/src/applications/releeph/controller/request/ReleephRequestDifferentialCreateController.php b/src/applications/releeph/controller/request/ReleephRequestDifferentialCreateController.php
	--- a/src/applications/releeph/controller/request/ReleephRequestDifferentialCreateController.php
	+++ b/src/applications/releeph/controller/request/ReleephRequestDifferentialCreateController.php
	@@ -93,7 +93,7 @@
	}
	}

	- return id(new AphrontDialogResponse)
	+ return id(new AphrontDialogResponse())
	->setDialog($dialog);
	}

	diff --git a/src/applications/releeph/controller/request/ReleephRequestEditController.php b/src/applications/releeph/controller/request/ReleephRequestEditController.php
	--- a/src/applications/releeph/controller/request/ReleephRequestEditController.php
	+++ b/src/applications/releeph/controller/request/ReleephRequestEditController.php
	@@ -208,7 +208,7 @@
	hsprintf(
	'Requested %s by %s',
	$age_string,
	- $handles[$pull->getRequestUserPHID()]->renderLink())
	+ $handles[$pull->getRequestUserPHID()]->renderLink()),
	);
	$notice_view = id(new AphrontErrorView())
	->setSeverity(AphrontErrorView::SEVERITY_NOTICE)
	diff --git a/src/applications/releeph/field/specification/ReleephDiffSizeFieldSpecification.php b/src/applications/releeph/field/specification/ReleephDiffSizeFieldSpecification.php
	--- a/src/applications/releeph/field/specification/ReleephDiffSizeFieldSpecification.php
	+++ b/src/applications/releeph/field/specification/ReleephDiffSizeFieldSpecification.php
	@@ -65,8 +65,10 @@
	'meta' => array(
	'tip' => $test_blurb,
	'align' => 'E',
	- 'size' => 'auto'),
	- 'style' => ''),
	+ 'size' => 'auto',
	+ ),
	+ 'style' => '',
	+ ),
	' + tests');
	}

	@@ -107,7 +109,7 @@
	'tests' => array(
	'lines' => $test_lines,
	'paths' => array_unique($test_paths_touched),
	- )
	+ ),
	);
	}
	}
	diff --git a/src/applications/releeph/storage/ReleephProject.php b/src/applications/releeph/storage/ReleephProject.php
	--- a/src/applications/releeph/storage/ReleephProject.php
	+++ b/src/applications/releeph/storage/ReleephProject.php
	@@ -55,7 +55,7 @@
	$components = array(
	'/releeph/product',
	$this->getID(),
	- $path
	+ $path,
	);
	return implode('/', $components);
	}
	diff --git a/src/applications/releeph/view/branch/ReleephBranchPreviewView.php b/src/applications/releeph/view/branch/ReleephBranchPreviewView.php
	--- a/src/applications/releeph/view/branch/ReleephBranchPreviewView.php
	+++ b/src/applications/releeph/view/branch/ReleephBranchPreviewView.php
	@@ -46,7 +46,7 @@
	'params' => array(
	'static' => $this->statics,
	'dynamic' => $this->dynamics,
	- )
	+ ),
	));

	return phutil_tag(
	diff --git a/src/applications/releeph/view/request/ReleephRequestTypeaheadControl.php b/src/applications/releeph/view/request/ReleephRequestTypeaheadControl.php
	--- a/src/applications/releeph/view/request/ReleephRequestTypeaheadControl.php
	+++ b/src/applications/releeph/view/request/ReleephRequestTypeaheadControl.php
	@@ -51,7 +51,7 @@
	'callsign' => $this->repo->getCallsign(),
	'since' => $this->startTime,
	'limit' => 16,
	- )
	+ ),
	));

	return $div;
	diff --git a/src/applications/repository/engine/PhabricatorRepositoryPullEngine.php b/src/applications/repository/engine/PhabricatorRepositoryPullEngine.php
	--- a/src/applications/repository/engine/PhabricatorRepositoryPullEngine.php
	+++ b/src/applications/repository/engine/PhabricatorRepositoryPullEngine.php
	@@ -151,7 +151,7 @@
	PhabricatorRepositoryStatusMessage::TYPE_INIT,
	$code,
	array(
	- 'message' => $message
	+ 'message' => $message,
	));
	}

	diff --git a/src/applications/repository/storage/PhabricatorRepositoryPushLog.php b/src/applications/repository/storage/PhabricatorRepositoryPushLog.php
	--- a/src/applications/repository/storage/PhabricatorRepositoryPushLog.php
	+++ b/src/applications/repository/storage/PhabricatorRepositoryPushLog.php
	@@ -61,7 +61,8 @@
	PhabricatorRepositoryPushLog::CHANGEFLAG_REWRITE =>
	pht('change rewrites ref'),
	PhabricatorRepositoryPushLog::CHANGEFLAG_DANGEROUS =>
	- pht('dangerous change'));
	+ pht('dangerous change'),
	+ );
	}

	public function getConfiguration() {
	diff --git a/src/applications/repository/worker/commitchangeparser/PhabricatorOwnersPackagePathValidator.php b/src/applications/repository/worker/commitchangeparser/PhabricatorOwnersPackagePathValidator.php
	--- a/src/applications/repository/worker/commitchangeparser/PhabricatorOwnersPackagePathValidator.php
	+++ b/src/applications/repository/worker/commitchangeparser/PhabricatorOwnersPackagePathValidator.php
	@@ -60,7 +60,7 @@
	'packageID' => $package->getID(),
	'repositoryPHID' => $pkg_path->getRepositoryPHID(),
	'path' => str_replace($pkg_path->getPath(), $old_path,
	- $move_map[$old_path])
	+ $move_map[$old_path]),
	);
	$path_changed = true;
	}
	@@ -89,7 +89,7 @@
	'user' => PhabricatorUser::getOmnipotentUser(),
	'initFromConduit' => false,
	'repository' => $repository,
	- 'commit' => $commit->getCommitIdentifier()
	+ 'commit' => $commit->getCommitIdentifier(),
	);
	$drequest = DiffusionRequest::newFromDictionary($data);
	$change_query =
	diff --git a/src/applications/search/controller/PhabricatorSearchAttachController.php b/src/applications/search/controller/PhabricatorSearchAttachController.php
	--- a/src/applications/search/controller/PhabricatorSearchAttachController.php
	+++ b/src/applications/search/controller/PhabricatorSearchAttachController.php
	@@ -81,7 +81,8 @@
	->setMetadataValue('edge:type', $edge_type)
	->setNewValue(array(
	'+' => array_fuse($add_phids),
	- '-' => array_fuse($rem_phids)));
	+ '-' => array_fuse($rem_phids),
	+ ));
	$txn_editor->applyTransactions(
	$object->getApplicationTransactionObject(),
	array($txn_template));
	@@ -160,7 +161,8 @@
	$cc_vector[] = $target->getCCPHIDs();
	$cc_vector[] = array(
	$target->getAuthorPHID(),
	- $target->getOwnerPHID());
	+ $target->getOwnerPHID(),
	+ );

	$merged_into_txn = id(new ManiphestTransaction())
	->setTransactionType(ManiphestTransaction::TYPE_MERGED_INTO)
	diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelEmailAddresses.php b/src/applications/settings/panel/PhabricatorSettingsPanelEmailAddresses.php
	--- a/src/applications/settings/panel/PhabricatorSettingsPanelEmailAddresses.php
	+++ b/src/applications/settings/panel/PhabricatorSettingsPanelEmailAddresses.php
	@@ -75,7 +75,7 @@
	array(
	'class' => 'button small grey',
	'href' => $uri->alter('delete', $email->getID()),
	- 'sigil' => 'workflow'
	+ 'sigil' => 'workflow',
	),
	pht('Remove'));

	diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php b/src/applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php
	--- a/src/applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php
	+++ b/src/applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php
	@@ -146,7 +146,8 @@
	foreach ($editors as $editor) {
	$tag_groups[] = array(
	$editor->getEditorObjectsDescription(),
	- array_diff_key($editor->getMailTagsMap(), $common_tags));
	+ array_diff_key($editor->getMailTagsMap(), $common_tags),
	+ );
	}

	// Sort them, then put "Common" at the top.
	diff --git a/src/applications/slowvote/controller/PhabricatorSlowvoteVoteController.php b/src/applications/slowvote/controller/PhabricatorSlowvoteVoteController.php
	--- a/src/applications/slowvote/controller/PhabricatorSlowvoteVoteController.php
	+++ b/src/applications/slowvote/controller/PhabricatorSlowvoteVoteController.php
	@@ -65,7 +65,8 @@
	return id(new AphrontAjaxResponse())
	->setContent(array(
	'pollID' => $poll->getID(),
	- 'contentHTML' => $embed->render()));
	+ 'contentHTML' => $embed->render(),
	+ ));
	}

	if (!$request->isFormPost()) {
	diff --git a/src/applications/slowvote/view/SlowvoteEmbedView.php b/src/applications/slowvote/view/SlowvoteEmbedView.php
	--- a/src/applications/slowvote/view/SlowvoteEmbedView.php
	+++ b/src/applications/slowvote/view/SlowvoteEmbedView.php
	@@ -48,7 +48,8 @@
	require_celerity_resource('javelin-behavior-slowvote-embed');

	$config = array(
	- 'pollID' => $poll->getID());
	+ 'pollID' => $poll->getID(),
	+ );
	Javelin::initBehavior('slowvote-embed', $config);

	$user_choices = $poll->getViewerChoices($this->getUser());
	@@ -63,7 +64,7 @@
	$link_to_slowvote = phutil_tag(
	'a',
	array(
	- 'href' => '/V'.$poll->getID()
	+ 'href' => '/V'.$poll->getID(),
	),
	$poll->getQuestion());

	@@ -83,7 +84,8 @@
	array(
	'V'.$poll->getID(),
	' ',
	- $link_to_slowvote)));
	+ $link_to_slowvote,
	+ )));

	$description = null;
	if ($poll->getDescription()) {
	@@ -102,7 +104,8 @@

	$header = array(
	$header,
	- $description);
	+ $description,
	+ );
	}

	$vis = $poll->getResponseVisibility();
	@@ -171,8 +174,8 @@
	'class' => 'slowvote-embed',
	'sigil' => 'slowvote-embed',
	'meta' => array(
	- 'pollID' => $poll->getID()
	- )
	+ 'pollID' => $poll->getID(),
	+ ),
	),
	array($header, $body));
	}
	diff --git a/src/applications/subscriptions/view/SubscriptionListStringBuilder.php b/src/applications/subscriptions/view/SubscriptionListStringBuilder.php
	--- a/src/applications/subscriptions/view/SubscriptionListStringBuilder.php
	+++ b/src/applications/subscriptions/view/SubscriptionListStringBuilder.php
	@@ -69,7 +69,7 @@
	'a',
	array(
	'href' => $list_uri,
	- 'sigil' => 'workflow'
	+ 'sigil' => 'workflow',
	),
	$not_shown_txt);

	diff --git a/src/applications/tokens/controller/PhabricatorTokenGiveController.php b/src/applications/tokens/controller/PhabricatorTokenGiveController.php
	--- a/src/applications/tokens/controller/PhabricatorTokenGiveController.php
	+++ b/src/applications/tokens/controller/PhabricatorTokenGiveController.php
	@@ -90,7 +90,7 @@
	'sigil' => 'has-tooltip',
	'meta' => array(
	'tip' => $token->getName(),
	- )
	+ ),
	),
	array(
	$aural,
	diff --git a/src/applications/transactions/controller/PhabricatorApplicationTransactionValueController.php b/src/applications/transactions/controller/PhabricatorApplicationTransactionValueController.php
	--- a/src/applications/transactions/controller/PhabricatorApplicationTransactionValueController.php
	+++ b/src/applications/transactions/controller/PhabricatorApplicationTransactionValueController.php
	@@ -99,7 +99,7 @@
	$details[] = phutil_tag(
	'p',
	array(
	- 'class' => 'policy-transaction-detail-intro'
	+ 'class' => 'policy-transaction-detail-intro',
	),
	pht('These rules are processed in order:'));

	@@ -123,17 +123,18 @@
	}
	$details[] = phutil_tag('div',
	array(
	- 'class' => 'policy-transaction-detail-row'
	+ 'class' => 'policy-transaction-detail-row',
	),
	array(
	$icon,
	- $value));
	+ $value,
	+ ));
	}

	$details[] = phutil_tag(
	'p',
	array(
	- 'class' => 'policy-transaction-detail-end'
	+ 'class' => 'policy-transaction-detail-end',
	),
	pht(
	'If no rules match, %s all other users.',
	diff --git a/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php b/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
	--- a/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
	+++ b/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
	@@ -92,7 +92,7 @@
	'a',
	array(
	'class' => 'login-to-comment button',
	- 'href' => $uri
	+ 'href' => $uri,
	),
	pht('Login to Comment')));
	}
	diff --git a/src/applications/uiexample/examples/JavelinReactorExample.php b/src/applications/uiexample/examples/JavelinReactorExample.php
	--- a/src/applications/uiexample/examples/JavelinReactorExample.php
	+++ b/src/applications/uiexample/examples/JavelinReactorExample.php
	@@ -24,7 +24,7 @@
	'Reactive checkbox generates a boolean dynamic value',
	'ReactorCheckboxExample',
	'phabricator-uiexample-reactor-checkbox',
	- array('checked' => true)
	+ array('checked' => true),
	),
	array(
	'Reactive focus detector generates a boolean dynamic value',
	@@ -60,7 +60,7 @@
	'sendclass makes the class of an element a string dynamic value',
	'ReactorSendClassExample',
	'phabricator-uiexample-reactor-sendclass',
	- array()
	+ array(),
	),
	array(
	'sendproperties makes some properties of an object into dynamic values',
	diff --git a/src/applications/uiexample/examples/PHUIActionHeaderExample.php b/src/applications/uiexample/examples/PHUIActionHeaderExample.php
	--- a/src/applications/uiexample/examples/PHUIActionHeaderExample.php
	+++ b/src/applications/uiexample/examples/PHUIActionHeaderExample.php
	@@ -264,7 +264,7 @@
	$title3,
	$wrap3,
	$title4,
	- $wrap4
	+ $wrap4,
	));
	}
	}
	diff --git a/src/applications/uiexample/examples/PHUIBoxExample.php b/src/applications/uiexample/examples/PHUIBoxExample.php
	--- a/src/applications/uiexample/examples/PHUIBoxExample.php
	+++ b/src/applications/uiexample/examples/PHUIBoxExample.php
	@@ -23,7 +23,8 @@
	id(new PHUIBoxView())
	->appendChild($content2),
	id(new PHUIBoxView())
	- ->appendChild($content3));
	+ ->appendChild($content3),
	+ );


	$layout2 =
	@@ -38,7 +39,8 @@
	id(new PHUIBoxView())
	->appendChild($content3)
	->addMargin(PHUI::MARGIN_LARGE_LEFT)
	- ->addMargin(PHUI::MARGIN_LARGE_TOP));
	+ ->addMargin(PHUI::MARGIN_LARGE_TOP),
	+ );

	$layout3 =
	array(
	@@ -56,7 +58,8 @@
	->appendChild($content3)
	->setBorder(true)
	->addPadding(PHUI::PADDING_LARGE)
	- ->addMargin(PHUI::MARGIN_LARGE_BOTTOM));
	+ ->addMargin(PHUI::MARGIN_LARGE_BOTTOM),
	+ );

	$image = id(new PHUIIconView())
	->setIconFont('fa-heart');
	diff --git a/src/applications/uiexample/examples/PHUIButtonBarExample.php b/src/applications/uiexample/examples/PHUIButtonBarExample.php
	--- a/src/applications/uiexample/examples/PHUIButtonBarExample.php
	+++ b/src/applications/uiexample/examples/PHUIButtonBarExample.php
	@@ -19,7 +19,8 @@
	'Go Back' => 'fa-chevron-left bluegrey',
	'Choose Date' => 'fa-calendar bluegrey',
	'Edit View' => 'fa-pencil bluegrey',
	- 'Go Forward' => 'fa-chevron-right bluegrey');
	+ 'Go Forward' => 'fa-chevron-right bluegrey',
	+ );
	$button_bar = new PHUIButtonBarView();
	foreach ($icons as $text => $icon) {
	$image = id(new PHUIIconView())
	diff --git a/src/applications/uiexample/examples/PHUIButtonExample.php b/src/applications/uiexample/examples/PHUIButtonExample.php
	--- a/src/applications/uiexample/examples/PHUIButtonExample.php
	+++ b/src/applications/uiexample/examples/PHUIButtonExample.php
	@@ -48,7 +48,7 @@
	$column3[] = phutil_tag(
	'a',
	array(
	- 'class' => $color.' button dropdown'
	+ 'class' => $color.' button dropdown',
	),
	array(
	phutil_utf8_ucwords($color.' Dropdown'),
	@@ -67,10 +67,11 @@
	// PHUIButtonView

	$colors = array(null,
	- PHUIButtonView::GREEN,
	- PHUIButtonView::GREY,
	- PHUIButtonView::BLACK,
	- PHUIButtonView::DISABLED);
	+ PHUIButtonView::GREEN,
	+ PHUIButtonView::GREY,
	+ PHUIButtonView::BLACK,
	+ PHUIButtonView::DISABLED,
	+ );
	$sizes = array(null, PHUIButtonView::SMALL);
	$column = array();
	foreach ($colors as $color) {
	@@ -106,7 +107,8 @@
	'Comment' => 'fa-comment',
	'Give Token' => 'fa-trophy',
	'Reverse Time' => 'fa-clock-o',
	- 'Implode Earth' => 'fa-exclamation-triangle red');
	+ 'Implode Earth' => 'fa-exclamation-triangle red',
	+ );
	foreach ($icons as $text => $icon) {
	$image = id(new PHUIIconView())
	->setIconFont($icon);
	@@ -121,7 +123,8 @@
	$column2 = array();
	$icons = array(
	'Subscribe' => 'fa-check-circle bluegrey',
	- 'Edit' => 'fa-pencil bluegrey');
	+ 'Edit' => 'fa-pencil bluegrey',
	+ );
	foreach ($icons as $text => $icon) {
	$image = id(new PHUIIconView())
	->setIconFont($icon);
	@@ -195,6 +198,7 @@
	->addMargin(PHUI::MARGIN_LARGE);

	return array($head1, $wrap1, $head2, $wrap2, $head3, $wrap3,
	- $head4, $wrap4);
	+ $head4, $wrap4,
	+ );
	}
	}
	diff --git a/src/applications/uiexample/examples/PHUIColorPalletteExample.php b/src/applications/uiexample/examples/PHUIColorPalletteExample.php
	--- a/src/applications/uiexample/examples/PHUIColorPalletteExample.php
	+++ b/src/applications/uiexample/examples/PHUIColorPalletteExample.php
	@@ -28,7 +28,7 @@
	'c6539d' => 'Base Indigo {$indigo}',
	'f5e2ef' => '83% Indigo {$lightindigo}',
	'8e44ad' => 'Base Violet {$violet}',
	- 'ecdff1' => '83% Violet {$lightviolet}'
	+ 'ecdff1' => '83% Violet {$lightviolet}',
	);

	$greys = array(
	@@ -61,7 +61,8 @@
	'div',
	array(
	'style' => 'background-color: #'.$color.';',
	- 'class' => 'pl'),
	+ 'class' => 'pl',
	+ ),
	$name.' #'.$color);
	}

	@@ -71,7 +72,8 @@
	'div',
	array(
	'style' => 'background-color: #'.$color.';',
	- 'class' => 'pl'),
	+ 'class' => 'pl',
	+ ),
	$name.' #'.$color);
	}

	@@ -84,7 +86,8 @@
	'div',
	array(
	'style' => 'background-color: #'.$color.';',
	- 'class' => 'pl'),
	+ 'class' => 'pl',
	+ ),
	$name.' #'.$color);
	}

	@@ -92,7 +95,8 @@
	'a',
	array(
	'href' => 'http://color.hailpixel.com/#'.implode(',', $url),
	- 'class' => 'button grey mlb'),
	+ 'class' => 'button grey mlb',
	+ ),
	'Color Palette');

	$wrap1 = id(new PHUIObjectBoxView())
	@@ -113,7 +117,7 @@
	array(
	$wrap1,
	$wrap2,
	- $wrap3
	+ $wrap3,
	));
	- }
	+ }
	}
	diff --git a/src/applications/uiexample/examples/PHUIDocumentExample.php b/src/applications/uiexample/examples/PHUIDocumentExample.php
	--- a/src/applications/uiexample/examples/PHUIDocumentExample.php
	+++ b/src/applications/uiexample/examples/PHUIDocumentExample.php
	@@ -48,7 +48,7 @@
	->setIcon('fa-plus-circle')
	->setType(PHUIListItemView::TYPE_LINK);

	- $divider = id(new PHUIListItemView)
	+ $divider = id(new PHUIListItemView())
	->setType(PHUIListItemView::TYPE_DIVIDER);

	$header = id(new PHUIHeaderView())
	diff --git a/src/applications/uiexample/examples/PHUIFeedStoryExample.php b/src/applications/uiexample/examples/PHUIFeedStoryExample.php
	--- a/src/applications/uiexample/examples/PHUIFeedStoryExample.php
	+++ b/src/applications/uiexample/examples/PHUIFeedStoryExample.php
	@@ -32,7 +32,8 @@
	'like-1',
	'like-2',
	'heart-1',
	- 'heart-2');
	+ 'heart-2',
	+ );
	$tokenview = array();
	foreach ($tokens as $token) {
	$tokenview[] =
	@@ -152,42 +153,48 @@
	id(new PHUIBoxView())
	->appendChild($story1)
	->addMargin(PHUI::MARGIN_MEDIUM)
	- ->addPadding(PHUI::PADDING_SMALL));
	+ ->addPadding(PHUI::PADDING_SMALL),
	+ );

	$wrap2 =
	array(
	id(new PHUIBoxView())
	->appendChild($story2)
	->addMargin(PHUI::MARGIN_MEDIUM)
	- ->addPadding(PHUI::PADDING_SMALL));
	+ ->addPadding(PHUI::PADDING_SMALL),
	+ );

	$wrap3 =
	array(
	id(new PHUIBoxView())
	->appendChild($story3)
	->addMargin(PHUI::MARGIN_MEDIUM)
	- ->addPadding(PHUI::PADDING_SMALL));
	+ ->addPadding(PHUI::PADDING_SMALL),
	+ );

	$wrap4 =
	array(
	id(new PHUIBoxView())
	->appendChild($story4)
	->addMargin(PHUI::MARGIN_MEDIUM)
	- ->addPadding(PHUI::PADDING_SMALL));
	+ ->addPadding(PHUI::PADDING_SMALL),
	+ );

	$wrap5 =
	array(
	id(new PHUIBoxView())
	->appendChild($story5)
	->addMargin(PHUI::MARGIN_MEDIUM)
	- ->addPadding(PHUI::PADDING_SMALL));
	+ ->addPadding(PHUI::PADDING_SMALL),
	+ );

	$wrap6 =
	array(
	id(new PHUIBoxView())
	->appendChild($story6)
	->addMargin(PHUI::MARGIN_MEDIUM)
	- ->addPadding(PHUI::PADDING_SMALL));
	+ ->addPadding(PHUI::PADDING_SMALL),
	+ );

	return phutil_tag(
	'div',
	@@ -204,7 +211,7 @@
	$head5,
	$wrap5,
	$head6,
	- $wrap6
	+ $wrap6,
	));
	}
	}
	diff --git a/src/applications/uiexample/examples/PHUIIconExample.php b/src/applications/uiexample/examples/PHUIIconExample.php
	--- a/src/applications/uiexample/examples/PHUIIconExample.php
	+++ b/src/applications/uiexample/examples/PHUIIconExample.php
	@@ -109,7 +109,8 @@
	'like-1',
	'like-2',
	'heart-1',
	- 'heart-2');
	+ 'heart-2',
	+ );
	$tokenview = array();
	foreach ($tokens as $token) {
	$tokenview[] =
	@@ -122,7 +123,8 @@
	'Asana',
	'Dropbox',
	'Google',
	- 'Github');
	+ 'Github',
	+ );
	$loginview = array();
	foreach ($logins as $login) {
	$loginview[] =
	@@ -163,7 +165,7 @@
	$fa_link = phutil_tag(
	'a',
	array(
	- 'href' => 'http://fontawesome.io'
	+ 'href' => 'http://fontawesome.io',
	),
	'http://fontawesome.io');
	$fa_text = pht('Font Awesome by Dave Gandy - %s', $fa_link);
	@@ -203,7 +205,7 @@
	$wrap2,
	$wrap3,
	$wrap4,
	- $wrap5
	+ $wrap5,
	));
	- }
	+ }
	}
	diff --git a/src/applications/uiexample/examples/PHUIImageMaskExample.php b/src/applications/uiexample/examples/PHUIImageMaskExample.php
	--- a/src/applications/uiexample/examples/PHUIImageMaskExample.php
	+++ b/src/applications/uiexample/examples/PHUIImageMaskExample.php
	@@ -82,7 +82,7 @@
	$box2,
	$box3,
	$box4,
	- $box5
	+ $box5,
	));
	}
	}
	diff --git a/src/applications/uiexample/examples/PHUIInfoPanelExample.php b/src/applications/uiexample/examples/PHUIInfoPanelExample.php
	--- a/src/applications/uiexample/examples/PHUIInfoPanelExample.php
	+++ b/src/applications/uiexample/examples/PHUIInfoPanelExample.php
	@@ -133,7 +133,7 @@
	$head1,
	$wrap1,
	$head2,
	- $wrap2
	+ $wrap2,
	));
	- }
	+ }
	}
	diff --git a/src/applications/uiexample/examples/PHUIListExample.php b/src/applications/uiexample/examples/PHUIListExample.php
	--- a/src/applications/uiexample/examples/PHUIListExample.php
	+++ b/src/applications/uiexample/examples/PHUIListExample.php
	@@ -84,7 +84,7 @@
	->setHref('#')
	->setType(PHUIListItemView::TYPE_LINK);

	- $divider = id(new PHUIListItemView)
	+ $divider = id(new PHUIListItemView())
	->setType(PHUIListItemView::TYPE_DIVIDER);

	$sidenav = id(new PHUIListView())
	@@ -211,35 +211,40 @@
	->appendChild($unstyled)
	->addMargin(PHUI::MARGIN_MEDIUM)
	->addPadding(PHUI::PADDING_SMALL)
	- ->setBorder(true));
	+ ->setBorder(true),
	+ );

	$layout2 =
	array(
	id(new PHUIBoxView())
	->appendChild($sidenav)
	->addMargin(PHUI::MARGIN_MEDIUM)
	- ->setBorder(true));
	+ ->setBorder(true),
	+ );

	$layout3 =
	array(
	id(new PHUIBoxView())
	->appendChild($topnav)
	->addMargin(PHUI::MARGIN_MEDIUM)
	- ->setBorder(true));
	+ ->setBorder(true),
	+ );

	$layout4 =
	array(
	id(new PHUIBoxView())
	->appendChild($actionmenu)
	->addMargin(PHUI::MARGIN_MEDIUM)
	- ->setBorder(true));
	+ ->setBorder(true),
	+ );

	$layout5 =
	array(
	id(new PHUIBoxView())
	->appendChild($statustabs)
	->addMargin(PHUI::MARGIN_MEDIUM)
	- ->setBorder(true));
	+ ->setBorder(true),
	+ );

	$head1 = id(new PHUIHeaderView())
	->setHeader(pht('Unstyled'));
	@@ -291,7 +296,7 @@
	$head5,
	$wrap5,
	$head4,
	- $wrap4
	+ $wrap4,
	));
	- }
	+ }
	}
	diff --git a/src/applications/uiexample/examples/PHUITextExample.php b/src/applications/uiexample/examples/PHUITextExample.php
	--- a/src/applications/uiexample/examples/PHUITextExample.php
	+++ b/src/applications/uiexample/examples/PHUITextExample.php
	@@ -54,7 +54,8 @@
	->addClass(PHUI::TEXT_WHITE),
	id(new PHUITextView())
	->setText($color9)
	- ->addClass(PHUI::TEXT_BLACK));
	+ ->addClass(PHUI::TEXT_BLACK),
	+ );

	$content2 =
	array(
	@@ -66,7 +67,8 @@
	->addClass(PHUI::TEXT_UPPERCASE),
	id(new PHUITextView())
	->setText($text3)
	- ->addClass(PHUI::TEXT_STRIKE));
	+ ->addClass(PHUI::TEXT_STRIKE),
	+ );

	$layout1 = id(new PHUIBoxView())
	->appendChild($content)
	@@ -99,7 +101,7 @@
	$head1,
	$wrap1,
	$head2,
	- $wrap2
	+ $wrap2,
	));
	- }
	+ }
	}
	diff --git a/src/applications/uiexample/examples/PhabricatorMultiColumnExample.php b/src/applications/uiexample/examples/PhabricatorMultiColumnExample.php
	--- a/src/applications/uiexample/examples/PhabricatorMultiColumnExample.php
	+++ b/src/applications/uiexample/examples/PhabricatorMultiColumnExample.php
	@@ -19,7 +19,7 @@
	'div',
	array(
	'class' => 'pm',
	- 'style' => 'border: 1px solid green;'
	+ 'style' => 'border: 1px solid green;',
	),
	'Bruce Campbell');

	@@ -27,7 +27,7 @@
	'div',
	array(
	'class' => 'pm',
	- 'style' => 'border: 1px solid blue;'
	+ 'style' => 'border: 1px solid blue;',
	),
	'Army of Darkness');

	@@ -165,42 +165,42 @@
	$wrap1 = phutil_tag(
	'div',
	array(
	- 'class' => 'ml'
	+ 'class' => 'ml',
	),
	$layout1);

	$wrap2 = phutil_tag(
	'div',
	array(
	- 'class' => 'ml'
	+ 'class' => 'ml',
	),
	$layout2);

	$wrap3 = phutil_tag(
	'div',
	array(
	- 'class' => 'ml'
	+ 'class' => 'ml',
	),
	$layout3);

	$wrap4 = phutil_tag(
	'div',
	array(
	- 'class' => 'ml'
	+ 'class' => 'ml',
	),
	$layout4);

	$wrap5 = phutil_tag(
	'div',
	array(
	- 'class' => 'ml'
	+ 'class' => 'ml',
	),
	$layout5);

	$wrap6 = phutil_tag(
	'div',
	array(
	- 'class' => 'ml'
	+ 'class' => 'ml',
	),
	$layout6);

	@@ -219,7 +219,7 @@
	$head5,
	$wrap5,
	$head6,
	- $wrap6
	+ $wrap6,
	));
	}
	}
	diff --git a/src/applications/uiexample/examples/PhabricatorTwoColumnExample.php b/src/applications/uiexample/examples/PhabricatorTwoColumnExample.php
	--- a/src/applications/uiexample/examples/PhabricatorTwoColumnExample.php
	+++ b/src/applications/uiexample/examples/PhabricatorTwoColumnExample.php
	@@ -15,21 +15,21 @@
	$main = phutil_tag(
	'div',
	array(
	- 'style' => 'border: 1px solid blue; padding: 20px;'
	+ 'style' => 'border: 1px solid blue; padding: 20px;',
	),
	'Mary, mary quite contrary.');

	$side = phutil_tag(
	'div',
	array(
	- 'style' => 'border: 1px solid red; padding: 20px;'
	+ 'style' => 'border: 1px solid red; padding: 20px;',
	),
	'How does your garden grow?');


	- $content = id(new AphrontTwoColumnView)
	- ->setMainColumn($main)
	- ->setSideColumn($side);
	+ $content = id(new AphrontTwoColumnView())
	+ ->setMainColumn($main)
	+ ->setSideColumn($side);

	return $content;
	}
	diff --git a/src/infrastructure/celerity/CelerityStaticResourceResponse.php b/src/infrastructure/celerity/CelerityStaticResourceResponse.php
	--- a/src/infrastructure/celerity/CelerityStaticResourceResponse.php
	+++ b/src/infrastructure/celerity/CelerityStaticResourceResponse.php
	@@ -206,7 +206,8 @@

	$behavior_groups = array(
	$higher_priority_behaviors,
	- $behaviors);
	+ $behaviors,
	+ );

	foreach ($behavior_groups as $group) {
	if (!$group) {
	diff --git a/src/infrastructure/daemon/bot/adapter/PhabricatorBotFlowdockProtocolAdapter.php b/src/infrastructure/daemon/bot/adapter/PhabricatorBotFlowdockProtocolAdapter.php
	--- a/src/infrastructure/daemon/bot/adapter/PhabricatorBotFlowdockProtocolAdapter.php
	+++ b/src/infrastructure/daemon/bot/adapter/PhabricatorBotFlowdockProtocolAdapter.php
	@@ -76,7 +76,8 @@
	array(
	'flow' => $flow->getName(),
	'event' => 'message',
	- 'content' => $body));
	+ 'content' => $body,
	+ ));
	}

	public function __destruct() {
	diff --git a/src/infrastructure/daemon/bot/adapter/PhabricatorCampfireProtocolAdapter.php b/src/infrastructure/daemon/bot/adapter/PhabricatorCampfireProtocolAdapter.php
	--- a/src/infrastructure/daemon/bot/adapter/PhabricatorCampfireProtocolAdapter.php
	+++ b/src/infrastructure/daemon/bot/adapter/PhabricatorCampfireProtocolAdapter.php
	@@ -92,7 +92,9 @@
	array(
	'message' => array(
	'type' => $type,
	- 'body' => $message)));
	+ 'body' => $message,
	+ ),
	+ ));
	}

	public function __destruct() {
	diff --git a/src/infrastructure/daemon/bot/adapter/PhabricatorIRCProtocolAdapter.php b/src/infrastructure/daemon/bot/adapter/PhabricatorIRCProtocolAdapter.php
	--- a/src/infrastructure/daemon/bot/adapter/PhabricatorIRCProtocolAdapter.php
	+++ b/src/infrastructure/daemon/bot/adapter/PhabricatorIRCProtocolAdapter.php
	@@ -20,7 +20,8 @@

	// Hash map of command translations
	public static $commandTranslations = array(
	- 'PRIVMSG' => 'MESSAGE');
	+ 'PRIVMSG' => 'MESSAGE',
	+ );

	public function connect() {
	$nick = $this->getConfig('nick', 'phabot');
	@@ -246,7 +247,8 @@

	return array(
	$target,
	- rtrim($matches[2], "\r\n"));
	+ rtrim($matches[2], "\r\n"),
	+ );
	}
	break;
	}
	@@ -254,7 +256,8 @@
	// By default we assume there is no target, only a body
	return array(
	null,
	- $data);
	+ $data,
	+ );
	}

	public function disconnect() {
	diff --git a/src/infrastructure/daemon/bot/handler/PhabricatorBotWhatsNewHandler.php b/src/infrastructure/daemon/bot/handler/PhabricatorBotWhatsNewHandler.php
	--- a/src/infrastructure/daemon/bot/handler/PhabricatorBotWhatsNewHandler.php
	+++ b/src/infrastructure/daemon/bot/handler/PhabricatorBotWhatsNewHandler.php
	@@ -30,7 +30,7 @@
	'feed.query',
	array(
	'limit' => 5,
	- 'view' => 'text'
	+ 'view' => 'text',
	));

	foreach ($latest as $feed_item) {
	diff --git a/src/infrastructure/diff/view/PhabricatorInlineSummaryView.php b/src/infrastructure/diff/view/PhabricatorInlineSummaryView.php
	--- a/src/infrastructure/diff/view/PhabricatorInlineSummaryView.php
	+++ b/src/infrastructure/diff/view/PhabricatorInlineSummaryView.php
	@@ -26,7 +26,8 @@
	'phabricator-inline-summary',
	array(
	$icon,
	- pht('Inline Comments')));
	+ pht('Inline Comments'),
	+ ));
	return $header;
	}

	@@ -101,7 +102,8 @@
	'class' => 'inline-summary-content',
	'colspan' => $colspan,
	),
	- phutil_tag_div('phabricator-remarkup', $item['content']))));
	+ phutil_tag_div('phabricator-remarkup', $item['content'])),
	+ ));
	}
	}

	diff --git a/src/infrastructure/internationalization/translation/PhabricatorBaseEnglishTranslation.php b/src/infrastructure/internationalization/translation/PhabricatorBaseEnglishTranslation.php
	--- a/src/infrastructure/internationalization/translation/PhabricatorBaseEnglishTranslation.php
	+++ b/src/infrastructure/internationalization/translation/PhabricatorBaseEnglishTranslation.php
	@@ -375,29 +375,29 @@
	'%s added %d blocking task(s): %s.' => array(
	array(
	'%s added a blocking task: %3$s.',
	- '%s added blocking tasks: %3$s.'
	+ '%s added blocking tasks: %3$s.',
	),
	),

	'%s added %d blocked task(s): %s.' => array(
	array(
	'%s added a blocked task: %3$s.',
	- '%s added blocked tasks: %3$s.'
	- )
	+ '%s added blocked tasks: %3$s.',
	+ ),
	),

	'%s removed %d blocking task(s): %s.' => array(
	array(
	'%s removed a blocking task: %3$s.',
	- '%s removed blocking tasks: %3$s.'
	+ '%s removed blocking tasks: %3$s.',
	),
	),

	'%s removed %d blocked task(s): %s.' => array(
	array(
	'%s removed a blocked task: %3$s.',
	- '%s removed blocked tasks: %3$s.'
	- )
	+ '%s removed blocked tasks: %3$s.',
	+ ),
	),

	'%s edited answer(s), added %d: %s; removed %d: %s.' =>
	diff --git a/src/infrastructure/sms/adapter/PhabricatorSMSImplementationTestBlackholeAdapter.php b/src/infrastructure/sms/adapter/PhabricatorSMSImplementationTestBlackholeAdapter.php
	--- a/src/infrastructure/sms/adapter/PhabricatorSMSImplementationTestBlackholeAdapter.php
	+++ b/src/infrastructure/sms/adapter/PhabricatorSMSImplementationTestBlackholeAdapter.php
	@@ -17,7 +17,8 @@
	public function getSMSDataFromResult($result) {
	return array(
	Filesystem::readRandomCharacters(40),
	- PhabricatorSMS::STATUS_SENT);
	+ PhabricatorSMS::STATUS_SENT,
	+ );
	}

	public function pollSMSSentStatus(PhabricatorSMS $sms) {
	diff --git a/src/infrastructure/sms/worker/PhabricatorSMSDemultiplexWorker.php b/src/infrastructure/sms/worker/PhabricatorSMSDemultiplexWorker.php
	--- a/src/infrastructure/sms/worker/PhabricatorSMSDemultiplexWorker.php
	+++ b/src/infrastructure/sms/worker/PhabricatorSMSDemultiplexWorker.php
	@@ -23,7 +23,8 @@
	$this->queueTask(
	'PhabricatorSMSSendWorker',
	array(
	- 'smsID' => $sms->getID()));
	+ 'smsID' => $sms->getID(),
	+ ));
	}
	}

	diff --git a/src/infrastructure/storage/lisk/__tests__/LiskChunkTestCase.php b/src/infrastructure/storage/lisk/__tests__/LiskChunkTestCase.php
	--- a/src/infrastructure/storage/lisk/__tests__/LiskChunkTestCase.php
	+++ b/src/infrastructure/storage/lisk/__tests__/LiskChunkTestCase.php
	@@ -23,7 +23,7 @@


	$fragments = array(
	- 'a', 'a', 'a', 'XX', 'a', 'a', 'a', 'a'
	+ 'a', 'a', 'a', 'XX', 'a', 'a', 'a', 'a',
	);

	$this->assertEqual(
	diff --git a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDestroyWorkflow.php b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDestroyWorkflow.php
	--- a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDestroyWorkflow.php
	+++ b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDestroyWorkflow.php
	@@ -14,7 +14,8 @@
	'name' => 'unittest-fixtures',
	'help' => 'Restrict destroy operations to databases created '.
	'by PhabricatorTestCase test fixtures.',
	- )));
	+ ),
	+ ));
	}

	public function execute(PhutilArgumentParser $args) {
	diff --git a/src/view/AphrontDialogView.php b/src/view/AphrontDialogView.php
	--- a/src/view/AphrontDialogView.php
	+++ b/src/view/AphrontDialogView.php
	@@ -262,7 +262,7 @@
	'type' => 'hidden',
	'name' => $key,
	'value' => $value,
	- 'sigil' => 'aphront-dialog-application-input'
	+ 'sigil' => 'aphront-dialog-application-input',
	));
	}

	@@ -270,7 +270,8 @@
	$buttons = array(phabricator_form(
	$this->user,
	$form_attributes,
	- array_merge($hidden_inputs, $buttons)));
	+ array_merge($hidden_inputs, $buttons)),
	+ );
	}

	$children = $this->renderChildren();
	@@ -288,7 +289,8 @@
	if ($errors) {
	$children = array(
	id(new AphrontErrorView())->setErrors($errors),
	- $children);
	+ $children,
	+ );
	}

	$header = new PHUIActionHeaderView();
	diff --git a/src/view/control/AphrontTokenizerTemplateView.php b/src/view/control/AphrontTokenizerTemplateView.php
	--- a/src/view/control/AphrontTokenizerTemplateView.php
	+++ b/src/view/control/AphrontTokenizerTemplateView.php
	@@ -83,7 +83,8 @@
	array(
	'class' => 'phui-icon-view phui-font-fa bluetext '.$icon,
	)),
	- $value);
	+ $value,
	+ );
	}

	return phutil_tag(
	diff --git a/src/view/form/control/AphrontFormCheckboxControl.php b/src/view/form/control/AphrontFormCheckboxControl.php
	--- a/src/view/form/control/AphrontFormCheckboxControl.php
	+++ b/src/view/form/control/AphrontFormCheckboxControl.php
	@@ -40,7 +40,7 @@
	$box['label']);
	$rows[] = phutil_tag('tr', array(), array(
	phutil_tag('td', array(), $checkbox),
	- phutil_tag('th', array(), $label)
	+ phutil_tag('th', array(), $label),
	));
	}
	return phutil_tag(
	diff --git a/src/view/form/control/AphrontFormCropControl.php b/src/view/form/control/AphrontFormCropControl.php
	--- a/src/view/form/control/AphrontFormCropControl.php
	+++ b/src/view/form/control/AphrontFormCropControl.php
	@@ -32,7 +32,7 @@
	return phutil_tag(
	'img',
	array(
	- 'src' => PhabricatorUser::getDefaultProfileImageURI()
	+ 'src' => PhabricatorUser::getDefaultProfileImageURI(),
	),
	'');
	}
	@@ -61,7 +61,7 @@
	'id' => $c_id,
	'sigil' => 'crop-box',
	'mustcapture' => true,
	- 'class' => 'crop-box'
	+ 'class' => 'crop-box',
	),
	array(
	javelin_tag(
	@@ -69,7 +69,7 @@
	array(
	'src' => $file->getBestURI(),
	'class' => 'crop-image',
	- 'sigil' => 'crop-image'
	+ 'sigil' => 'crop-image',
	),
	''),
	javelin_tag(
	diff --git a/src/view/form/control/AphrontFormTextControl.php b/src/view/form/control/AphrontFormTextControl.php
	--- a/src/view/form/control/AphrontFormTextControl.php
	+++ b/src/view/form/control/AphrontFormTextControl.php
	@@ -48,7 +48,7 @@
	'autocomplete' => $this->getDisableAutocomplete() ? 'off' : null,
	'id' => $this->getID(),
	'sigil' => $this->getSigil(),
	- 'placeholder' => $this->getPlaceholder()
	+ 'placeholder' => $this->getPlaceholder(),
	));
	}

	diff --git a/src/view/form/control/AphrontFormTextWithSubmitControl.php b/src/view/form/control/AphrontFormTextWithSubmitControl.php
	--- a/src/view/form/control/AphrontFormTextWithSubmitControl.php
	+++ b/src/view/form/control/AphrontFormTextWithSubmitControl.php
	@@ -49,7 +49,7 @@
	array(
	'type' => 'submit',
	'class' => 'text-with-submit-control-submit grey',
	- 'value' => coalesce($this->getSubmitLabel(), pht('Submit'))
	+ 'value' => coalesce($this->getSubmitLabel(), pht('Submit')),
	))),
	));
	}
	diff --git a/src/view/layout/AphrontListFilterView.php b/src/view/layout/AphrontListFilterView.php
	--- a/src/view/layout/AphrontListFilterView.php
	+++ b/src/view/layout/AphrontListFilterView.php
	@@ -110,7 +110,7 @@
	return phutil_tag(
	'div',
	array(
	- 'class' => 'aphront-list-filter-wrap'
	+ 'class' => 'aphront-list-filter-wrap',
	),
	$content);
	}
	diff --git a/src/view/layout/AphrontMultiColumnView.php b/src/view/layout/AphrontMultiColumnView.php
	--- a/src/view/layout/AphrontMultiColumnView.php
	+++ b/src/view/layout/AphrontMultiColumnView.php
	@@ -31,7 +31,8 @@
	'column' => $column,
	'class' => $class,
	'sigil' => $sigil,
	- 'metadata' => $metadata);
	+ 'metadata' => $metadata,
	+ );
	return $this;
	}

	@@ -95,12 +96,14 @@
	array(
	'class' => implode(' ', $column_class),
	'sigil' => $column_sigil,
	- 'meta' => $column_metadata),
	+ 'meta' => $column_metadata,
	+ ),
	$column);
	$columns[] = phutil_tag(
	'div',
	array(
	- 'class' => implode(' ', $outer_class)),
	+ 'class' => implode(' ', $outer_class),
	+ ),
	$column_inner);
	}

	@@ -127,7 +130,7 @@
	$board = phutil_tag(
	'div',
	array(
	- 'class' => implode(' ', $classes)
	+ 'class' => implode(' ', $classes),
	),
	$view);

	diff --git a/src/view/layout/AphrontSideNavFilterView.php b/src/view/layout/AphrontSideNavFilterView.php
	--- a/src/view/layout/AphrontSideNavFilterView.php
	+++ b/src/view/layout/AphrontSideNavFilterView.php
	@@ -294,7 +294,7 @@
	array(
	$crumbs,
	$this->renderChildren(),
	- ))
	+ )),
	));
	}

	diff --git a/src/view/layout/AphrontTwoColumnView.php b/src/view/layout/AphrontTwoColumnView.php
	--- a/src/view/layout/AphrontTwoColumnView.php
	+++ b/src/view/layout/AphrontTwoColumnView.php
	@@ -33,14 +33,14 @@
	$main = phutil_tag(
	'div',
	array(
	- 'class' => 'aphront-main-column'
	+ 'class' => 'aphront-main-column',
	),
	$this->mainColumn);

	$side = phutil_tag(
	'div',
	array(
	- 'class' => 'aphront-side-column'
	+ 'class' => 'aphront-side-column',
	),
	$this->sideColumn);

	@@ -56,7 +56,7 @@
	return phutil_tag(
	'div',
	array(
	- 'class' => implode(' ', $classes)
	+ 'class' => implode(' ', $classes),
	),
	array(
	$main,
	diff --git a/src/view/layout/PhabricatorActionListView.php b/src/view/layout/PhabricatorActionListView.php
	--- a/src/view/layout/PhabricatorActionListView.php
	+++ b/src/view/layout/PhabricatorActionListView.php
	@@ -57,7 +57,7 @@
	'ul',
	array(
	'class' => 'phabricator-action-list-view',
	- 'id' => $this->id
	+ 'id' => $this->id,
	),
	$actions);
	}
	diff --git a/src/view/layout/PhabricatorCrumbsView.php b/src/view/layout/PhabricatorCrumbsView.php
	--- a/src/view/layout/PhabricatorCrumbsView.php
	+++ b/src/view/layout/PhabricatorCrumbsView.php
	@@ -63,7 +63,7 @@
	$name = phutil_tag(
	'span',
	array(
	- 'class' => 'phabricator-crumbs-action-name'
	+ 'class' => 'phabricator-crumbs-action-name',
	),
	$action->getName());

	@@ -84,7 +84,7 @@
	'href' => $action->getHref(),
	'class' => implode(' ', $action_classes),
	'sigil' => implode(' ', $action_sigils),
	- 'style' => $action->getStyle()
	+ 'style' => $action->getStyle(),
	),
	array(
	$icon,
	@@ -99,7 +99,7 @@
	$name = phutil_tag(
	'span',
	array(
	- 'class' => 'phabricator-crumbs-action-name'
	+ 'class' => 'phabricator-crumbs-action-name',
	),
	pht('Actions'));

	@@ -114,7 +114,7 @@
	'meta' => array(
	'map' => array(
	$this->actionListID => 'phabricator-action-list-toggle',
	- $icon_id => 'phabricator-crumbs-action-menu-open'
	+ $icon_id => 'phabricator-crumbs-action-menu-open',
	),
	),
	),
	diff --git a/src/view/layout/PhabricatorSourceCodeView.php b/src/view/layout/PhabricatorSourceCodeView.php
	--- a/src/view/layout/PhabricatorSourceCodeView.php
	+++ b/src/view/layout/PhabricatorSourceCodeView.php
	@@ -77,7 +77,7 @@
	$tag_number = javelin_tag(
	'a',
	array(
	- 'href' => $line_href
	+ 'href' => $line_href,
	),
	$line_number);
	} else {
	@@ -95,15 +95,16 @@
	'th',
	array(
	'class' => 'phabricator-source-line',
	- 'sigil' => 'phabricator-source-line'
	+ 'sigil' => 'phabricator-source-line',
	),
	$tag_number),
	phutil_tag(
	'td',
	array(
	- 'class' => 'phabricator-source-code'
	+ 'class' => 'phabricator-source-code',
	),
	- $content_line)));
	+ $content_line),
	+ ));

	if ($hit_limit) {
	break;
	@@ -123,7 +124,7 @@
	'table',
	array(
	'class' => implode(' ', $classes),
	- 'sigil' => 'phabricator-source'
	+ 'sigil' => 'phabricator-source',
	),
	phutil_implode_html('', $rows)));
	}
	diff --git a/src/view/page/PhabricatorBarePageView.php b/src/view/page/PhabricatorBarePageView.php
	--- a/src/view/page/PhabricatorBarePageView.php
	+++ b/src/view/page/PhabricatorBarePageView.php
	@@ -79,14 +79,14 @@
	'link',
	array(
	'rel' => 'apple-touch-icon',
	- 'href' => celerity_get_resource_uri('/rsrc/image/apple-touch-icon.png')
	+ 'href' => celerity_get_resource_uri('/rsrc/image/apple-touch-icon.png'),
	));

	$apple_tag = phutil_tag(
	'meta',
	array(
	'name' => 'apple-mobile-web-app-status-bar-style',
	- 'content' => 'black-translucent'
	+ 'content' => 'black-translucent',
	));

	$referrer_tag = phutil_tag(
	diff --git a/src/view/page/menu/PhabricatorMainMenuView.php b/src/view/page/menu/PhabricatorMainMenuView.php
	--- a/src/view/page/menu/PhabricatorMainMenuView.php
	+++ b/src/view/page/menu/PhabricatorMainMenuView.php
	@@ -314,7 +314,7 @@
	'span',
	array(
	'id' => $message_count_id,
	- 'class' => 'phabricator-main-menu-message-count'
	+ 'class' => 'phabricator-main-menu-message-count',
	),
	$message_count_number);

	@@ -398,7 +398,7 @@
	'span',
	array(
	'id' => $count_id,
	- 'class' => 'phabricator-main-menu-alert-count'
	+ 'class' => 'phabricator-main-menu-alert-count',
	),
	$count_number);

	@@ -447,7 +447,8 @@

	$dropdowns = array(
	$notification_dropdown,
	- $message_notification_dropdown);
	+ $message_notification_dropdown,
	+ );

	$applications = PhabricatorApplication::getAllInstalledApplications();
	foreach ($applications as $application) {
	diff --git a/src/view/phui/PHUIActionHeaderView.php b/src/view/phui/PHUIActionHeaderView.php
	--- a/src/view/phui/PHUIActionHeaderView.php
	+++ b/src/view/phui/PHUIActionHeaderView.php
	@@ -99,7 +99,7 @@
	$action_list[] = phutil_tag(
	'li',
	array(
	- 'class' => 'phui-action-header-icon-item'
	+ 'class' => 'phui-action-header-icon-item',
	),
	$action);
	}
	@@ -109,7 +109,7 @@
	$action_list[] = phutil_tag(
	'li',
	array(
	- 'class' => 'phui-action-header-icon-item'
	+ 'class' => 'phui-action-header-icon-item',
	),
	$this->tag);
	}
	@@ -126,7 +126,7 @@
	array(
	'class' => 'phui-action-header-link',
	'href' => $this->headerHref,
	- 'sigil' => implode(' ', $this->headerSigils)
	+ 'sigil' => implode(' ', $this->headerSigils),
	),
	$this->headerTitle);
	}
	@@ -134,18 +134,19 @@
	$header = phutil_tag(
	'h3',
	array(
	- 'class' => 'phui-action-header-title'
	+ 'class' => 'phui-action-header-title',
	),
	array(
	$header_icon,
	- $header_title));
	+ $header_title,
	+ ));

	$icons = '';
	if (nonempty($action_list)) {
	$icons = phutil_tag(
	'ul',
	array(
	- 'class' => 'phui-action-header-icon-list'
	+ 'class' => 'phui-action-header-icon-list',
	),
	$action_list);
	}
	@@ -153,11 +154,11 @@
	return phutil_tag(
	'div',
	array(
	- 'class' => implode(' ', $classes)
	+ 'class' => implode(' ', $classes),
	),
	array(
	$header,
	- $icons
	+ $icons,
	));
	}
	}
	diff --git a/src/view/phui/PHUIDocumentView.php b/src/view/phui/PHUIDocumentView.php
	--- a/src/view/phui/PHUIDocumentView.php
	+++ b/src/view/phui/PHUIDocumentView.php
	@@ -95,7 +95,7 @@
	$sidenav = phutil_tag(
	'div',
	array(
	- 'class' => 'phui-document-sidenav'
	+ 'class' => 'phui-document-sidenav',
	),
	$this->sidenav);
	}
	@@ -105,7 +105,7 @@
	$book = phutil_tag(
	'div',
	array(
	- 'class' => 'phui-document-bookname grouped'
	+ 'class' => 'phui-document-bookname grouped',
	),
	array(
	phutil_tag(
	@@ -115,7 +115,8 @@
	phutil_tag(
	'span',
	array('class' => 'bookdescription'),
	- $this->bookdescription)));
	+ $this->bookdescription),
	+ ));
	}

	$topnav = null;
	@@ -123,7 +124,7 @@
	$topnav = phutil_tag(
	'div',
	array(
	- 'class' => 'phui-document-topnav'
	+ 'class' => 'phui-document-topnav',
	),
	$this->topnav);
	}
	@@ -133,7 +134,7 @@
	$crumbs = phutil_tag(
	'div',
	array(
	- 'class' => 'phui-document-crumbs'
	+ 'class' => 'phui-document-crumbs',
	),
	$this->bookName);
	}
	@@ -142,7 +143,7 @@
	$main_content = phutil_tag(
	'div',
	array(
	- 'class' => 'phui-font-'.$this->fontKit
	+ 'class' => 'phui-font-'.$this->fontKit,
	),
	$this->renderChildren());
	} else {
	@@ -159,7 +160,7 @@
	$this->header,
	$topnav,
	$main_content,
	- $crumbs
	+ $crumbs,
	));

	if ($this->mobileview == self::NAV_BOTTOM) {
	diff --git a/src/view/phui/PHUIFeedStoryView.php b/src/view/phui/PHUIFeedStoryView.php
	--- a/src/view/phui/PHUIFeedStoryView.php
	+++ b/src/view/phui/PHUIFeedStoryView.php
	@@ -104,7 +104,8 @@
	),
	array(
	$title,
	- $text));
	+ $text,
	+ ));
	$this->appendChild($copy);
	return $this;
	}
	@@ -127,7 +128,8 @@
	$foot = phutil_tag(
	'span',
	array(
	- 'class' => 'phabricator-notification-date'),
	+ 'class' => 'phabricator-notification-date',
	+ ),
	$foot);
	} else {
	$foot = null;
	@@ -201,15 +203,15 @@
	$action_list[] = phutil_tag(
	'li',
	array(
	- 'class' => 'phui-feed-story-action-item'
	- ),
	- $action);
	+ 'class' => 'phui-feed-story-action-item',
	+ ),
	+ $action);
	}
	if (!empty($action_list)) {
	$icons = phutil_tag(
	'ul',
	array(
	- 'class' => 'phui-feed-story-action-list'
	+ 'class' => 'phui-feed-story-action-list',
	),
	$action_list);
	}
	@@ -229,7 +231,7 @@
	$tokenview = phutil_tag(
	'div',
	array(
	- 'class' => 'phui-feed-token-bar'
	+ 'class' => 'phui-feed-token-bar',
	),
	$this->tokenBar);
	$this->appendChild($tokenview);
	@@ -249,7 +251,8 @@
	if ($this->tags) {
	$tags = array(
	" \xC2\xB7 ",
	- $this->tags);
	+ $this->tags,
	+ );
	}

	$foot = phutil_tag(
	diff --git a/src/view/phui/PHUIObjectItemListView.php b/src/view/phui/PHUIObjectItemListView.php
	--- a/src/view/phui/PHUIObjectItemListView.php
	+++ b/src/view/phui/PHUIObjectItemListView.php
	@@ -114,7 +114,8 @@
	$items = phutil_tag(
	'li',
	array(
	- 'class' => 'phui-object-item-empty'),
	+ 'class' => 'phui-object-item-empty',
	+ ),
	$string);

	}
	diff --git a/src/view/phui/PHUIPropertyListView.php b/src/view/phui/PHUIPropertyListView.php
	--- a/src/view/phui/PHUIPropertyListView.php
	+++ b/src/view/phui/PHUIPropertyListView.php
	@@ -64,7 +64,7 @@
	return $this;
	}

	- public function addSectionHeader($name, $icon=null) {
	+ public function addSectionHeader($name, $icon = null) {
	$this->parts[] = array(
	'type' => 'section',
	'name' => $name,
	diff --git a/src/view/phui/PHUITimelineEventView.php b/src/view/phui/PHUITimelineEventView.php
	--- a/src/view/phui/PHUITimelineEventView.php
	+++ b/src/view/phui/PHUITimelineEventView.php
	@@ -148,7 +148,7 @@
	return $this;
	}

	- public function setToken($token, $removed=false) {
	+ public function setToken($token, $removed = false) {
	$this->token = $token;
	$this->tokenRemoved = $removed;
	return $this;
	diff --git a/src/view/phui/PHUIWorkboardView.php b/src/view/phui/PHUIWorkboardView.php
	--- a/src/view/phui/PHUIWorkboardView.php
	+++ b/src/view/phui/PHUIWorkboardView.php
	@@ -43,14 +43,14 @@
	$items[] = phutil_tag(
	'li',
	array(
	- 'class' => 'phui-workboard-action-item'
	+ 'class' => 'phui-workboard-action-item',
	),
	$action);
	}
	$action_list = phutil_tag(
	'ul',
	array(
	- 'class' => 'phui-workboard-action-list'
	+ 'class' => 'phui-workboard-action-list',
	),
	$items);
	}
	@@ -70,7 +70,7 @@
	$board = phutil_tag(
	'div',
	array(
	- 'class' => 'phui-workboard-view-shadow'
	+ 'class' => 'phui-workboard-view-shadow',
	),
	$view);

	diff --git a/src/view/phui/PHUIWorkpanelView.php b/src/view/phui/PHUIWorkpanelView.php
	--- a/src/view/phui/PHUIWorkpanelView.php
	+++ b/src/view/phui/PHUIWorkpanelView.php
	@@ -66,7 +66,7 @@
	$footer = phutil_tag(
	'ul',
	array(
	- 'class' => 'phui-workpanel-footer-action mst ps'
	+ 'class' => 'phui-workpanel-footer-action mst ps',
	),
	$footer_tag);
	}
	@@ -92,7 +92,7 @@
	$body = phutil_tag(
	'div',
	array(
	- 'class' => 'phui-workpanel-body'
	+ 'class' => 'phui-workpanel-body',
	),
	$this->cards);

	diff --git a/src/view/phui/calendar/PHUICalendarListView.php b/src/view/phui/calendar/PHUICalendarListView.php
	--- a/src/view/phui/calendar/PHUICalendarListView.php
	+++ b/src/view/phui/calendar/PHUICalendarListView.php
	@@ -48,43 +48,47 @@
	$dot = phutil_tag(
	'span',
	array(
	- 'class' => 'phui-calendar-list-dot'),
	+ 'class' => 'phui-calendar-list-dot',
	+ ),
	'');
	$title = phutil_tag(
	'span',
	array(
	- 'class' => 'phui-calendar-list-title'),
	+ 'class' => 'phui-calendar-list-title',
	+ ),
	$this->renderEventLink($event, $allday));
	$time = phutil_tag(
	'span',
	array(
	- 'class' => 'phui-calendar-list-time'),
	+ 'class' => 'phui-calendar-list-time',
	+ ),
	$timelabel);

	$singletons[] = phutil_tag(
	'li',
	array(
	- 'class' => 'phui-calendar-list-item phui-calendar-'.$color
	+ 'class' => 'phui-calendar-list-item phui-calendar-'.$color,
	),
	array(
	$dot,
	$title,
	- $time));
	+ $time,
	+ ));
	}

	if (empty($singletons)) {
	$singletons[] = phutil_tag(
	'li',
	array(
	- 'class' => 'phui-calendar-list-item-empty'
	- ),
	+ 'class' => 'phui-calendar-list-item-empty',
	+ ),
	pht('Clear sailing ahead.'));
	}

	$list = phutil_tag(
	'ul',
	array(
	- 'class' => 'phui-calendar-list'
	+ 'class' => 'phui-calendar-list',
	),
	$singletons);

	diff --git a/src/view/phui/calendar/PHUICalendarMonthView.php b/src/view/phui/calendar/PHUICalendarMonthView.php
	--- a/src/view/phui/calendar/PHUICalendarMonthView.php
	+++ b/src/view/phui/calendar/PHUICalendarMonthView.php
	@@ -150,7 +150,8 @@
	$cells[] = phutil_tag(
	'td',
	array(
	- 'class' => 'phui-calendar-month-weekstart'),
	+ 'class' => 'phui-calendar-month-weekstart',
	+ ),
	$cell);
	} else {
	$cells[] = phutil_tag('td', array(), $cell);
	diff --git a/src/view/widget/bars/AphrontGlyphBarView.php b/src/view/widget/bars/AphrontGlyphBarView.php
	--- a/src/view/widget/bars/AphrontGlyphBarView.php
	+++ b/src/view/widget/bars/AphrontGlyphBarView.php
	@@ -90,12 +90,12 @@
	phutil_tag(
	'div',
	array(),
	- $bg_glyphs)
	+ $bg_glyphs),
	)),
	phutil_tag(
	'div',
	array('class' => 'caption'),
	- $this->getCaption())
	+ $this->getCaption()),
	));
	}

	diff --git a/src/view/widget/bars/AphrontProgressBarView.php b/src/view/widget/bars/AphrontProgressBarView.php
	--- a/src/view/widget/bars/AphrontProgressBarView.php
	+++ b/src/view/widget/bars/AphrontProgressBarView.php
	@@ -51,7 +51,8 @@
	phutil_tag(
	'span',
	array(),
	- $this->getCaption())));
	+ $this->getCaption()),
	+ ));
	}

	}
	diff --git a/src/view/widget/hovercard/PhabricatorHovercardView.php b/src/view/widget/hovercard/PhabricatorHovercardView.php
	--- a/src/view/widget/hovercard/PhabricatorHovercardView.php
	+++ b/src/view/widget/hovercard/PhabricatorHovercardView.php
	@@ -108,21 +108,22 @@
	$body = phutil_tag(
	'div',
	array(
	- 'class' => 'phabricator-hovercard-body-image'),
	- phutil_tag(
	- 'div',
	- array(
	- 'class' => 'profile-header-picture-frame',
	- 'style' => 'background-image: url('.$handle->getImageURI().');',
	- ),
	- ''))
	- ->appendHTML(
	- phutil_tag(
	- 'div',
	- array(
	- 'class' => 'phabricator-hovercard-body-details',
	- ),
	- $body));
	+ 'class' => 'phabricator-hovercard-body-image',
	+ ),
	+ phutil_tag(
	+ 'div',
	+ array(
	+ 'class' => 'profile-header-picture-frame',
	+ 'style' => 'background-image: url('.$handle->getImageURI().');',
	+ ),
	+ ''))
	+ ->appendHTML(
	+ phutil_tag(
	+ 'div',
	+ array(
	+ 'class' => 'phabricator-hovercard-body-details',
	+ ),
	+ $body));
	}

	$buttons = array();
	diff --git a/support/PhabricatorStartup.php b/support/PhabricatorStartup.php
	--- a/support/PhabricatorStartup.php
	+++ b/support/PhabricatorStartup.php
	@@ -400,7 +400,8 @@
	// Replace superglobals with unfiltered versions, disrespect php.ini (we
	// filter ourselves)
	$filter = array(INPUT_GET, INPUT_POST,
	- INPUT_SERVER, INPUT_ENV, INPUT_COOKIE);
	+ INPUT_SERVER, INPUT_ENV, INPUT_COOKIE,
	+ );
	foreach ($filter as $type) {
	$filtered = filter_input_array($type, FILTER_UNSAFE_RAW);
	if (!is_array($filtered)) {
	diff --git a/webroot/index.php b/webroot/index.php
	--- a/webroot/index.php
	+++ b/webroot/index.php
	@@ -124,7 +124,8 @@
	'z-index: 200000;'.
	'position: relative;'.
	'padding: 8px;'.
	- 'font-family: monospace'),
	+ 'font-family: monospace',
	+ ),
	$unexpected_output);
	}
	}

File Metadata

Mime Type: text/plain
Expires: Wed, Mar 19, 6:15 PM (2 w, 4 d ago)
Storage Engine: amazon-s3
Storage Format: Encrypted (AES-256-CBC)
Storage Handle: phabricator/secure/pg/rz/64wib3mhqo6iu3pz
Default Alt Text: D10585.diff (203 KB)

D10585.diffNo OneTemporaryActions

D10585.diffView Options

File Metadata

Event Timeline

D10585.diff
No OneTemporary
Actions

D10585.diff
View Options