1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-18 12:52:42 +01:00

Minor formatting changes

Summary: Apply some autofix linter rules.

Test Plan: `arc lint` and `arc unit`

Reviewers: #blessed_reviewers, epriestley

Reviewed By: #blessed_reviewers, epriestley

Subscribers: epriestley, Korvin, hach-que

Differential Revision: https://secure.phabricator.com/D10585
This commit is contained in:
Joshua Spence 2014-10-08 00:01:04 +11:00
parent fcd2025a85
commit 3cf9a5820f
270 changed files with 823 additions and 578 deletions

View file

@ -98,7 +98,7 @@ foreach (Futures($futures)->limit(8) as $file => $future) {
} }
} }
function print_symbol($file, $type, $token, $context=null) { function print_symbol($file, $type, $token, $context = null) {
$parts = array( $parts = array(
$context ? $context->getConcreteString() : '', $context ? $context->getConcreteString() : '',
// variable tokens are `$name`, not just `name`, so strip the $ off of // variable tokens are `$name`, not just `name`, so strip the $ off of

View file

@ -306,7 +306,8 @@ class AphrontDefaultApplicationConfiguration
array( array(
'uri' => $uri, 'uri' => $uri,
'external' => $external, 'external' => $external,
)); ),
);
} }
} }

View file

@ -47,7 +47,8 @@ final class DarkConsoleRequestPlugin extends DarkConsolePlugin {
if (isset($mask[$key])) { if (isset($mask[$key])) {
$rows[] = array( $rows[] = array(
$key, $key,
phutil_tag('em', array(), '(Masked)')); phutil_tag('em', array(), '(Masked)'),
);
} else { } else {
$rows[] = array( $rows[] = array(
$key, $key,

View file

@ -82,7 +82,8 @@ final class AphrontFileResponse extends AphrontResponse {
if ($this->allowOrigins) { if ($this->allowOrigins) {
$headers[] = array( $headers[] = array(
'Access-Control-Allow-Origin', 'Access-Control-Allow-Origin',
implode(',', $this->allowOrigins)); implode(',', $this->allowOrigins),
);
} }
$headers = array_merge(parent::getHeaders(), $headers); $headers = array_merge(parent::getHeaders(), $headers);

View file

@ -109,23 +109,28 @@ abstract class AphrontResponse {
if ($this->cacheable) { if ($this->cacheable) {
$headers[] = array( $headers[] = array(
'Expires', 'Expires',
$this->formatEpochTimestampForHTTPHeader(time() + $this->cacheable)); $this->formatEpochTimestampForHTTPHeader(time() + $this->cacheable),
);
} else { } else {
$headers[] = array( $headers[] = array(
'Cache-Control', 'Cache-Control',
'private, no-cache, no-store, must-revalidate'); 'private, no-cache, no-store, must-revalidate',
);
$headers[] = array( $headers[] = array(
'Pragma', 'Pragma',
'no-cache'); 'no-cache',
);
$headers[] = array( $headers[] = array(
'Expires', 'Expires',
'Sat, 01 Jan 2000 00:00:00 GMT'); 'Sat, 01 Jan 2000 00:00:00 GMT',
);
} }
if ($this->lastModified) { if ($this->lastModified) {
$headers[] = array( $headers[] = array(
'Last-Modified', 'Last-Modified',
$this->formatEpochTimestampForHTTPHeader($this->lastModified)); $this->formatEpochTimestampForHTTPHeader($this->lastModified),
);
} }
// IE has a feature where it may override an explicit Content-Type // IE has a feature where it may override an explicit Content-Type

View file

@ -82,7 +82,8 @@ final class PhabricatorCommitSearchEngine
array( array(
$auditor_phids, $auditor_phids,
$commit_author_phids, $commit_author_phids,
$repository_phids)); $repository_phids,
));
$handles = id(new PhabricatorHandleQuery()) $handles = id(new PhabricatorHandleQuery())
->setViewer($this->requireViewer()) ->setViewer($this->requireViewer())

View file

@ -22,7 +22,8 @@ final class PhabricatorAuthValidateController
array( array(
pht( pht(
'Login validation is missing expected parameter ("%s").', 'Login validation is missing expected parameter ("%s").',
'phusr'))); 'phusr'),
));
} }
$expect_phusr = $request->getStr('expect'); $expect_phusr = $request->getStr('expect');

View file

@ -243,7 +243,7 @@ abstract class PhabricatorAuthProvider {
$image_uri, $image_uri,
array( array(
'name' => $name, 'name' => $name,
'canCDN' => true 'canCDN' => true,
)); ));
unset($unguarded); unset($unguarded);

View file

@ -55,7 +55,8 @@ final class CalendarTimeUtilTestCase extends PhabricatorTestCase {
'Wednesday', 'Wednesday',
'Thursday', 'Thursday',
'Friday', 'Friday',
'Saturday'); 'Saturday',
);
} }
} }

View file

@ -103,7 +103,8 @@ final class PhabricatorCalendarViewController
phutil_tag( phutil_tag(
'a', 'a',
array( array(
'href' => $login_uri), 'href' => $login_uri,
),
pht('Log in')))); pht('Log in'))));
} }

View file

@ -24,7 +24,8 @@ final class CalendarTimeUtil {
return array( return array(
'start_epoch' => $start_day->format('U'), 'start_epoch' => $start_day->format('U'),
'end_epoch' => $end_day->format('U')); 'end_epoch' => $end_day->format('U'),
);
} }
public static function getCalendarWeekTimestamps( public static function getCalendarWeekTimestamps(
@ -56,7 +57,8 @@ final class CalendarTimeUtil {
} }
return array( return array(
'today' => $objects['today'], 'today' => $objects['today'],
'epoch_stamps' => $timestamps); 'epoch_stamps' => $timestamps,
);
} }
private static function getStartDateTimeObjects( private static function getStartDateTimeObjects(
@ -80,7 +82,8 @@ final class CalendarTimeUtil {
} }
return array( return array(
'today' => $today, 'today' => $today,
'start_day' => $start_day); 'start_day' => $start_day,
);
} }
} }

View file

@ -120,7 +120,7 @@ final class PhabricatorChatLogChannelLogController
'a', 'a',
array( array(
'href' => $href, 'href' => $href,
'class' => 'timestamp' 'class' => 'timestamp',
), ),
$timestamp); $timestamp);
@ -129,11 +129,12 @@ final class PhabricatorChatLogChannelLogController
$message = phutil_tag( $message = phutil_tag(
'td', 'td',
array( array(
'class' => 'message' 'class' => 'message',
), ),
array( array(
$timestamp, $timestamp,
$message)); $message,
));
$out[] = phutil_tag( $out[] = phutil_tag(
'tr', 'tr',
@ -142,7 +143,8 @@ final class PhabricatorChatLogChannelLogController
), ),
array( array(
$author, $author,
$message)); $message,
));
} }
$links = array(); $links = array();
@ -210,41 +212,41 @@ final class PhabricatorChatLogChannelLogController
$table = phutil_tag( $table = phutil_tag(
'table', 'table',
array( array(
'class' => 'phabricator-chat-log' 'class' => 'phabricator-chat-log',
), ),
$out); $out);
$log = phutil_tag( $log = phutil_tag(
'div', 'div',
array( array(
'class' => 'phabricator-chat-log-panel' 'class' => 'phabricator-chat-log-panel',
), ),
$table); $table);
$jump_link = phutil_tag( $jump_link = phutil_tag(
'a', 'a',
array( array(
'href' => '#latest' 'href' => '#latest',
), ),
pht('Jump to Bottom')." \xE2\x96\xBE"); pht('Jump to Bottom')." \xE2\x96\xBE");
$jump = phutil_tag( $jump = phutil_tag(
'div', 'div',
array( array(
'class' => 'phabricator-chat-log-jump' 'class' => 'phabricator-chat-log-jump',
), ),
$jump_link); $jump_link);
$jump_target = phutil_tag( $jump_target = phutil_tag(
'div', 'div',
array( array(
'id' => 'latest' 'id' => 'latest',
)); ));
$content = phutil_tag( $content = phutil_tag(
'div', 'div',
array( array(
'class' => 'phabricator-chat-log-wrap' 'class' => 'phabricator-chat-log-wrap',
), ),
array( array(
$jump, $jump,

View file

@ -279,7 +279,7 @@ final class PhabricatorConduitAPIController
if (!$session_key) { if (!$session_key) {
return array( return array(
'ERR-INVALID-SESSION', 'ERR-INVALID-SESSION',
'Session key is not present.' 'Session key is not present.',
); );
} }

View file

@ -31,7 +31,7 @@ final class PhabricatorSetupCheckDaemons extends PhabricatorSetupCheck {
'a', 'a',
array( array(
'href' => $doc_href, 'href' => $doc_href,
'target' => '_blank' 'target' => '_blank',
), ),
pht('Managing Daemons with phd'))); pht('Managing Daemons with phd')));
@ -100,14 +100,14 @@ final class PhabricatorSetupCheckDaemons extends PhabricatorSetupCheck {
'a', 'a',
array( array(
'href' => '/daemon/', 'href' => '/daemon/',
'target' => '_blank' 'target' => '_blank',
), ),
pht('Daemon Console')), pht('Daemon Console')),
phutil_tag( phutil_tag(
'a', 'a',
array( array(
'href' => $doc_href, 'href' => $doc_href,
'target' => '_blank' 'target' => '_blank',
), ),
pht('Managing Daemons with phd')), pht('Managing Daemons with phd')),
phutil_tag('tt', array(), 'PHABRICATOR_ENV'), phutil_tag('tt', array(), 'PHABRICATOR_ENV'),

