mirror of
https://we.phorge.it/source/phorge.git
synced 2024-11-30 10:42:41 +01:00
Replace array_interleave() by phutil_implode_html()
Summary: I like this abstraction better. Result of `phutil_implode_html()` may be also used as a param of `hsprintf()`. Test Plan: None. Reviewers: epriestley Reviewed By: epriestley CC: aran, Korvin Differential Revision: https://secure.phabricator.com/D4904
This commit is contained in:
parent
c3ae8286db
commit
37b98450a5
20 changed files with 27 additions and 29 deletions
|
@ -73,7 +73,7 @@ final class PhabricatorAuditCommitListView extends AphrontView {
|
||||||
$commit->getCommitData()->getSummary(),
|
$commit->getCommitData()->getSummary(),
|
||||||
PhabricatorAuditCommitStatusConstants::getStatusName(
|
PhabricatorAuditCommitStatusConstants::getStatusName(
|
||||||
$commit->getAuditStatus()),
|
$commit->getAuditStatus()),
|
||||||
array_interleave(', ', $auditors),
|
phutil_implode_html(', ', $auditors),
|
||||||
phabricator_datetime($commit->getEpoch(), $this->user),
|
phabricator_datetime($commit->getEpoch(), $this->user),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
@ -129,7 +129,7 @@ final class PhabricatorAuditListView extends AphrontView {
|
||||||
}
|
}
|
||||||
|
|
||||||
$reasons = $audit->getAuditReasons();
|
$reasons = $audit->getAuditReasons();
|
||||||
$reasons = array_interleave(phutil_tag('br'), $reasons);
|
$reasons = phutil_implode_html(phutil_tag('br'), $reasons);
|
||||||
|
|
||||||
$status_code = $audit->getAuditStatus();
|
$status_code = $audit->getAuditStatus();
|
||||||
$status = PhabricatorAuditStatusConstants::getStatusName($status_code);
|
$status = PhabricatorAuditStatusConstants::getStatusName($status_code);
|
||||||
|
|
|
@ -277,7 +277,7 @@ abstract class PhabricatorController extends AphrontController {
|
||||||
$items[] = $this->getHandle($phid)->renderLink();
|
$items[] = $this->getHandle($phid)->renderLink();
|
||||||
}
|
}
|
||||||
|
|
||||||
return array_interleave($style_map[$style], $items);
|
return phutil_implode_html($style_map[$style], $items);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function buildApplicationMenu() {
|
protected function buildApplicationMenu() {
|
||||||
|
|
|
@ -44,7 +44,7 @@ final class PhabricatorSetupIssueView extends AphrontView {
|
||||||
),
|
),
|
||||||
array(
|
array(
|
||||||
phutil_tag('p', array(), $run_these),
|
phutil_tag('p', array(), $run_these),
|
||||||
phutil_tag('pre', array(), array_interleave("\n", $commands)),
|
phutil_tag('pre', array(), phutil_implode_html("\n", $commands)),
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -155,7 +155,7 @@ final class PhabricatorSetupIssueView extends AphrontView {
|
||||||
'<tt>phabricator/ $</tt> ./bin/config set %s <em>value</em>',
|
'<tt>phabricator/ $</tt> ./bin/config set %s <em>value</em>',
|
||||||
$key);
|
$key);
|
||||||
}
|
}
|
||||||
$update = phutil_tag('pre', array(), array_interleave("\n", $update));
|
$update = phutil_tag('pre', array(), phutil_implode_html("\n", $update));
|
||||||
} else {
|
} else {
|
||||||
$update = array();
|
$update = array();
|
||||||
foreach ($configs as $config) {
|
foreach ($configs as $config) {
|
||||||
|
|
|
@ -26,7 +26,7 @@ final class DifferentialCommitsFieldSpecification
|
||||||
$links[] = $this->getHandle($commit_phid)->renderLink();
|
$links[] = $this->getHandle($commit_phid)->renderLink();
|
||||||
}
|
}
|
||||||
|
|
||||||
return array_interleave(phutil_tag('br'), $links);
|
return phutil_implode_html(phutil_tag('br'), $links);
|
||||||
}
|
}
|
||||||
|
|
||||||
private function getCommitPHIDs() {
|
private function getCommitPHIDs() {
|
||||||
|
|
|
@ -26,7 +26,7 @@ final class DifferentialDependenciesFieldSpecification
|
||||||
$links[] = $this->getHandle($revision_phids)->renderLink();
|
$links[] = $this->getHandle($revision_phids)->renderLink();
|
||||||
}
|
}
|
||||||
|
|
||||||
return array_interleave(phutil_tag('br'), $links);
|
return phutil_implode_html(phutil_tag('br'), $links);
|
||||||
}
|
}
|
||||||
|
|
||||||
private function getDependentRevisionPHIDs() {
|
private function getDependentRevisionPHIDs() {
|
||||||
|
|
|
@ -26,7 +26,7 @@ final class DifferentialDependsOnFieldSpecification
|
||||||
$links[] = $this->getHandle($revision_phids)->renderLink();
|
$links[] = $this->getHandle($revision_phids)->renderLink();
|
||||||
}
|
}
|
||||||
|
|
||||||
return array_interleave(phutil_tag('br'), $links);
|
return phutil_implode_html(phutil_tag('br'), $links);
|
||||||
}
|
}
|
||||||
|
|
||||||
private function getDependentRevisionPHIDs() {
|
private function getDependentRevisionPHIDs() {
|
||||||
|
|
|
@ -283,7 +283,7 @@ abstract class DifferentialFieldSpecification {
|
||||||
$links[] = $handle->renderLink();
|
$links[] = $handle->renderLink();
|
||||||
}
|
}
|
||||||
|
|
||||||
return array_interleave(', ', $links);
|
return phutil_implode_html(', ', $links);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,7 @@ final class DifferentialManiphestTasksFieldSpecification
|
||||||
$links[] = $this->getHandle($task_phid)->renderLink();
|
$links[] = $this->getHandle($task_phid)->renderLink();
|
||||||
}
|
}
|
||||||
|
|
||||||
return array_interleave(phutil_tag('br'), $links);
|
return phutil_implode_html(phutil_tag('br'), $links);
|
||||||
}
|
}
|
||||||
|
|
||||||
private function getManiphestTaskPHIDs() {
|
private function getManiphestTaskPHIDs() {
|
||||||
|
|
|
@ -160,7 +160,7 @@ final class DifferentialChangesetTwoUpRenderer
|
||||||
'colspan' => 2,
|
'colspan' => 2,
|
||||||
'class' => 'show-more',
|
'class' => 'show-more',
|
||||||
),
|
),
|
||||||
array_interleave(
|
phutil_implode_html(
|
||||||
" \xE2\x80\xA2 ", // Bullet
|
" \xE2\x80\xA2 ", // Bullet
|
||||||
$contents)),
|
$contents)),
|
||||||
phutil_tag(
|
phutil_tag(
|
||||||
|
|
|
@ -178,7 +178,7 @@ final class DifferentialInlineCommentView extends AphrontView {
|
||||||
$links = phutil_tag(
|
$links = phutil_tag(
|
||||||
'span',
|
'span',
|
||||||
array('class' => 'differential-inline-comment-links'),
|
array('class' => 'differential-inline-comment-links'),
|
||||||
array_interleave(" \xC2\xB7 ", $links));
|
phutil_implode_html(" \xC2\xB7 ", $links));
|
||||||
} else {
|
} else {
|
||||||
$links = null;
|
$links = null;
|
||||||
}
|
}
|
||||||
|
|
|
@ -74,7 +74,7 @@ final class DifferentialLocalCommitsView extends AphrontView {
|
||||||
}
|
}
|
||||||
$parents[$k] = substr($parent, 0, 16);
|
$parents[$k] = substr($parent, 0, 16);
|
||||||
}
|
}
|
||||||
$parents = array_interleave(phutil_tag('br'), $parents);
|
$parents = phutil_implode_html(phutil_tag('br'), $parents);
|
||||||
$row[] = phutil_tag('td', array(), $parents);
|
$row[] = phutil_tag('td', array(), $parents);
|
||||||
|
|
||||||
$author = nonempty(
|
$author = nonempty(
|
||||||
|
|
|
@ -449,9 +449,7 @@ final class DiffusionCommitController extends DiffusionController {
|
||||||
foreach ($parents as $parent) {
|
foreach ($parents as $parent) {
|
||||||
$parent_links[] = $handles[$parent->getPHID()]->renderLink();
|
$parent_links[] = $handles[$parent->getPHID()]->renderLink();
|
||||||
}
|
}
|
||||||
$props['Parents'] = array_interleave(
|
$props['Parents'] = phutil_implode_html(" \xC2\xB7 ", $parent_links);
|
||||||
" \xC2\xB7 ",
|
|
||||||
$parent_links);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$request = $this->getDiffusionRequest();
|
$request = $this->getDiffusionRequest();
|
||||||
|
@ -488,7 +486,7 @@ final class DiffusionCommitController extends DiffusionController {
|
||||||
foreach ($task_phids as $phid) {
|
foreach ($task_phids as $phid) {
|
||||||
$task_list[] = $handles[$phid]->renderLink();
|
$task_list[] = $handles[$phid]->renderLink();
|
||||||
}
|
}
|
||||||
$task_list = array_interleave(phutil_tag('br'), $task_list);
|
$task_list = phutil_implode_html(phutil_tag('br'), $task_list);
|
||||||
$props['Tasks'] = $task_list;
|
$props['Tasks'] = $task_list;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -497,7 +495,7 @@ final class DiffusionCommitController extends DiffusionController {
|
||||||
foreach ($proj_phids as $phid) {
|
foreach ($proj_phids as $phid) {
|
||||||
$proj_list[] = $handles[$phid]->renderLink();
|
$proj_list[] = $handles[$phid]->renderLink();
|
||||||
}
|
}
|
||||||
$proj_list = array_interleave(phutil_tag('br'), $proj_list);
|
$proj_list = phutil_implode_html(phutil_tag('br'), $proj_list);
|
||||||
$props['Projects'] = $proj_list;
|
$props['Projects'] = $proj_list;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -938,7 +936,7 @@ final class DiffusionCommitController extends DiffusionController {
|
||||||
$ref);
|
$ref);
|
||||||
}
|
}
|
||||||
|
|
||||||
return array_interleave(', ', $ref_links);
|
return phutil_implode_html(', ', $ref_links);
|
||||||
}
|
}
|
||||||
|
|
||||||
private function buildRawDiffResponse(DiffusionRequest $drequest) {
|
private function buildRawDiffResponse(DiffusionRequest $drequest) {
|
||||||
|
|
|
@ -27,7 +27,7 @@ final class PhabricatorHelpKeyboardShortcutController
|
||||||
foreach ($shortcut['keys'] as $stroke) {
|
foreach ($shortcut['keys'] as $stroke) {
|
||||||
$keystrokes[] = phutil_tag('kbd', array(), $stroke);
|
$keystrokes[] = phutil_tag('kbd', array(), $stroke);
|
||||||
}
|
}
|
||||||
$keystrokes = array_interleave(' or ', $keystrokes);
|
$keystrokes = phutil_implode_html(' or ', $keystrokes);
|
||||||
$rows[] = phutil_tag(
|
$rows[] = phutil_tag(
|
||||||
'tr',
|
'tr',
|
||||||
array(),
|
array(),
|
||||||
|
|
|
@ -147,7 +147,7 @@ final class PhabricatorMacroViewController
|
||||||
foreach ($subscribers as $subscriber) {
|
foreach ($subscribers as $subscriber) {
|
||||||
$sub_view[] = $this->getHandle($subscriber)->renderLink();
|
$sub_view[] = $this->getHandle($subscriber)->renderLink();
|
||||||
}
|
}
|
||||||
$sub_view = array_interleave(', ', $sub_view);
|
$sub_view = phutil_implode_html(', ', $sub_view);
|
||||||
} else {
|
} else {
|
||||||
$sub_view = phutil_tag('em', array(), pht('None'));
|
$sub_view = phutil_tag('em', array(), pht('None'));
|
||||||
}
|
}
|
||||||
|
|
|
@ -456,7 +456,7 @@ final class ManiphestTaskEditController extends ManiphestController {
|
||||||
|
|
||||||
if ($files) {
|
if ($files) {
|
||||||
$file_display = mpull($files, 'getName');
|
$file_display = mpull($files, 'getName');
|
||||||
$file_display = array_interleave(phutil_tag('br'), $file_display);
|
$file_display = phutil_implode_html(phutil_tag('br'), $file_display);
|
||||||
|
|
||||||
$form->appendChild(
|
$form->appendChild(
|
||||||
id(new AphrontFormMarkupControl())
|
id(new AphrontFormMarkupControl())
|
||||||
|
|
|
@ -64,7 +64,7 @@ final class PhabricatorOwnersDetailController
|
||||||
foreach ($owners as $owner) {
|
foreach ($owners as $owner) {
|
||||||
$owner_links[] = $handles[$owner->getUserPHID()]->renderLink();
|
$owner_links[] = $handles[$owner->getUserPHID()]->renderLink();
|
||||||
}
|
}
|
||||||
$owner_links = array_interleave(phutil_tag('br'), $owner_links);
|
$owner_links = phutil_implode_html(phutil_tag('br'), $owner_links);
|
||||||
$rows[] = array('Owners', $owner_links);
|
$rows[] = array('Owners', $owner_links);
|
||||||
|
|
||||||
$rows[] = array(
|
$rows[] = array(
|
||||||
|
@ -98,7 +98,7 @@ final class PhabricatorOwnersDetailController
|
||||||
$repo_name,
|
$repo_name,
|
||||||
$path_link);
|
$path_link);
|
||||||
}
|
}
|
||||||
$path_links = array_interleave(phutil_tag('br'), $path_links);
|
$path_links = phutil_implode_html(phutil_tag('br'), $path_links);
|
||||||
$rows[] = array('Paths', $path_links);
|
$rows[] = array('Paths', $path_links);
|
||||||
|
|
||||||
$table = new AphrontTableView($rows);
|
$table = new AphrontTableView($rows);
|
||||||
|
|
|
@ -238,7 +238,7 @@ final class PhabricatorOwnersListController
|
||||||
$pkg_owners[$key] = phutil_tag('strong', array(), $pkg_owners[$key]);
|
$pkg_owners[$key] = phutil_tag('strong', array(), $pkg_owners[$key]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$pkg_owners = array_interleave(phutil_tag('br'), $pkg_owners);
|
$pkg_owners = phutil_implode_html(phutil_tag('br'), $pkg_owners);
|
||||||
|
|
||||||
$pkg_paths = idx($paths, $package->getID(), array());
|
$pkg_paths = idx($paths, $package->getID(), array());
|
||||||
foreach ($pkg_paths as $key => $path) {
|
foreach ($pkg_paths as $key => $path) {
|
||||||
|
@ -265,7 +265,7 @@ final class PhabricatorOwnersListController
|
||||||
$pkg_paths[$key] = $path->getPath();
|
$pkg_paths[$key] = $path->getPath();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$pkg_paths = array_interleave(phutil_tag('br'), $pkg_paths);
|
$pkg_paths = phutil_implode_html(phutil_tag('br'), $pkg_paths);
|
||||||
|
|
||||||
$rows[] = array(
|
$rows[] = array(
|
||||||
phutil_tag(
|
phutil_tag(
|
||||||
|
|
|
@ -108,13 +108,13 @@ must to maintain backward compatibility.)
|
||||||
|
|
||||||
If you need to build a list of items with some element in between each of them
|
If you need to build a list of items with some element in between each of them
|
||||||
(like a middot, comma, or vertical bar) you can use
|
(like a middot, comma, or vertical bar) you can use
|
||||||
@{function:array_interleave}:
|
@{function:phutil_implode_html}:
|
||||||
|
|
||||||
// Render links with commas between them.
|
// Render links with commas between them.
|
||||||
phutil_tag(
|
phutil_tag(
|
||||||
'div',
|
'div',
|
||||||
array(),
|
array(),
|
||||||
array_interleave(', ', $list_of_links));
|
phutil_implode_html(', ', $list_of_links));
|
||||||
|
|
||||||
= AphrontView Classes =
|
= AphrontView Classes =
|
||||||
|
|
||||||
|
|
|
@ -296,7 +296,7 @@ final class PhabricatorTimelineEventView extends AphrontView {
|
||||||
array(
|
array(
|
||||||
'class' => 'phabricator-timeline-extra',
|
'class' => 'phabricator-timeline-extra',
|
||||||
),
|
),
|
||||||
array_interleave(" \xC2\xB7 ", $extra));
|
phutil_implode_html(" \xC2\xB7 ", $extra));
|
||||||
}
|
}
|
||||||
|
|
||||||
return $extra;
|
return $extra;
|
||||||
|
|
Loading…
Reference in a new issue