View file

@ -25,7 +25,8 @@ final class PhabricatorConfigDatabaseIssueController
null, null,
null, null,
null, null,
$issue); $issue,
);
} }
foreach ($database->getTables() as $table_name => $table) { foreach ($database->getTables() as $table_name => $table) {
foreach ($table->getLocalIssues() as $issue) { foreach ($table->getLocalIssues() as $issue) {
@ -34,7 +35,8 @@ final class PhabricatorConfigDatabaseIssueController
$table_name, $table_name,
null, null,
null, null,
$issue); $issue,
);
} }
foreach ($table->getColumns() as $column_name => $column) { foreach ($table->getColumns() as $column_name => $column) {
foreach ($column->getLocalIssues() as $issue) { foreach ($column->getLocalIssues() as $issue) {
@ -43,7 +45,8 @@ final class PhabricatorConfigDatabaseIssueController
$table_name, $table_name,
'column', 'column',
$column_name, $column_name,
$issue); $issue,
);
} }
} }
foreach ($table->getKeys() as $key_name => $key) { foreach ($table->getKeys() as $key_name => $key) {
@ -53,7 +56,8 @@ final class PhabricatorConfigDatabaseIssueController
$table_name, $table_name,
'key', 'key',
$key_name, $key_name,
$issue); $issue,
);
} }
} }
} }

View file

@ -372,7 +372,7 @@ final class PhabricatorConfigDatabaseStatusController
null, null,
null, null,
null, null,
null null,
)); ));
$key_rows = array(); $key_rows = array();

View file

@ -21,7 +21,7 @@ final class PhabricatorConfigListController
$nav->appendChild( $nav->appendChild(
array( array(
$box $box,
)); ));
$crumbs = $this $crumbs = $this

View file

@ -122,7 +122,7 @@ final class PhabricatorConfigEditor
->setNewValue( ->setNewValue(
array( array(
'deleted' => false, 'deleted' => false,
'value' => $value 'value' => $value,
)); ));
$editor = id(new PhabricatorConfigEditor()) $editor = id(new PhabricatorConfigEditor())

View file

@ -17,7 +17,7 @@ final class PhabricatorAuthenticationConfigOptions
->setBoolOptions( ->setBoolOptions(
array( array(
pht('Require email verification'), pht('Require email verification'),
pht("Don't require email verification") pht("Don't require email verification"),
)) ))
->setSummary( ->setSummary(
pht('Require email verification before a user can log in.')) pht('Require email verification before a user can log in.'))
@ -77,7 +77,7 @@ final class PhabricatorAuthenticationConfigOptions
->setBoolOptions( ->setBoolOptions(
array( array(
pht('Allow editing'), pht('Allow editing'),
pht('Prevent editing') pht('Prevent editing'),
)) ))
->setSummary( ->setSummary(
pht( pht(

View file

@ -94,7 +94,7 @@ final class PhabricatorCoreConfigOptions
->setBoolOptions( ->setBoolOptions(
array( array(
pht('Enable Prototypes'), pht('Enable Prototypes'),
pht('Disable Prototypes') pht('Disable Prototypes'),
)) ))
->setSummary( ->setSummary(
pht( pht(

View file

@ -16,25 +16,32 @@ final class PhabricatorGarbageCollectorConfigOptions
$options = array( $options = array(
'gcdaemon.ttl.herald-transcripts' => array( 'gcdaemon.ttl.herald-transcripts' => array(
30, 30,
pht('Number of seconds to retain Herald transcripts for.')), pht('Number of seconds to retain Herald transcripts for.'),
),
'gcdaemon.ttl.daemon-logs' => array( 'gcdaemon.ttl.daemon-logs' => array(
7, 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( 'gcdaemon.ttl.differential-parse-cache' => array(
14, 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( 'gcdaemon.ttl.markup-cache' => array(
30, 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( 'gcdaemon.ttl.task-archive' => array(
14, 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( 'gcdaemon.ttl.general-cache' => array(
30, 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( 'gcdaemon.ttl.conduit-logs' => array(
180, 180,
pht('Number of seconds to retain Conduit call logs for.')) pht('Number of seconds to retain Conduit call logs for.'),
),
); );
$result = array(); $result = array();

View file

@ -48,7 +48,7 @@ EODOC
->setDescription(pht('Authorization token from Twilio service.')) ->setDescription(pht('Authorization token from Twilio service.'))
->setLocked(true) ->setLocked(true)
->setHidden(true) ->setHidden(true)
->addExample('f3jsi4i67wiwt6w54hf2zwvy3fjf5h', pht('30 characters')) ->addExample('f3jsi4i67wiwt6w54hf2zwvy3fjf5h', pht('30 characters')),
); );
} }

View file

@ -15,7 +15,7 @@ final class ConpherenceCreateThreadConduitAPIMethod
return array( return array(
'title' => 'optional string', 'title' => 'optional string',
'message' => 'required string', 'message' => 'required string',
'participantPHIDs' => 'required list<phids>' 'participantPHIDs' => 'required list<phids>',
); );
} }
@ -28,7 +28,7 @@ final class ConpherenceCreateThreadConduitAPIMethod
'ERR_EMPTY_PARTICIPANT_PHIDS' => pht( 'ERR_EMPTY_PARTICIPANT_PHIDS' => pht(
'You must specify participant phids.'), 'You must specify participant phids.'),
'ERR_EMPTY_MESSAGE' => pht( 'ERR_EMPTY_MESSAGE' => pht(
'You must specify a message.') 'You must specify a message.'),
); );
} }

View file

@ -20,7 +20,7 @@ final class ConpherenceQueryThreadConduitAPIMethod
'ids' => 'optional array<int>', 'ids' => 'optional array<int>',
'phids' => 'optional array<phids>', 'phids' => 'optional array<phids>',
'limit' => 'optional int', 'limit' => 'optional int',
'offset' => 'optional int' 'offset' => 'optional int',
); );
} }
@ -78,7 +78,8 @@ final class ConpherenceQueryThreadConduitAPIMethod
'messageCount' => $conpherence->getMessageCount(), 'messageCount' => $conpherence->getMessageCount(),
'recentParticipantPHIDs' => $conpherence->getRecentParticipantPHIDs(), 'recentParticipantPHIDs' => $conpherence->getRecentParticipantPHIDs(),
'filePHIDs' => $conpherence->getFilePHIDs(), 'filePHIDs' => $conpherence->getFilePHIDs(),
'conpherenceURI' => $this->getConpherenceURI($conpherence)); 'conpherenceURI' => $this->getConpherenceURI($conpherence),
);
} }
return $data; return $data;
} }

View file

@ -20,7 +20,7 @@ final class ConpherenceQueryTransactionConduitAPIMethod
'threadID' => 'optional int', 'threadID' => 'optional int',
'threadPHID' => 'optional phid', 'threadPHID' => 'optional phid',
'limit' => 'optional int', 'limit' => 'optional int',
'offset' => 'optional int' 'offset' => 'optional int',
); );
} }
@ -32,7 +32,7 @@ final class ConpherenceQueryTransactionConduitAPIMethod
return array( return array(
'ERR_USAGE_NO_THREAD_ID' => pht( 'ERR_USAGE_NO_THREAD_ID' => pht(
'You must specify a thread id or thread phid to query transactions '. 'You must specify a thread id or thread phid to query transactions '.
'from.') 'from.'),
); );
} }
@ -88,7 +88,8 @@ final class ConpherenceQueryTransactionConduitAPIMethod
'authorPHID' => $transaction->getAuthorPHID(), 'authorPHID' => $transaction->getAuthorPHID(),
'dateCreated' => $transaction->getDateCreated(), 'dateCreated' => $transaction->getDateCreated(),
'conpherenceID' => $conpherence->getID(), 'conpherenceID' => $conpherence->getID(),
'conpherencePHID' => $conpherence->getPHID()); 'conpherencePHID' => $conpherence->getPHID(),
);
} }
return $data; return $data;
} }

View file

@ -18,7 +18,7 @@ final class ConpherenceUpdateThreadConduitAPIMethod
'title' => 'optional string', 'title' => 'optional string',
'message' => 'optional string', 'message' => 'optional string',
'addParticipantPHIDs' => 'optional list<phids>', 'addParticipantPHIDs' => 'optional list<phids>',
'removeParticipantPHID' => 'optional phid' 'removeParticipantPHID' => 'optional phid',
); );
} }
@ -36,7 +36,7 @@ final class ConpherenceUpdateThreadConduitAPIMethod
'ERR_USAGE_ONLY_SELF_REMOVE' => pht( 'ERR_USAGE_ONLY_SELF_REMOVE' => pht(
'Only a user can remove themselves from a thread.'), 'Only a user can remove themselves from a thread.'),
'ERR_USAGE_NO_UPDATES' => pht( 'ERR_USAGE_NO_UPDATES' => pht(
'You must specify data that actually updates the conpherence.') 'You must specify data that actually updates the conpherence.'),
); );
} }

View file

@ -70,10 +70,11 @@ abstract class ConpherenceController extends PhabricatorController {
phutil_tag( phutil_tag(
'div', 'div',
array( array(
'class' => 'header-loading-mask' 'class' => 'header-loading-mask',
), ),
''), ''),
$crumbs)); $crumbs,
));
} }
protected function renderConpherenceTransactions( protected function renderConpherenceTransactions(

View file

@ -140,7 +140,8 @@ final class ConpherenceListController extends ConpherenceController {
$phids = array_keys($participation); $phids = array_keys($participation);
$content = array( $content = array(
'html' => $thread_html, 'html' => $thread_html,
'phids' => $phids); 'phids' => $phids,
);
$response = id(new AphrontAjaxResponse())->setContent($content); $response = id(new AphrontAjaxResponse())->setContent($content);
break; break;
case self::UNSELECTED_MODE: case self::UNSELECTED_MODE:

View file

@ -72,7 +72,7 @@ final class ConpherenceViewController extends
$content = array( $content = array(
'header' => $header, 'header' => $header,
'messages' => $messages, 'messages' => $messages,
'form' => $form 'form' => $form,
); );
} }
@ -114,8 +114,8 @@ final class ConpherenceViewController extends
'sigil' => 'show-older-messages', 'sigil' => 'show-older-messages',
'class' => 'conpherence-show-older-messages', 'class' => 'conpherence-show-older-messages',
'meta' => array( 'meta' => array(
'oldest_transaction_id' => $oldest_transaction_id 'oldest_transaction_id' => $oldest_transaction_id,
) ),
), ),
pht('Show Older Messages')); pht('Show Older Messages'));
} }

View file

@ -100,7 +100,7 @@ final class ConpherenceWidgetController extends ConpherenceController {
'class' => 'widgets-body', 'class' => 'widgets-body',
'id' => 'widgets-files', 'id' => 'widgets-files',
'sigil' => 'widgets-files', 'sigil' => 'widgets-files',
'style' => 'display: none;' 'style' => 'display: none;',
), ),
id(new ConpherenceFileWidgetView()) id(new ConpherenceFileWidgetView())
->setUser($user) ->setUser($user)
@ -111,7 +111,7 @@ final class ConpherenceWidgetController extends ConpherenceController {
array( array(
'class' => 'widgets-body', 'class' => 'widgets-body',
'id' => 'widgets-calendar', 'id' => 'widgets-calendar',
'style' => 'display: none;' 'style' => 'display: none;',
), ),
$this->renderCalendarWidgetPaneContent()); $this->renderCalendarWidgetPaneContent());
$widgets[] = phutil_tag( $widgets[] = phutil_tag(
@ -119,7 +119,7 @@ final class ConpherenceWidgetController extends ConpherenceController {
array( array(
'class' => 'widgets-body', 'class' => 'widgets-body',
'id' => 'widgets-settings', 'id' => 'widgets-settings',
'style' => 'display: none' 'style' => 'display: none',
), ),
$this->renderSettingsWidgetPaneContent()); $this->renderSettingsWidgetPaneContent());
@ -166,7 +166,7 @@ final class ConpherenceWidgetController extends ConpherenceController {
array( array(
'type' => 'hidden', 'type' => 'hidden',
'name' => 'action', 'name' => 'action',
'value' => 'notifications' 'value' => 'notifications',
)), )),
phutil_tag( phutil_tag(
'button', 'button',
@ -174,7 +174,7 @@ final class ConpherenceWidgetController extends ConpherenceController {
'type' => 'submit', 'type' => 'submit',
'class' => 'notifications-update', 'class' => 'notifications-update',
), ),
pht('Save')) pht('Save')),
); );
return phabricator_form( return phabricator_form(
@ -222,21 +222,22 @@ final class ConpherenceWidgetController extends ConpherenceController {
$content[] = phutil_tag( $content[] = phutil_tag(
'div', 'div',
array( array(
'class' => 'day-header '.$active_class 'class' => 'day-header '.$active_class,
), ),
array( array(
phutil_tag( phutil_tag(
'div', 'div',
array( array(
'class' => 'day-name' 'class' => 'day-name',
), ),
$day->format('l')), $day->format('l')),
phutil_tag( phutil_tag(
'div', 'div',
array( array(
'class' => 'day-date' 'class' => 'day-date',
), ),
$day->format('m/d/y')))); $day->format('m/d/y')),
));
} }
$week_day_number = $day->format('w'); $week_day_number = $day->format('w');
@ -298,16 +299,18 @@ final class ConpherenceWidgetController extends ConpherenceController {
phutil_tag( phutil_tag(
'div', 'div',
array( array(
'class' => 'description' 'class' => 'description',
), ),
array( array(
$status->getTerseSummary($user), $status->getTerseSummary($user),
phutil_tag( phutil_tag(
'div', 'div',
array( array(
'class' => 'participant' 'class' => 'participant',
), ),
$secondary_info))))); $secondary_info),
)),
));
} }
$first_status_of_the_day = false; $first_status_of_the_day = false;
} }
@ -332,14 +335,14 @@ final class ConpherenceWidgetController extends ConpherenceController {
$inner_layout[] = phutil_tag( $inner_layout[] = phutil_tag(
'div', 'div',
array( array(
'class' => $status->getTextStatus() 'class' => $status->getTextStatus(),
), ),
''); '');
} else { } else {
$inner_layout[] = phutil_tag( $inner_layout[] = phutil_tag(
'div', 'div',
array( array(
'class' => 'present' 'class' => 'present',
), ),
''); '');
} }
@ -348,13 +351,13 @@ final class ConpherenceWidgetController extends ConpherenceController {
phutil_tag( phutil_tag(
'div', 'div',
array( array(
'class' => 'day-column'.$active_class 'class' => 'day-column'.$active_class,
), ),
array( array(
phutil_tag( phutil_tag(
'div', 'div',
array( array(
'class' => 'day-name' 'class' => 'day-name',
), ),
$day->format('D')), $day->format('D')),
phutil_tag( phutil_tag(
@ -363,17 +366,16 @@ final class ConpherenceWidgetController extends ConpherenceController {
'class' => 'day-number', 'class' => 'day-number',
), ),
$day->format('j')), $day->format('j')),
$inner_layout $inner_layout,
))); )));
$calendar_columns++; $calendar_columns++;
} }
} }
return return array(
array( $layout,
$layout, $content,
$content );
);
} }
private function getWidgetURI() { private function getWidgetURI() {

View file

@ -279,7 +279,7 @@ final class ConpherenceThreadQuery
$widget_data = array( $widget_data = array(
'statuses' => $statuses, 'statuses' => $statuses,
'files' => $conpherence_files, 'files' => $conpherence_files,
'files_authors' => $files_authors 'files_authors' => $files_authors,
); );
$conpherence->attachWidgetData($widget_data); $conpherence->attachWidgetData($widget_data);
} }

View file

@ -15,7 +15,7 @@ final class ConpherenceFileWidgetView extends ConpherenceWidgetView {
$icon_view = phutil_tag( $icon_view = phutil_tag(
'div', 'div',
array( array(
'class' => 'file-icon sprite-docs '.$icon_class 'class' => 'file-icon sprite-docs '.$icon_class,
), ),
''); '');
$file_view = id(new PhabricatorFileLinkView()) $file_view = id(new PhabricatorFileLinkView())
@ -41,19 +41,19 @@ final class ConpherenceFileWidgetView extends ConpherenceWidgetView {
$who_done_it = phutil_tag( $who_done_it = phutil_tag(
'div', 'div',
array( array(
'class' => 'file-uploaded-by' 'class' => 'file-uploaded-by',
), ),
pht('%s%s.', $who_done_it_text, $date_text)); pht('%s%s.', $who_done_it_text, $date_text));
$files_html[] = phutil_tag( $files_html[] = phutil_tag(
'div', 'div',
array( array(
'class' => 'file-entry' 'class' => 'file-entry',
), ),
array( array(
$icon_view, $icon_view,
$file_view, $file_view,
$who_done_it $who_done_it,
)); ));
} }
@ -62,7 +62,8 @@ final class ConpherenceFileWidgetView extends ConpherenceWidgetView {
'div', 'div',
array( array(
'class' => 'no-files', 'class' => 'no-files',
'sigil' => 'no-files'), 'sigil' => 'no-files',
),
pht('No files.')); pht('No files.'));
} }

View file

@ -83,7 +83,7 @@ final class ConpherenceLayoutView extends AphrontView {
'name' => pht('Thread'), 'name' => pht('Thread'),
'icon' => 'fa-comment', 'icon' => 'fa-comment',
'deviceOnly' => true, 'deviceOnly' => true,
'hasCreate' => false 'hasCreate' => false,
), ),
'widgets-people' => array( 'widgets-people' => array(
'name' => pht('Participants'), 'name' => pht('Participants'),
@ -93,14 +93,14 @@ final class ConpherenceLayoutView extends AphrontView {
'createData' => array( 'createData' => array(
'refreshFromResponse' => true, 'refreshFromResponse' => true,
'action' => ConpherenceUpdateActions::ADD_PERSON, 'action' => ConpherenceUpdateActions::ADD_PERSON,
'customHref' => null 'customHref' => null,
) ),
), ),
'widgets-files' => array( 'widgets-files' => array(
'name' => pht('Files'), 'name' => pht('Files'),
'icon' => 'fa-files-o', 'icon' => 'fa-files-o',
'deviceOnly' => false, 'deviceOnly' => false,
'hasCreate' => false 'hasCreate' => false,
), ),
'widgets-calendar' => array( 'widgets-calendar' => array(
'name' => pht('Calendar'), 'name' => pht('Calendar'),
@ -110,16 +110,17 @@ final class ConpherenceLayoutView extends AphrontView {
'createData' => array( 'createData' => array(
'refreshFromResponse' => false, 'refreshFromResponse' => false,
'action' => ConpherenceUpdateActions::ADD_STATUS, 'action' => ConpherenceUpdateActions::ADD_STATUS,
'customHref' => '/calendar/event/create/' 'customHref' => '/calendar/event/create/',
) ),
), ),
'widgets-settings' => array( 'widgets-settings' => array(
'name' => pht('Settings'), 'name' => pht('Settings'),
'icon' => 'fa-wrench', 'icon' => 'fa-wrench',
'deviceOnly' => false, 'deviceOnly' => false,
'hasCreate' => false 'hasCreate' => false,
), ),
))); ),
));
return javelin_tag( return javelin_tag(
@ -170,7 +171,7 @@ final class ConpherenceLayoutView extends AphrontView {
phutil_tag( phutil_tag(
'div', 'div',
array( array(
'class' => 'text' 'class' => 'text',
), ),
pht('You do not have any messages yet.')), pht('You do not have any messages yet.')),
javelin_tag( javelin_tag(
@ -180,7 +181,7 @@ final class ConpherenceLayoutView extends AphrontView {
'class' => 'button grey', 'class' => 'button grey',
'sigil' => 'workflow', 'sigil' => 'workflow',
), ),
pht('Send a Message')) pht('Send a Message')),
)), )),
javelin_tag( javelin_tag(
'div', 'div',
@ -193,21 +194,22 @@ final class ConpherenceLayoutView extends AphrontView {
phutil_tag( phutil_tag(
'div', 'div',
array( array(
'class' => 'widgets-loading-mask' 'class' => 'widgets-loading-mask',
), ),
''), ''),
javelin_tag( javelin_tag(
'div', 'div',
array( array(
'sigil' => 'conpherence-widgets-holder' 'sigil' => 'conpherence-widgets-holder',
), ),
''))), ''),
)),
javelin_tag( javelin_tag(
'div', 'div',
array( array(
'class' => 'conpherence-message-pane', 'class' => 'conpherence-message-pane',
'id' => 'conpherence-message-pane', 'id' => 'conpherence-message-pane',
'sigil' => 'conpherence-message-pane' 'sigil' => 'conpherence-message-pane',
), ),
array( array(
javelin_tag( javelin_tag(
@ -228,9 +230,9 @@ final class ConpherenceLayoutView extends AphrontView {
'div', 'div',
array( array(
'id' => 'conpherence-form', 'id' => 'conpherence-form',
'sigil' => 'conpherence-form' 'sigil' => 'conpherence-form',
), ),
nonempty($this->replyForm, '')) nonempty($this->replyForm, '')),
)), )),
)), )),
)); ));

View file

@ -77,7 +77,7 @@ final class ConpherenceMenuItemView extends AphrontTagView {
'span', 'span',
array( array(
'class' => 'conpherence-menu-item-image', 'class' => 'conpherence-menu-item-image',
'style' => 'background-image: url('.$this->imageURI.');' 'style' => 'background-image: url('.$this->imageURI.');',
), ),
''); '');
} }
@ -104,7 +104,7 @@ final class ConpherenceMenuItemView extends AphrontTagView {
$unread_count = phutil_tag( $unread_count = phutil_tag(
'span', 'span',
array( array(
'class' => 'conpherence-menu-item-unread-count' 'class' => 'conpherence-menu-item-unread-count',
), ),
(int)$this->unreadCount); (int)$this->unreadCount);
} }

View file

@ -25,14 +25,14 @@ final class ConpherencePeopleWidgetView extends ConpherenceWidgetView {
'meta' => array( 'meta' => array(
'remove_person' => $handle->getPHID(), 'remove_person' => $handle->getPHID(),
'action' => 'remove_person', 'action' => 'remove_person',
) ),
), ),
hsprintf('<span class="close-icon">&times;</span>')); hsprintf('<span class="close-icon">&times;</span>'));
} }
$body[] = phutil_tag( $body[] = phutil_tag(
'div', 'div',
array( array(
'class' => 'person-entry grouped' 'class' => 'person-entry grouped',
), ),
array( array(
phutil_tag( phutil_tag(
@ -43,11 +43,12 @@ final class ConpherencePeopleWidgetView extends ConpherenceWidgetView {
phutil_tag( phutil_tag(
'img', 'img',
array( array(
'src' => $handle->getImageURI() 'src' => $handle->getImageURI(),
), ),
'')), '')),
$handle->renderLink(), $handle->renderLink(),
$remove_html)); $remove_html,
));
} }
return $body; return $body;

View file

@ -148,7 +148,8 @@ final class ConpherenceThreadListView extends AphrontView {
'participant_id' => $participant->getID(), 'participant_id' => $participant->getID(),
'conpherence_phid' => $participant->getConpherencePHID(), 'conpherence_phid' => $participant->getConpherencePHID(),
'date_touched' => $participant->getDateTouched(), 'date_touched' => $participant->getDateTouched(),
'direction' => $direction)); 'direction' => $direction,
));
return $item; return $item;
} }
@ -156,7 +157,7 @@ final class ConpherenceThreadListView extends AphrontView {
$message = phutil_tag( $message = phutil_tag(
'div', 'div',
array( array(
'class' => 'no-conpherences-menu-item' 'class' => 'no-conpherences-menu-item',
), ),
pht('No conpherences.')); pht('No conpherences.'));

View file

@ -38,7 +38,7 @@ final class ConpherenceTransactionView extends AphrontView {
return phutil_tag( return phutil_tag(
'div', 'div',
array( array(
'class' => 'date-marker' 'class' => 'date-marker',
), ),
array( array(
phutil_tag( phutil_tag(
@ -49,7 +49,8 @@ final class ConpherenceTransactionView extends AphrontView {
phabricator_format_local_time( phabricator_format_local_time(
$transaction->getDateCreated(), $transaction->getDateCreated(),
$user, $user,
'M jS, Y')))); 'M jS, Y')),
));
break; break;
} }
@ -92,7 +93,7 @@ final class ConpherenceTransactionView extends AphrontView {
phutil_tag( phutil_tag(
'div', 'div',
array( array(
'class' => $content_class 'class' => $content_class,
), ),
$content)); $content));

View file

@ -43,7 +43,7 @@ final class PhabricatorCountdownApplication extends PhabricatorApplication {
=> 'PhabricatorCountdownListController', => 'PhabricatorCountdownListController',
'(?P<id>[1-9]\d*)/' => 'PhabricatorCountdownViewController', '(?P<id>[1-9]\d*)/' => 'PhabricatorCountdownViewController',
'edit/(?:(?P<id>[1-9]\d*)/)?' => 'PhabricatorCountdownEditController', 'edit/(?:(?P<id>[1-9]\d*)/)?' => 'PhabricatorCountdownEditController',
'delete/(?P<id>[1-9]\d*)/' => 'PhabricatorCountdownDeleteController' 'delete/(?P<id>[1-9]\d*)/' => 'PhabricatorCountdownDeleteController',
), ),
); );
} }

View file

@ -52,7 +52,8 @@ final class PhabricatorDashboardInstallController
$handles = $this->loadHandles(array( $handles = $this->loadHandles(array(
$object_phid, $object_phid,
$installer_phid)); $installer_phid,
));
if ($request->isFormPost()) { if ($request->isFormPost()) {
$dashboard_install = id(new PhabricatorDashboardInstall()) $dashboard_install = id(new PhabricatorDashboardInstall())

View file

@ -52,8 +52,8 @@ final class PhabricatorDashboardPanelSearchQueryCustomField
'options' => $queries, 'options' => $queries,
'value' => array( 'value' => array(
'key' => strlen($value) ? $value : null, 'key' => strlen($value) ? $value : null,
'name' => $name 'name' => $name,
) ),
)); ));
return id(new AphrontFormSelectControl()) return id(new AphrontFormSelectControl())

View file

@ -193,11 +193,14 @@ final class PhabricatorDashboardPanelRenderingEngine extends Phobject {
'id' => $id, 'id' => $id,
'sigil' => 'dashboard-panel', 'sigil' => 'dashboard-panel',
'meta' => array( 'meta' => array(
'objectPHID' => $panel->getPHID()), 'objectPHID' => $panel->getPHID(),
'class' => 'dashboard-panel'), ),
'class' => 'dashboard-panel',
),
array( array(
$header, $header,
$content)); $content,
));
} }

View file

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

View file

@ -60,8 +60,10 @@ final class PhabricatorDashboardSearchEngine
$installs = id(new PhabricatorDashboardInstall()) $installs = id(new PhabricatorDashboardInstall())
->loadAllWhere( ->loadAllWhere(
'objectPHID IN (%Ls) AND dashboardPHID IN (%Ls)', 'objectPHID IN (%Ls) AND dashboardPHID IN (%Ls)',
array(PhabricatorHomeApplication::DASHBOARD_DEFAULT, array(
$viewer->getPHID()), PhabricatorHomeApplication::DASHBOARD_DEFAULT,
$viewer->getPHID(),
),
array_keys($dashboards)); array_keys($dashboards));
$installs = mpull($installs, null, 'getDashboardPHID'); $installs = mpull($installs, null, 'getDashboardPHID');
} else { } else {
@ -87,12 +89,14 @@ final class PhabricatorDashboardSearchEngine
if ($install->getObjectPHID() == $viewer->getPHID()) { if ($install->getObjectPHID() == $viewer->getPHID()) {
$attrs = array( $attrs = array(
'tip' => pht( '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); $item->addIcon('fa-user', pht('Installed'), $attrs);
} else { } else {
$attrs = array( $attrs = array(
'tip' => pht( '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); $item->addIcon('fa-globe', pht('Installed'), $attrs);
} }
} }

View file

@ -33,7 +33,7 @@ final class DifferentialCreateInlineConduitAPIMethod
'ERR-BAD-DIFF' => 'Bad diff ID, or diff does not belong to revision.', '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-DIFF' => 'Neither revision ID nor diff ID was provided.',
'ERR-NEED-FILE' => 'A file path was not 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.",
); );
} }

View file

@ -101,7 +101,8 @@ final class DifferentialFinishPostponedLintersConduitAPIMethod
array( array(
'diff_id' => $diff_id, 'diff_id' => $diff_id,
'name' => 'arc:lint', 'name' => 'arc:lint',
'data' => json_encode($messages))); 'data' => json_encode($messages),
));
$call->setForceLocal(true); $call->setForceLocal(true);
$call->setUser($request->getUser()); $call->setUser($request->getUser());
$call->execute(); $call->execute();
@ -110,7 +111,8 @@ final class DifferentialFinishPostponedLintersConduitAPIMethod
array( array(
'diff_id' => $diff_id, 'diff_id' => $diff_id,
'name' => 'arc:lint-postponed', 'name' => 'arc:lint-postponed',
'data' => json_encode($postponed_linters))); 'data' => json_encode($postponed_linters),
));
$call->setForceLocal(true); $call->setForceLocal(true);
$call->setUser($request->getUser()); $call->setUser($request->getUser());
$call->execute(); $call->execute();

View file

@ -94,7 +94,7 @@ final class DifferentialGetRevisionConduitAPIMethod
'reviewerPHIDs' => $reviewer_phids, 'reviewerPHIDs' => $reviewer_phids,
'diffs' => $diff_dicts, 'diffs' => $diff_dicts,
'commits' => $commit_dicts, 'commits' => $commit_dicts,
'auxiliary' => idx($field_data, $revision->getPHID(), array()) 'auxiliary' => idx($field_data, $revision->getPHID(), array()),
); );
return $dict; return $dict;

View file

@ -115,7 +115,8 @@ final class DifferentialUpdateUnitResultsConduitAPIMethod
DifferentialUnitTestResult::RESULT_SKIP => DifferentialUnitTestResult::RESULT_SKIP =>
DifferentialUnitStatus::UNIT_OKAY, DifferentialUnitStatus::UNIT_OKAY,
DifferentialUnitTestResult::RESULT_POSTPONED => DifferentialUnitTestResult::RESULT_POSTPONED =>
DifferentialUnitStatus::UNIT_POSTPONED); DifferentialUnitStatus::UNIT_POSTPONED,
);
// These are the relative priorities for the unit test results // These are the relative priorities for the unit test results
$status_codes_priority = $status_codes_priority =
@ -123,7 +124,8 @@ final class DifferentialUpdateUnitResultsConduitAPIMethod
DifferentialUnitStatus::UNIT_OKAY => 1, DifferentialUnitStatus::UNIT_OKAY => 1,
DifferentialUnitStatus::UNIT_WARN => 2, DifferentialUnitStatus::UNIT_WARN => 2,
DifferentialUnitStatus::UNIT_POSTPONED => 3, 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 // Walk the now-current list of status codes to find the overall diff
// status // status

View file

@ -145,8 +145,8 @@ final class DifferentialRevisionLandController extends DifferentialController {
$looksoon = new ConduitCall( $looksoon = new ConduitCall(
'diffusion.looksoon', 'diffusion.looksoon',
array( array(
'callsigns' => array($repository->getCallsign()) 'callsigns' => array($repository->getCallsign()),
)); ));
$looksoon->setUser($request->getUser()); $looksoon->setUser($request->getUser());
$looksoon->execute(); $looksoon->execute();

View file

@ -328,7 +328,7 @@ abstract class DifferentialChangesetHTMLRenderer
$row = array( $row = array(
$readable_key, $readable_key,
$oval, $oval,
$nval $nval,
); );
$rows[] = $row; $rows[] = $row;

View file

@ -25,7 +25,7 @@ final class DifferentialChangesetTwoUpRenderer
'td', 'td',
array( array(
'colspan' => 6, 'colspan' => 6,
'class' => 'show-more' 'class' => 'show-more',
), ),
pht('Context not available.'))); pht('Context not available.')));
} }
@ -302,7 +302,7 @@ final class DifferentialChangesetTwoUpRenderer
array('class' => $n_classes, 'colspan' => $n_colspan), array('class' => $n_classes, 'colspan' => $n_colspan),
array( array(
phutil_tag('span', array('class' => 'zwsp'), $zero_space), phutil_tag('span', array('class' => 'zwsp'), $zero_space),
$n_text $n_text,
)), )),
$n_cov, $n_cov,
)); ));
@ -365,7 +365,7 @@ final class DifferentialChangesetTwoUpRenderer
$old = phutil_tag( $old = phutil_tag(
'div', 'div',
array( array(
'class' => 'differential-image-stage' 'class' => 'differential-image-stage',
), ),
phutil_tag( phutil_tag(
'img', 'img',
@ -379,7 +379,7 @@ final class DifferentialChangesetTwoUpRenderer
$new = phutil_tag( $new = phutil_tag(
'div', 'div',
array( array(
'class' => 'differential-image-stage' 'class' => 'differential-image-stage',
), ),
phutil_tag( phutil_tag(
'img', 'img',

View file

@ -229,7 +229,7 @@ final class DifferentialDiff
'lintStatus' => $this->getLintStatus(), 'lintStatus' => $this->getLintStatus(),
'changes' => array(), 'changes' => array(),
'properties' => array(), 'properties' => array(),
'projectName' => $this->getArcanistProjectName() 'projectName' => $this->getArcanistProjectName(),
); );
$dict['changes'] = $this->buildChangesList(); $dict['changes'] = $this->buildChangesList();

View file

@ -215,7 +215,8 @@ final class DifferentialChangesetDetailView extends AphrontView {
$buttons, $buttons,
phutil_tag('h1', phutil_tag('h1',
array( array(
'class' => 'differential-file-icon-header'), 'class' => 'differential-file-icon-header',
),
array( array(
$icon, $icon,
$display_filename, $display_filename,

View file

@ -110,8 +110,9 @@ final class DifferentialChangesetListView extends AphrontView {
Javelin::initBehavior('differential-toggle-files', array( Javelin::initBehavior('differential-toggle-files', array(
'pht' => array( 'pht' => array(
'undo' => pht('Undo'), 'undo' => pht('Undo'),
'collapsed' => pht('This file content has been collapsed.')) 'collapsed' => pht('This file content has been collapsed.'),
)); ),
));
Javelin::initBehavior( Javelin::initBehavior(
'differential-dropdown-menus', 'differential-dropdown-menus',
array( array(

View file

@ -160,7 +160,7 @@ final class DifferentialDiffTableOfContentsView extends AphrontView {
$meta = phutil_tag( $meta = phutil_tag(
'div', 'div',
array( array(
'class' => 'differential-toc-meta' 'class' => 'differential-toc-meta',
), ),
$meta); $meta);
} }
@ -176,7 +176,7 @@ final class DifferentialDiffTableOfContentsView extends AphrontView {
$desc, $desc,
array($link, $lines, $meta), array($link, $lines, $meta),
$cov, $cov,
$mcov $mcov,
); );
} }
@ -210,11 +210,11 @@ final class DifferentialDiffTableOfContentsView extends AphrontView {
$buttons = phutil_tag( $buttons = phutil_tag(
'div', 'div',
array( array(
'class' => 'differential-toc-buttons grouped' 'class' => 'differential-toc-buttons grouped',
), ),
array( array(
$editor_link, $editor_link,
$reveal_link $reveal_link,
)); ));
$table = id(new AphrontTableView($rows)); $table = id(new AphrontTableView($rows));

View file

@ -144,7 +144,8 @@ final class DifferentialLocalCommitsView extends AphrontView {
$link = phutil_tag( $link = phutil_tag(
'a', 'a',
array( array(
'href' => $commit_for_link->getURI()), 'href' => $commit_for_link->getURI(),
),
$commit_hash); $commit_hash);
} else { } else {
$link = $commit_hash; $link = $commit_hash;

View file

@ -314,7 +314,7 @@ final class DifferentialRevisionUpdateHistoryView extends AphrontView {
DifferentialLintStatus::LINT_FAIL => self::STAR_FAIL, DifferentialLintStatus::LINT_FAIL => self::STAR_FAIL,
DifferentialLintStatus::LINT_SKIP => self::STAR_SKIP, DifferentialLintStatus::LINT_SKIP => self::STAR_SKIP,
DifferentialLintStatus::LINT_AUTO_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); $star = idx($map, $diff->getLintStatus(), self::STAR_FAIL);

View file

@ -81,7 +81,8 @@ final class DiffusionDiffQueryConduitAPIMethod
if ($path->getTargetPath()) { if ($path->getTargetPath()) {
$old = array( $old = array(
$path->getTargetPath(), $path->getTargetPath(),
$path->getTargetCommitIdentifier()); $path->getTargetCommitIdentifier(),
);
} else { } else {
$old = array($path->getPath(), $path->getCommitIdentifier() - 1); $old = array($path->getPath(), $path->getCommitIdentifier() - 1);
} }
@ -99,7 +100,8 @@ final class DiffusionDiffQueryConduitAPIMethod
case DifferentialChangeType::TYPE_COPY_HERE: case DifferentialChangeType::TYPE_COPY_HERE:
$old = array( $old = array(
$path->getTargetPath(), $path->getTargetPath(),
$path->getTargetCommitIdentifier()); $path->getTargetCommitIdentifier(),
);
$new = array($path->getPath(), $path->getCommitIdentifier()); $new = array($path->getPath(), $path->getCommitIdentifier());
$old_name = $path->getTargetPath(); $old_name = $path->getTargetPath();
$new_name = $path->getPath(); $new_name = $path->getPath();
@ -107,7 +109,8 @@ final class DiffusionDiffQueryConduitAPIMethod
case DifferentialChangeType::TYPE_MOVE_AWAY: case DifferentialChangeType::TYPE_MOVE_AWAY:
$old = array( $old = array(
$path->getPath(), $path->getPath(),
$path->getCommitIdentifier() - 1); $path->getCommitIdentifier() - 1,
);
$old_name = $path->getPath(); $old_name = $path->getPath();
$new_name = null; $new_name = null;
$new = null; $new = null;

View file

@ -17,7 +17,7 @@ final class DiffusionExistsQueryConduitAPIMethod
protected function defineCustomParamTypes() { protected function defineCustomParamTypes() {
return array( return array(
'commit' => 'required string' 'commit' => 'required string',
); );
} }

View file

@ -54,7 +54,8 @@ final class DiffusionGetRecentCommitsByPathConduitAPIMethod
'offset' => 0, 'offset' => 0,
'limit' => $limit, 'limit' => $limit,
'needDirectChanges' => true, 'needDirectChanges' => true,
'needChildChanges' => true)); 'needChildChanges' => true,
));
$history = DiffusionPathChange::newFromConduit( $history = DiffusionPathChange::newFromConduit(
$history_result['pathChanges']); $history_result['pathChanges']);

View file

@ -119,7 +119,8 @@ final class DiffusionQueryCommitsConduitAPIMethod
foreach ($lowlevel_commitref->getHashes() as $hash) { foreach ($lowlevel_commitref->getHashes() as $hash) {
$dict['hashes'][] = array( $dict['hashes'][] = array(
'type' => $hash->getHashType(), 'type' => $hash->getHashType(),
'value' => $hash->getHashValue()); 'value' => $hash->getHashValue(),
);
} }
} }

View file

@ -42,7 +42,8 @@ abstract class DiffusionQueryConduitAPIMethod
'ERR-UNKNOWN-VCS-TYPE' => 'ERR-UNKNOWN-VCS-TYPE' =>
pht('Unknown repository VCS type.'), pht('Unknown repository VCS type.'),
'ERR-UNSUPPORTED-VCS' => 'ERR-UNSUPPORTED-VCS' =>
pht('VCS is not supported for this method.')); pht('VCS is not supported for this method.'),
);
} }
/** /**

View file

@ -49,7 +49,8 @@ final class DiffusionRefsQueryConduitAPIMethod
array( array(
'action' => 'browse', 'action' => 'browse',
'branch' => $ref, 'branch' => $ref,
))); )),
);
} }
return $ref_links; return $ref_links;

View file

@ -27,7 +27,8 @@ final class DiffusionSearchQueryConduitAPIMethod
protected function defineCustomErrorTypes() { protected function defineCustomErrorTypes() {
return array( return array(
'ERR-GREP-COMMAND' => 'Grep command failed.'); 'ERR-GREP-COMMAND' => 'Grep command failed.',
);
} }
protected function getResult(ConduitAPIRequest $request) { protected function getResult(ConduitAPIRequest $request) {

View file

@ -22,7 +22,7 @@ final class DiffusionBranchTableController extends DiffusionController {
'diffusion.branchquery', 'diffusion.branchquery',
array( array(
'offset' => $pager->getOffset(), 'offset' => $pager->getOffset(),
'limit' => $pager->getPageSize() + 1 'limit' => $pager->getPageSize() + 1,
)); ));
$branches = $pager->sliceResults($branches); $branches = $pager->sliceResults($branches);

View file

@ -1016,7 +1016,8 @@ final class DiffusionBrowseFileController extends DiffusionBrowseController {
array( array(
'commit' => $drequest->getCommit(), 'commit' => $drequest->getCommit(),
'path' => $drequest->getPath(), 'path' => $drequest->getPath(),
'againstCommit' => $target_commit)); 'againstCommit' => $target_commit,
));
$old_line = 0; $old_line = 0;
$new_line = 0; $new_line = 0;

View file

@ -43,7 +43,7 @@ final class DiffusionChangeController extends DiffusionController {
$changeset_view->setVisibleChangesets($changesets); $changeset_view->setVisibleChangesets($changesets);
$changeset_view->setRenderingReferences( $changeset_view->setRenderingReferences(
array( array(
0 => $drequest->generateURI(array('action' => 'rendering-ref')) 0 => $drequest->generateURI(array('action' => 'rendering-ref')),
)); ));
$raw_params = array( $raw_params = array(

View file

@ -796,7 +796,7 @@ final class DiffusionCommitController extends DiffusionController {
'aphront-panel-preview aphront-panel-flush', 'aphront-panel-preview aphront-panel-flush',
array( array(
phutil_tag('div', array('id' => 'audit-preview'), $loading), 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 // TODO: This is pretty awkward, unify the CSS between Diffusion and
@ -911,7 +911,8 @@ final class DiffusionCommitController extends DiffusionController {
'diffusion.mergedcommitsquery', 'diffusion.mergedcommitsquery',
array( array(
'commit' => $drequest->getCommit(), 'commit' => $drequest->getCommit(),
'limit' => $limit + 1)); 'limit' => $limit + 1,
));
} catch (ConduitException $ex) { } catch (ConduitException $ex) {
if ($ex->getMessage() != 'ERR-UNSUPPORTED-VCS') { if ($ex->getMessage() != 'ERR-UNSUPPORTED-VCS') {
throw $ex; throw $ex;
@ -1026,7 +1027,8 @@ final class DiffusionCommitController extends DiffusionController {
'diffusion.rawdiffquery', 'diffusion.rawdiffquery',
array( array(
'commit' => $drequest->getCommit(), 'commit' => $drequest->getCommit(),
'path' => $drequest->getPath())); 'path' => $drequest->getPath(),
));
$file = PhabricatorFile::buildFromFileDataOrHash( $file = PhabricatorFile::buildFromFileDataOrHash(
$raw_diff, $raw_diff,

View file

@ -22,7 +22,8 @@ final class DiffusionCommitTagsController extends DiffusionController {
'diffusion.tagsquery', 'diffusion.tagsquery',
array( array(
'commit' => $request->getCommit(), 'commit' => $request->getCommit(),
'limit' => $tag_limit + 1))); 'limit' => $tag_limit + 1,
)));
} catch (ConduitException $ex) { } catch (ConduitException $ex) {
if ($ex->getMessage() != 'ERR-UNSUPPORTED-VCS') { if ($ex->getMessage() != 'ERR-UNSUPPORTED-VCS') {
throw $ex; throw $ex;

View file

@ -184,7 +184,8 @@ abstract class DiffusionController extends PhabricatorController {
$divider = phutil_tag( $divider = phutil_tag(
'span', 'span',
array( array(
'class' => 'phui-header-divider'), 'class' => 'phui-header-divider',
),
'/'); '/');
$links = array(); $links = array();

View file

@ -50,7 +50,8 @@ final class DiffusionDiffController extends DiffusionController {
'diffusion.diffquery', 'diffusion.diffquery',
array( array(
'commit' => $drequest->getCommit(), 'commit' => $drequest->getCommit(),
'path' => $drequest->getPath())); 'path' => $drequest->getPath(),
));
$drequest->updateSymbolicCommit($data['effectiveCommit']); $drequest->updateSymbolicCommit($data['effectiveCommit']);
$raw_changes = ArcanistDiffChange::newFromConduit($data['changes']); $raw_changes = ArcanistDiffChange::newFromConduit($data['changes']);
$diff = DifferentialDiff::newFromRawChanges($raw_changes); $diff = DifferentialDiff::newFromRawChanges($raw_changes);
@ -66,7 +67,8 @@ final class DiffusionDiffController extends DiffusionController {
$parser->setChangeset($changeset); $parser->setChangeset($changeset);
$parser->setRenderingReference($drequest->generateURI( $parser->setRenderingReference($drequest->generateURI(
array( array(
'action' => 'rendering-ref'))); 'action' => 'rendering-ref',
)));
$parser->setCharacterEncoding($request->getStr('encoding')); $parser->setCharacterEncoding($request->getStr('encoding'));
$parser->setHighlightAs($request->getStr('highlight')); $parser->setHighlightAs($request->getStr('highlight'));

View file

@ -19,7 +19,8 @@ final class DiffusionHistoryController extends DiffusionController {
'commit' => $drequest->getCommit(), 'commit' => $drequest->getCommit(),
'path' => $drequest->getPath(), 'path' => $drequest->getPath(),
'offset' => $offset, 'offset' => $offset,
'limit' => $page_size + 1); 'limit' => $page_size + 1,
);
if (!$request->getBool('copies')) { if (!$request->getBool('copies')) {
$params['needDirectChanges'] = true; $params['needDirectChanges'] = true;

View file

@ -145,10 +145,12 @@ final class DiffusionLastModifiedController extends DiffusionController {
if ($lint !== null) { if ($lint !== null) {
$return['lint'] = phutil_tag( $return['lint'] = phutil_tag(
'a', 'a',
array('href' => $drequest->generateURI(array( array(
'action' => 'lint', 'href' => $drequest->generateURI(array(
'lint' => null, 'action' => 'lint',
))), 'lint' => null,
)),
),
number_format($lint)); number_format($lint));
} }

View file

@ -17,20 +17,24 @@ final class DiffusionLintDetailsController extends DiffusionController {
foreach ($messages as $message) { foreach ($messages as $message) {
$path = phutil_tag( $path = phutil_tag(
'a', 'a',
array('href' => $drequest->generateURI(array( array(
'action' => 'lint', 'href' => $drequest->generateURI(array(
'path' => $message['path'], 'action' => 'lint',
))), 'path' => $message['path'],
)),
),
substr($message['path'], strlen($drequest->getPath()) + 1)); substr($message['path'], strlen($drequest->getPath()) + 1));
$line = phutil_tag( $line = phutil_tag(
'a', 'a',
array('href' => $drequest->generateURI(array( array(
'action' => 'browse', 'href' => $drequest->generateURI(array(
'path' => $message['path'], 'action' => 'browse',
'line' => $message['line'], 'path' => $message['path'],
'commit' => $branch->getLintCommit(), 'line' => $message['line'],
))), 'commit' => $branch->getLintCommit(),
)),
),
$message['line']); $message['line']);
$author = $message['authorPHID']; $author = $message['authorPHID'];
@ -90,7 +94,8 @@ final class DiffusionLintDetailsController extends DiffusionController {
array( array(
pht('Lint'), pht('Lint'),
$drequest->getRepository()->getCallsign(), $drequest->getRepository()->getCallsign(),
))); ),
));
} }
private function loadLintMessages( private function loadLintMessages(

View file

@ -96,7 +96,8 @@ final class DiffusionRepositoryController extends DiffusionController {
'commit' => $drequest->getCommit(), 'commit' => $drequest->getCommit(),
'path' => $drequest->getPath(), 'path' => $drequest->getPath(),
'offset' => 0, 'offset' => 0,
'limit' => 15)); 'limit' => 15,
));
$history = DiffusionPathChange::newFromConduit( $history = DiffusionPathChange::newFromConduit(
$history_results['pathChanges']); $history_results['pathChanges']);

View file

@ -144,7 +144,8 @@ final class DiffusionRepositoryEditBasicController
return $this->buildApplicationPage( return $this->buildApplicationPage(
array( array(
$crumbs, $crumbs,
$object_box), $object_box,
),
array( array(
'title' => $title, 'title' => $title,
)); ));

View file

@ -186,7 +186,8 @@ final class DiffusionRepositoryEditHostingController
'%s: This repository is hosted elsewhere, so Phabricator can not '. '%s: This repository is hosted elsewhere, so Phabricator can not '.
'perform writes. This mode will act like "Read Only" for '. 'perform writes. This mode will act like "Read Only" for '.
'repositories hosted elsewhere.', 'repositories hosted elsewhere.',
phutil_tag('strong', array(), 'WARNING'))); phutil_tag('strong', array(), 'WARNING')),
);
} }
$ssh_control = $ssh_control =

View file

@ -19,7 +19,8 @@ final class DiffusionTagListController extends DiffusionController {
$params = array( $params = array(
'limit' => $pager->getPageSize() + 1, 'limit' => $pager->getPageSize() + 1,
'offset' => $pager->getOffset()); 'offset' => $pager->getOffset(),
);
if ($drequest->getSymbolicCommit()) { if ($drequest->getSymbolicCommit()) {
$is_commit = true; $is_commit = true;

View file

@ -64,7 +64,8 @@ final class DiffusionBrowseResultSet {
'isValidResults' => $this->isValidResults(), 'isValidResults' => $this->isValidResults(),
'reasonForEmptyResultSet' => $this->getReasonForEmptyResultSet(), 'reasonForEmptyResultSet' => $this->getReasonForEmptyResultSet(),
'existedAtCommit' => $this->getExistedAtCommit(), 'existedAtCommit' => $this->getExistedAtCommit(),
'deletedAtCommit' => $this->getDeletedAtCommit()); 'deletedAtCommit' => $this->getDeletedAtCommit(),
);
} }
public function getPathDicts() { public function getPathDicts() {

View file

@ -48,7 +48,7 @@ final class DiffusionFileContent {
'corpus' => $this->getCorpus(), 'corpus' => $this->getCorpus(),
'blameDict' => $this->getBlameDict(), 'blameDict' => $this->getBlameDict(),
'revList' => $this->getRevList(), 'revList' => $this->getRevList(),
'textList' => $this->getTextList() 'textList' => $this->getTextList(),
); );
} }

View file

@ -171,7 +171,8 @@ final class DiffusionPathChange {
'changeType' => $this->getChangeType(), 'changeType' => $this->getChangeType(),
'targetPath' => $this->getTargetPath(), 'targetPath' => $this->getTargetPath(),
'targetCommitIdentifier' => $this->getTargetCommitIdentifier(), 'targetCommitIdentifier' => $this->getTargetCommitIdentifier(),
'awayPaths' => $this->getAwayPaths()); 'awayPaths' => $this->getAwayPaths(),
);
} }
public static function newFromConduit(array $dicts) { public static function newFromConduit(array $dicts) {

View file

@ -83,7 +83,7 @@ final class DiffusionBranchTableView extends DiffusionView {
array( array(
'action' => 'history', 'action' => 'history',
'branch' => $branch->getShortName(), 'branch' => $branch->getShortName(),
)) )),
), ),
pht('History')), pht('History')),
phutil_tag( phutil_tag(

View file

@ -171,7 +171,8 @@ final class DiffusionHistoryTableView extends DiffusionView {
'span', 'span',
array( array(
'sigil' => 'has-tooltip', 'sigil' => 'has-tooltip',
'meta' => array('tip' => $name)), 'meta' => array('tip' => $name),
),
$icon_view); $icon_view);
Javelin::initBehavior('phabricator-tooltips'); Javelin::initBehavior('phabricator-tooltips');

View file

@ -174,7 +174,8 @@ final class DivinerAtomController extends DivinerController {
$item = array( $item = array(
$item, $item,
" \xE2\x80\x94 ", " \xE2\x80\x94 ",
$atom->getSummary()); $atom->getSummary(),
);
} }
$list_items[] = phutil_tag('li', array(), $item); $list_items[] = phutil_tag('li', array(), $item);
@ -280,7 +281,8 @@ final class DivinerAtomController extends DivinerController {
$items[] = array( $items[] = array(
$this->renderAtomTag($iface), $this->renderAtomTag($iface),
" \xE2\x97\x80 ", " \xE2\x97\x80 ",
$this->renderAtomTag($via)); $this->renderAtomTag($via),
);
} }
} }

View file

@ -44,21 +44,21 @@ final class DivinerBookItemView extends AphrontTagView {
$title = phutil_tag( $title = phutil_tag(
'span', 'span',
array( array(
'class' => 'diviner-book-item-title' 'class' => 'diviner-book-item-title',
), ),
$this->title); $this->title);
$subtitle = phutil_tag( $subtitle = phutil_tag(
'span', 'span',
array( array(
'class' => 'diviner-book-item-subtitle' 'class' => 'diviner-book-item-subtitle',
), ),
$this->subtitle); $this->subtitle);
$type = phutil_tag( $type = phutil_tag(
'span', 'span',
array( array(
'class' => 'diviner-book-item-type' 'class' => 'diviner-book-item-type',
), ),
$this->type); $this->type);

View file

@ -67,13 +67,14 @@ final class DivinerParameterTableView extends AphrontTagView {
$table = phutil_tag( $table = phutil_tag(
'table', 'table',
array( array(
'class' => 'diviner-parameter-table-view'), 'class' => 'diviner-parameter-table-view',
),
$rows); $rows);
$header = phutil_tag( $header = phutil_tag(
'span', 'span',
array( array(
'class' => 'diviner-table-header' 'class' => 'diviner-table-header',
), ),
$this->header); $this->header);

View file

@ -61,13 +61,14 @@ final class DivinerReturnTableView extends AphrontTagView {
$table = phutil_tag( $table = phutil_tag(
'table', 'table',
array( array(
'class' => 'diviner-return-table-view'), 'class' => 'diviner-return-table-view',
),
$rows); $rows);
$header = phutil_tag( $header = phutil_tag(
'span', 'span',
array( array(
'class' => 'diviner-table-header' 'class' => 'diviner-table-header',
), ),
$this->header); $this->header);

View file

@ -8,13 +8,13 @@ final class DoorkeeperBridgeJIRATestCase extends PhabricatorTestCase {
// Installed at domain root. // Installed at domain root.
'http://jira.example.com/rest/api/2/issue/1', 'http://jira.example.com/rest/api/2/issue/1',
'TP-1', 'TP-1',
'http://jira.example.com/browse/TP-1' 'http://jira.example.com/browse/TP-1',
), ),
array( array(
// Installed on path. // Installed on path.
'http://jira.example.com/jira/rest/api/2/issue/1', 'http://jira.example.com/jira/rest/api/2/issue/1',
'TP-1', 'TP-1',
'http://jira.example.com/jira/browse/TP-1' 'http://jira.example.com/jira/browse/TP-1',
), ),
array( array(
// A URI we don't understand. // A URI we don't understand.

View file

@ -30,7 +30,7 @@ final class PhabricatorAsanaConfigOptions
'object in Phabricator comes from. For example, you can add code '. 'object in Phabricator comes from. For example, you can add code '.
'reviews in Asana to a "Differential" project.'. 'reviews in Asana to a "Differential" project.'.
"\n\n". "\n\n".
'NOTE: This feature is new and experimental.')) 'NOTE: This feature is new and experimental.')),
); );
} }

View file

@ -108,14 +108,16 @@ final class DrydockPreallocatedHostBlueprintImplementation
'host' => $resource->getAttribute('host'), 'host' => $resource->getAttribute('host'),
'port' => $resource->getAttribute('port'), 'port' => $resource->getAttribute('port'),
'credential' => $resource->getAttribute('credential'), 'credential' => $resource->getAttribute('credential'),
'platform' => $resource->getAttribute('platform'))) 'platform' => $resource->getAttribute('platform'),
))
->setWorkingDirectory($lease->getAttribute('path')); ->setWorkingDirectory($lease->getAttribute('path'));
case 'filesystem': case 'filesystem':
return id(new DrydockSFTPFilesystemInterface()) return id(new DrydockSFTPFilesystemInterface())
->setConfiguration(array( ->setConfiguration(array(
'host' => $resource->getAttribute('host'), 'host' => $resource->getAttribute('host'),
'port' => $resource->getAttribute('port'), 'port' => $resource->getAttribute('port'),
'credential' => $resource->getAttribute('credential'))); 'credential' => $resource->getAttribute('credential'),
));
} }
throw new Exception("No interface of type '{$type}'."); throw new Exception("No interface of type '{$type}'.");

View file

@ -17,7 +17,7 @@ final class PhabricatorFactManagementCursorsWorkflow
'param' => 'cursor', 'param' => 'cursor',
'repeat' => true, 'repeat' => true,
'help' => 'Reset cursor __cursor__.', 'help' => 'Reset cursor __cursor__.',
) ),
)); ));
} }

View file

@ -128,7 +128,7 @@ final class FeedQueryConduitAPIMethod extends FeedConduitAPIMethod {
'authorPHID' => $story_data->getAuthorPHID(), 'authorPHID' => $story_data->getAuthorPHID(),
'chronologicalKey' => $story_data->getChronologicalKey(), 'chronologicalKey' => $story_data->getChronologicalKey(),
'objectPHID' => $story->getPrimaryObjectPHID(), 'objectPHID' => $story->getPrimaryObjectPHID(),
'text' => $story->renderText() 'text' => $story->renderText(),
); );
break; break;
default: default:

View file

@ -215,7 +215,7 @@ final class PhabricatorImageTransformer {
'dx' => $dx, 'dx' => $dx,
'dy' => $dy, 'dy' => $dy,
'sdx' => $sdx, 'sdx' => $sdx,
'sdy' => $sdy 'sdy' => $sdy,
); );
} }

View file

@ -184,7 +184,7 @@ final class PhabricatorFilesConfigOptions
->setBoolOptions( ->setBoolOptions(
array( array(
pht('Enable'), pht('Enable'),
pht('Disable') pht('Disable'),
))->setDescription( ))->setDescription(
pht("This option will enable animated gif images". pht("This option will enable animated gif images".
"to be set as profile pictures. The 'convert' binary ". "to be set as profile pictures. The 'convert' binary ".

View file

@ -78,7 +78,7 @@ final class PhabricatorFileInfoController extends PhabricatorFileController {
array( array(
$crumbs, $crumbs,
$object_box, $object_box,
$timeline $timeline,
), ),
array( array(
'title' => $file->getName(), 'title' => $file->getName(),
@ -126,7 +126,8 @@ final class PhabricatorFileInfoController extends PhabricatorFileController {
return array( return array(
$timeline, $timeline,
$add_comment_form); $add_comment_form,
);
} }
private function buildActionView(PhabricatorFile $file) { private function buildActionView(PhabricatorFile $file) {

View file

@ -116,7 +116,8 @@ final class PhabricatorFlagSearchEngine
// sort it alphabetically... // sort it alphabetically...
asort($options); asort($options);
$default_option = array( $default_option = array(
0 => pht('All Object Types')); 0 => pht('All Object Types'),
);
// ...and stick the default option on front // ...and stick the default option on front
$options = array_merge($default_option, $options); $options = array_merge($default_option, $options);

View file

@ -299,7 +299,8 @@ final class HarbormasterBuildViewController
'div', 'div',
array( array(
'style' => 'display: none', 'style' => 'display: none',
'id' => $id), 'id' => $id,
),
$log_box); $log_box);
} }
@ -377,7 +378,8 @@ final class HarbormasterBuildViewController
$link_100, $link_100,
' - ', ' - ',
$link_0, $link_0,
' Lines')); ' Lines',
));
} }
private function buildActionList(HarbormasterBuild $build) { private function buildActionList(HarbormasterBuild $build) {
@ -440,7 +442,8 @@ final class HarbormasterBuildViewController
->setViewer($viewer) ->setViewer($viewer)
->withPHIDs(array( ->withPHIDs(array(
$build->getBuildablePHID(), $build->getBuildablePHID(),
$build->getBuildPlanPHID())) $build->getBuildPlanPHID(),
))
->execute(); ->execute();
$properties->addProperty( $properties->addProperty(

View file

@ -391,7 +391,8 @@ final class HarbormasterPlanViewController extends HarbormasterPlanController {
$note = array( $note = array(
phutil_tag('strong', array(), pht('ERROR:')), phutil_tag('strong', array(), pht('ERROR:')),
' ', ' ',
$error); $error,
);
} else { } else {
$note = $bound; $note = $bound;
} }
@ -457,7 +458,8 @@ final class HarbormasterPlanViewController extends HarbormasterPlanController {
$note = array( $note = array(
phutil_tag('strong', array(), pht('ERROR:')), phutil_tag('strong', array(), pht('ERROR:')),
' ', ' ',
$error); $error,
);
} else { } else {
$note = $bound; $note = $bound;
} }

View file

@ -94,7 +94,7 @@ final class HarbormasterBuildTransactionEditor
PhabricatorWorker::scheduleTask( PhabricatorWorker::scheduleTask(
'HarbormasterBuildWorker', 'HarbormasterBuildWorker',
array( array(
'buildID' => $build->getID() 'buildID' => $build->getID(),
)); ));
} }

View file

@ -33,7 +33,8 @@ final class HarbormasterBuildGraph extends AbstractDirectedGraph {
$results[] = array( $results[] = array(
'node' => $steps_by_phid[$node['node']], 'node' => $steps_by_phid[$node['node']],
'depth' => $node['depth'], 'depth' => $node['depth'],
'cycle' => $node['cycle']); 'cycle' => $node['cycle'],
);
} }
return $results; return $results;

View file

@ -37,7 +37,8 @@ final class HarbormasterLeaseHostBuildStepImplementation
$settings['name'], $settings['name'],
HarbormasterBuildArtifact::TYPE_HOST); HarbormasterBuildArtifact::TYPE_HOST);
$artifact->setArtifactData(array( $artifact->setArtifactData(array(
'drydock-lease' => $lease->getID())); 'drydock-lease' => $lease->getID(),
));
$artifact->save(); $artifact->save();
} }

Some files were not shown because too many files have changed in this diff Show more