diff --git a/src/applications/config/view/PhabricatorSetupIssueView.php b/src/applications/config/view/PhabricatorSetupIssueView.php
index 19922ed10b..c5a0932e3e 100644
--- a/src/applications/config/view/PhabricatorSetupIssueView.php
+++ b/src/applications/config/view/PhabricatorSetupIssueView.php
@@ -115,12 +115,11 @@ final class PhabricatorSetupIssueView extends AphrontView {
array(
'class' => 'setup-issue',
),
- $this->renderSingleView(
- array(
- $name,
- $description,
- $next,
- )));
+ array(
+ $name,
+ $description,
+ $next,
+ ));
}
private function renderPhabricatorConfig(array $configs) {
@@ -188,13 +187,12 @@ final class PhabricatorSetupIssueView extends AphrontView {
array(
'class' => 'setup-issue-config',
),
- self::renderSingleView(
- array(
- $table_info,
- $table,
- $update_info,
- $update,
- )));
+ array(
+ $table_info,
+ $table,
+ $update_info,
+ $update,
+ ));
}
private function renderPHPConfig(array $configs) {
@@ -294,12 +292,11 @@ final class PhabricatorSetupIssueView extends AphrontView {
array(
'class' => 'setup-issue-config',
),
- $this->renderSingleView(
- array(
- $table_info,
- $table,
- $info,
- )));
+ array(
+ $table_info,
+ $table,
+ $info,
+ ));
}
private function renderValueTable(array $dict) {
diff --git a/src/applications/conpherence/view/ConpherenceFileWidgetView.php b/src/applications/conpherence/view/ConpherenceFileWidgetView.php
index d85ec2020b..6cf746300b 100644
--- a/src/applications/conpherence/view/ConpherenceFileWidgetView.php
+++ b/src/applications/conpherence/view/ConpherenceFileWidgetView.php
@@ -58,7 +58,7 @@ final class ConpherenceFileWidgetView extends AphrontView {
->setNoDataString(pht('No files attached to conpherence.'))
->setHeaders(array('', pht('Name')))
->setColumnClasses(array('', 'wide wrap'));
- return $this->renderSingleView(array($header, $table));
+ return array($header, $table);
}
diff --git a/src/applications/conpherence/view/ConpherenceMenuItemView.php b/src/applications/conpherence/view/ConpherenceMenuItemView.php
index 539a107122..50284abfa0 100644
--- a/src/applications/conpherence/view/ConpherenceMenuItemView.php
+++ b/src/applications/conpherence/view/ConpherenceMenuItemView.php
@@ -139,14 +139,13 @@ final class ConpherenceMenuItemView extends AphrontTagView {
(int)$this->unreadCount);
}
- return $this->renderSingleView(
- array(
- $image,
- $title,
- $subtitle,
- $message,
- $epoch,
- $unread_count,
- ));
+ return array(
+ $image,
+ $title,
+ $subtitle,
+ $message,
+ $epoch,
+ $unread_count,
+ );
}
}
diff --git a/src/applications/conpherence/view/ConpherenceTransactionView.php b/src/applications/conpherence/view/ConpherenceTransactionView.php
index 0a1b307bf6..2d3780fcd2 100644
--- a/src/applications/conpherence/view/ConpherenceTransactionView.php
+++ b/src/applications/conpherence/view/ConpherenceTransactionView.php
@@ -81,13 +81,13 @@ final class ConpherenceTransactionView extends AphrontView {
break;
}
- $transaction_view
- ->appendChild(phutil_tag(
+ $transaction_view->appendChild(
+ phutil_tag(
'div',
array(
'class' => $content_class
),
- $this->renderSingleView($content)));
+ $content));
return $transaction_view->render();
}
diff --git a/src/applications/differential/view/DifferentialChangesetDetailView.php b/src/applications/differential/view/DifferentialChangesetDetailView.php
index e010d4e539..308f2705a0 100644
--- a/src/applications/differential/view/DifferentialChangesetDetailView.php
+++ b/src/applications/differential/view/DifferentialChangesetDetailView.php
@@ -92,17 +92,16 @@ final class DifferentialChangesetDetailView extends AphrontView {
'class' => $class,
'id' => $id,
),
- $this->renderSingleView(
- array(
- id(new PhabricatorAnchorView())
- ->setAnchorName($changeset->getAnchorName())
- ->setNavigationMarker(true)
- ->render(),
- $buttons,
- phutil_tag('h1', array(), $display_filename),
- phutil_tag('div', array('style' => 'clear: both'), ''),
- $this->renderChildren(),
- )));
+ array(
+ id(new PhabricatorAnchorView())
+ ->setAnchorName($changeset->getAnchorName())
+ ->setNavigationMarker(true)
+ ->render(),
+ $buttons,
+ phutil_tag('h1', array(), $display_filename),
+ phutil_tag('div', array('style' => 'clear: both'), ''),
+ $this->renderChildren(),
+ ));
}
}
diff --git a/src/applications/differential/view/DifferentialChangesetListView.php b/src/applications/differential/view/DifferentialChangesetListView.php
index 422e8fd9ab..f72733b769 100644
--- a/src/applications/differential/view/DifferentialChangesetListView.php
+++ b/src/applications/differential/view/DifferentialChangesetListView.php
@@ -187,19 +187,18 @@ final class DifferentialChangesetListView extends AphrontView {
));
}
- return $this->renderSingleView(
- array(
- id(new PhabricatorHeaderView())
- ->setHeader($this->getTitle())
- ->render(),
- phutil_tag(
- 'div',
- array(
- 'class' => 'differential-review-stage',
- 'id' => 'differential-review-stage',
- ),
- $output),
- ));
+ return array(
+ id(new PhabricatorHeaderView())
+ ->setHeader($this->getTitle())
+ ->render(),
+ phutil_tag(
+ 'div',
+ array(
+ 'class' => 'differential-review-stage',
+ 'id' => 'differential-review-stage',
+ ),
+ $output),
+ );
}
/**
diff --git a/src/applications/differential/view/DifferentialRevisionCommentView.php b/src/applications/differential/view/DifferentialRevisionCommentView.php
index 226e9a9e82..c7499ddcca 100644
--- a/src/applications/differential/view/DifferentialRevisionCommentView.php
+++ b/src/applications/differential/view/DifferentialRevisionCommentView.php
@@ -210,7 +210,7 @@ final class DifferentialRevisionCommentView extends AphrontView {
$xaction_view->appendChild(hsprintf(
'',
$content,
- $this->renderSingleView($inline_render)));
+ $inline_render));
}
return $xaction_view->render();
diff --git a/src/applications/diffusion/view/DiffusionCommentView.php b/src/applications/diffusion/view/DiffusionCommentView.php
index 890052e667..94a743d97f 100644
--- a/src/applications/diffusion/view/DiffusionCommentView.php
+++ b/src/applications/diffusion/view/DiffusionCommentView.php
@@ -144,7 +144,7 @@ final class DiffusionCommentView extends AphrontView {
$engine->getOutput(
$comment,
PhabricatorAuditComment::MARKUP_FIELD_BODY),
- $this->renderSingleView($this->renderInlines()));
+ $this->renderInlines());
}
}
diff --git a/src/applications/feed/view/PhabricatorFeedStoryView.php b/src/applications/feed/view/PhabricatorFeedStoryView.php
index fb2d8df8f1..20c8fe0155 100644
--- a/src/applications/feed/view/PhabricatorFeedStoryView.php
+++ b/src/applications/feed/view/PhabricatorFeedStoryView.php
@@ -119,7 +119,7 @@ final class PhabricatorFeedStoryView extends PhabricatorFeedView {
: 'phabricator-feed-story',
'style' => $image_style,
),
- $this->renderSingleView(array($head, $body, $foot)));
+ array($head, $body, $foot));
}
}
diff --git a/src/applications/maniphest/view/ManiphestTaskListView.php b/src/applications/maniphest/view/ManiphestTaskListView.php
index aa8baac074..556d460753 100644
--- a/src/applications/maniphest/view/ManiphestTaskListView.php
+++ b/src/applications/maniphest/view/ManiphestTaskListView.php
@@ -45,7 +45,7 @@ final class ManiphestTaskListView extends ManiphestView {
$views[] = $view->render();
}
- return $this->renderSingleView($views);
+ return $views;
}
}
diff --git a/src/applications/maniphest/view/ManiphestTaskProjectsView.php b/src/applications/maniphest/view/ManiphestTaskProjectsView.php
index f292157a91..db9d4959db 100644
--- a/src/applications/maniphest/view/ManiphestTaskProjectsView.php
+++ b/src/applications/maniphest/view/ManiphestTaskProjectsView.php
@@ -52,7 +52,7 @@ final class ManiphestTaskProjectsView extends ManiphestView {
"\xE2\x80\xA6");
}
- return $this->renderSingleView($tags);
+ return $tags;
}
}
diff --git a/src/applications/meta/view/PhabricatorApplicationLaunchView.php b/src/applications/meta/view/PhabricatorApplicationLaunchView.php
index 261944bfe4..0a6e2e46ef 100644
--- a/src/applications/meta/view/PhabricatorApplicationLaunchView.php
+++ b/src/applications/meta/view/PhabricatorApplicationLaunchView.php
@@ -167,16 +167,11 @@ final class PhabricatorApplicationLaunchView extends AphrontView {
'href' => $application ? $application->getBaseURI() : null,
'title' => $title,
),
- $this->renderSingleView(
- array(
- $icon,
- $content,
- )));
-
- return $this->renderSingleView(
array(
- $app_button,
- $create_button,
+ $icon,
+ $content,
));
+
+ return array($app_button, $create_button);
}
}
diff --git a/src/applications/pholio/view/PholioInlineCommentEditView.php b/src/applications/pholio/view/PholioInlineCommentEditView.php
index 228888be58..862e72aebe 100644
--- a/src/applications/pholio/view/PholioInlineCommentEditView.php
+++ b/src/applications/pholio/view/PholioInlineCommentEditView.php
@@ -46,11 +46,10 @@ final class PholioInlineCommentEditView extends AphrontView {
'method' => 'POST',
'sigil' => 'inline-edit-form',
),
- $this->renderSingleView(
- array(
- $this->renderInputs(),
- $this->renderBody(),
- )));
+ array(
+ $this->renderInputs(),
+ $this->renderBody(),
+ ));
return $content;
}
@@ -121,24 +120,22 @@ final class PholioInlineCommentEditView extends AphrontView {
array(
'class' => 'pholio-inline-comment-dialog-buttons',
),
- $this->renderSingleView(
- array(
- $formatting,
- $buttons,
- phutil_tag('div', array('style' => 'clear: both'), ''),
- )));
+ array(
+ $formatting,
+ $buttons,
+ phutil_tag('div', array('style' => 'clear: both'), ''),
+ ));
return javelin_tag(
'div',
array(
'class' => 'pholio-inline-comment-dialog',
),
- $this->renderSingleView(
- array(
- $title,
- $body,
- $edit,
- )));
+ array(
+ $title,
+ $body,
+ $edit,
+ ));
}
}
diff --git a/src/applications/pholio/view/PholioInlineCommentSaveView.php b/src/applications/pholio/view/PholioInlineCommentSaveView.php
index c5f0897748..da5b361523 100644
--- a/src/applications/pholio/view/PholioInlineCommentSaveView.php
+++ b/src/applications/pholio/view/PholioInlineCommentSaveView.php
@@ -41,11 +41,10 @@ final class PholioInlineCommentSaveView extends AphrontView {
'class' => 'pholio-new-inline-comment',
'id' => 'pholio-new-inline-comment-dialog'
),
- $this->renderSingleView(
- array(
- $this->renderInputs(),
- $this->renderBody(),
- )));
+ array(
+ $this->renderInputs(),
+ $this->renderBody(),
+ ));
return $content;
}
@@ -109,23 +108,21 @@ final class PholioInlineCommentSaveView extends AphrontView {
array(
'class' => 'pholio-inline-comment-dialog-buttons',
),
- $this->renderSingleView(
- array(
- $formatting,
- $buttons,
- phutil_tag('div', array('style' => 'clear: both'), ''),
- )));
+ array(
+ $formatting,
+ $buttons,
+ phutil_tag('div', array('style' => 'clear: both'), ''),
+ ));
return javelin_tag(
'div',
array(
),
- $this->renderSingleView(
- array(
- $title,
- $body,
- $edit,
- )));
+ array(
+ $title,
+ $body,
+ $edit,
+ ));
}
}
diff --git a/src/applications/pholio/view/PholioInlineCommentView.php b/src/applications/pholio/view/PholioInlineCommentView.php
index 1ac2018659..2993be226b 100644
--- a/src/applications/pholio/view/PholioInlineCommentView.php
+++ b/src/applications/pholio/view/PholioInlineCommentView.php
@@ -118,7 +118,7 @@ final class PholioInlineCommentView extends AphrontView {
$classes[] = 'pholio-inline-comment-draft';
}
- $comment_block = javelin_tag(
+ return javelin_tag(
'div',
array(
'id' => "{$phid}_comment",
@@ -129,8 +129,5 @@ final class PholioInlineCommentView extends AphrontView {
)
),
array($comment_header, $comment_body));
-
-
- return $this->renderSingleView($comment_block);
}
}
diff --git a/src/applications/pholio/view/PholioMockEmbedView.php b/src/applications/pholio/view/PholioMockEmbedView.php
index 27f7674725..8cdc1d7ffe 100644
--- a/src/applications/pholio/view/PholioMockEmbedView.php
+++ b/src/applications/pholio/view/PholioMockEmbedView.php
@@ -94,13 +94,11 @@ final class PholioMockEmbedView extends AphrontView {
$icon_list);
- $mock_view = phutil_tag(
+ return phutil_tag(
'div',
array(
'class' => 'pholio-mock-embed'
),
array($mock_header, $mock_body, $mock_footer));
-
- return $this->renderSingleView($mock_view);
}
}
diff --git a/src/applications/pholio/view/PholioMockImagesView.php b/src/applications/pholio/view/PholioMockImagesView.php
index a8f3a6c209..ef018537b6 100644
--- a/src/applications/pholio/view/PholioMockImagesView.php
+++ b/src/applications/pholio/view/PholioMockImagesView.php
@@ -158,6 +158,6 @@ final class PholioMockImagesView extends AphrontView {
),
array($mock_wrapper, $carousel_holder, $inline_comments_holder));
- return $this->renderSingleView($mockview);
+ return $mockview;
}
}
diff --git a/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php b/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
index ec26997456..76eff67545 100644
--- a/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
+++ b/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
@@ -58,20 +58,19 @@ class PhabricatorApplicationTransactionCommentView extends AphrontView {
if (!$user->isLoggedIn()) {
$uri = id(new PhutilURI('/login/'))
->setQueryParam('next', (string) $this->getRequestURI());
- return self::renderSingleView(
- phutil_tag(
- 'div',
+ return phutil_tag(
+ 'div',
+ array(
+ 'class' => 'login-to-comment'
+ ),
+ javelin_tag(
+ 'a',
array(
- 'class' => 'login-to-comment'
+ 'class' => 'button',
+ 'sigil' => 'workflow',
+ 'href' => $uri
),
- javelin_tag(
- 'a',
- array(
- 'class' => 'button',
- 'sigil' => 'workflow',
- 'href' => $uri
- ),
- pht('Login to Comment'))));
+ pht('Login to Comment')));
}
$data = array();
@@ -97,11 +96,7 @@ class PhabricatorApplicationTransactionCommentView extends AphrontView {
'draftKey' => $this->getDraft()->getDraftKey(),
));
- return self::renderSingleView(
- array(
- $comment,
- $preview,
- ));
+ return array($comment, $preview);
}
private function renderCommentPanel() {
@@ -157,11 +152,10 @@ class PhabricatorApplicationTransactionCommentView extends AphrontView {
'id' => $this->getPreviewPanelID(),
'style' => 'display: none',
),
- self::renderSingleView(
- array(
- $header,
- $preview,
- )));
+ array(
+ $header,
+ $preview,
+ ));
}
private function getPreviewPanelID() {
diff --git a/src/view/AphrontView.php b/src/view/AphrontView.php
index 0bd218c741..c9cf7ae6b6 100644
--- a/src/view/AphrontView.php
+++ b/src/view/AphrontView.php
@@ -30,25 +30,18 @@ abstract class AphrontView extends Phobject
}
final protected function renderChildren() {
- $out = array();
- foreach ($this->children as $child) {
- $out[] = $this->renderSingleView($child);
- }
- return $out;
+ return $this->children;
}
+ /**
+ * @deprecated
+ */
final protected function renderSingleView($child) {
- if ($child instanceof AphrontView) {
- return $child->render();
- } else if (is_array($child)) {
- $out = array();
- foreach ($child as $element) {
- $out[] = $this->renderSingleView($element);
- }
- return phutil_implode_html('', $out);
- } else {
- return $child;
- }
+ phutil_deprecated(
+ 'AphrontView->renderSingleView()',
+ "This method no longer does anything; it can be removed and replaced ".
+ "with its arguments.");
+ return $child;
}
final protected function isEmptyContent($content) {
diff --git a/src/view/form/control/PhabricatorRemarkupControl.php b/src/view/form/control/PhabricatorRemarkupControl.php
index 3ca49c2120..a7b162b1c0 100644
--- a/src/view/form/control/PhabricatorRemarkupControl.php
+++ b/src/view/form/control/PhabricatorRemarkupControl.php
@@ -154,11 +154,10 @@ final class PhabricatorRemarkupControl extends AphrontFormTextAreaControl {
array(
'sigil' => 'remarkup-assist-control',
),
- $this->renderSingleView(
- array(
- $buttons,
- parent::renderInput(),
- )));
+ array(
+ $buttons,
+ parent::renderInput(),
+ ));
}
}
diff --git a/src/view/layout/AphrontCrumbsView.php b/src/view/layout/AphrontCrumbsView.php
index f73901f687..e9cee36a22 100644
--- a/src/view/layout/AphrontCrumbsView.php
+++ b/src/view/layout/AphrontCrumbsView.php
@@ -15,7 +15,7 @@ final class AphrontCrumbsView extends AphrontView {
$out = array();
foreach ($this->crumbs as $crumb) {
- $out[] = $this->renderSingleView($crumb);
+ $out[] = $crumb;
}
$out = phutil_implode_html(
hsprintf(''."\xC2\xBB".''),
diff --git a/src/view/layout/AphrontSideNavFilterView.php b/src/view/layout/AphrontSideNavFilterView.php
index 2a38942edf..48e2c5e360 100644
--- a/src/view/layout/AphrontSideNavFilterView.php
+++ b/src/view/layout/AphrontSideNavFilterView.php
@@ -231,17 +231,16 @@ final class AphrontSideNavFilterView extends AphrontView {
),
'');
- $local_menu = $this->renderSingleView(
- array(
- $menu_background,
- phutil_tag(
- 'div',
- array(
- 'class' => 'phabricator-nav-local phabricator-side-menu',
- 'id' => $local_id,
- ),
- self::renderSingleView($this->menu->setID($this->getMenuID()))),
- ));
+ $local_menu = array(
+ $menu_background,
+ phutil_tag(
+ 'div',
+ array(
+ 'class' => 'phabricator-nav-local phabricator-side-menu',
+ 'id' => $local_id,
+ ),
+ $this->menu->setID($this->getMenuID())),
+ );
}
$crumbs = null;
@@ -294,7 +293,7 @@ final class AphrontSideNavFilterView extends AphrontView {
),
array(
$crumbs,
- phutil_implode_html('', $this->renderChildren()),
+ $this->renderChildren(),
))
));
}
diff --git a/src/view/layout/PhabricatorActionListView.php b/src/view/layout/PhabricatorActionListView.php
index 37c3252df9..2497090e14 100644
--- a/src/view/layout/PhabricatorActionListView.php
+++ b/src/view/layout/PhabricatorActionListView.php
@@ -42,7 +42,7 @@ final class PhabricatorActionListView extends AphrontView {
array(
'class' => 'phabricator-action-list-view',
),
- $this->renderSingleView($actions));
+ $actions);
}
diff --git a/src/view/layout/PhabricatorAnchorView.php b/src/view/layout/PhabricatorAnchorView.php
index 6ffd7e59fe..ec2a3b0dc8 100644
--- a/src/view/layout/PhabricatorAnchorView.php
+++ b/src/view/layout/PhabricatorAnchorView.php
@@ -39,7 +39,7 @@ final class PhabricatorAnchorView extends AphrontView {
),
'');
- return $this->renderSingleView(array($marker, $anchor));
+ return array($marker, $anchor);
}
}
diff --git a/src/view/layout/PhabricatorCrumbsView.php b/src/view/layout/PhabricatorCrumbsView.php
index 2ee9d48022..9cc8759050 100644
--- a/src/view/layout/PhabricatorCrumbsView.php
+++ b/src/view/layout/PhabricatorCrumbsView.php
@@ -55,7 +55,7 @@ final class PhabricatorCrumbsView extends AphrontView {
array(
'class' => 'phabricator-crumbs-actions',
),
- $this->renderSingleView($actions));
+ $actions);
}
if ($this->crumbs) {
@@ -68,11 +68,10 @@ final class PhabricatorCrumbsView extends AphrontView {
'class' => 'phabricator-crumbs-view '.
'sprite-gradient gradient-breadcrumbs',
),
- $this->renderSingleView(
- array(
- $action_view,
- $this->crumbs,
- )));
+ array(
+ $action_view,
+ $this->crumbs,
+ ));
}
}
diff --git a/src/view/layout/PhabricatorHeaderView.php b/src/view/layout/PhabricatorHeaderView.php
index 63e0d9e930..a424c5800b 100644
--- a/src/view/layout/PhabricatorHeaderView.php
+++ b/src/view/layout/PhabricatorHeaderView.php
@@ -44,7 +44,7 @@ final class PhabricatorHeaderView extends AphrontView {
array(
'class' => 'phabricator-header-tags',
),
- $this->renderSingleView($this->tags));
+ $this->tags);
}
return phutil_tag(
diff --git a/src/view/layout/PhabricatorMenuItemView.php b/src/view/layout/PhabricatorMenuItemView.php
index 6e021c8c97..e326052271 100644
--- a/src/view/layout/PhabricatorMenuItemView.php
+++ b/src/view/layout/PhabricatorMenuItemView.php
@@ -114,14 +114,16 @@ final class PhabricatorMenuItemView extends AphrontTagView {
array(
'class' => 'phabricator-menu-item-name',
),
- $this->name.$external);
+ array(
+ $this->name,
+ $external,
+ ));
}
- return $this->renderSingleView(
- array(
- $this->renderChildren(),
- $name,
- ));
+ return array(
+ $this->renderChildren(),
+ $name,
+ );
}
}
diff --git a/src/view/layout/PhabricatorMenuView.php b/src/view/layout/PhabricatorMenuView.php
index bd4c471fe7..9b313bc003 100644
--- a/src/view/layout/PhabricatorMenuView.php
+++ b/src/view/layout/PhabricatorMenuView.php
@@ -168,6 +168,6 @@ final class PhabricatorMenuView extends AphrontTagView {
}
protected function getTagContent() {
- return $this->renderSingleView($this->items);
+ return $this->items;
}
}
diff --git a/src/view/layout/PhabricatorObjectItemListView.php b/src/view/layout/PhabricatorObjectItemListView.php
index d98feaef38..feb224458d 100644
--- a/src/view/layout/PhabricatorObjectItemListView.php
+++ b/src/view/layout/PhabricatorObjectItemListView.php
@@ -48,7 +48,7 @@ final class PhabricatorObjectItemListView extends AphrontView {
}
if ($this->items) {
- $items = $this->renderSingleView($this->items);
+ $items = $this->items;
} else {
$string = nonempty($this->noDataString, pht('No data.'));
$items = id(new AphrontErrorView())
@@ -58,7 +58,7 @@ final class PhabricatorObjectItemListView extends AphrontView {
$pager = null;
if ($this->pager) {
- $pager = $this->renderSingleView($this->pager);
+ $pager = $this->pager;
}
$classes[] = 'phabricator-object-item-list-view';
@@ -71,12 +71,11 @@ final class PhabricatorObjectItemListView extends AphrontView {
array(
'class' => implode(' ', $classes),
),
- $this->renderSingleView(
- array(
- $header,
- $items,
- $pager,
- )));
+ array(
+ $header,
+ $items,
+ $pager,
+ ));
}
}
diff --git a/src/view/layout/PhabricatorObjectItemView.php b/src/view/layout/PhabricatorObjectItemView.php
index e58f14b68c..b99f0055aa 100644
--- a/src/view/layout/PhabricatorObjectItemView.php
+++ b/src/view/layout/PhabricatorObjectItemView.php
@@ -177,12 +177,11 @@ final class PhabricatorObjectItemView extends AphrontView {
array(
'class' => 'phabricator-object-item-content',
),
- $this->renderSingleView(
- array(
- $header,
- $attrs,
- $this->renderChildren(),
- )));
+ array(
+ $header,
+ $attrs,
+ $this->renderChildren(),
+ ));
return phutil_tag(
'li',
diff --git a/src/view/layout/PhabricatorPinboardItemView.php b/src/view/layout/PhabricatorPinboardItemView.php
index 7bef64bb93..708efcff66 100644
--- a/src/view/layout/PhabricatorPinboardItemView.php
+++ b/src/view/layout/PhabricatorPinboardItemView.php
@@ -103,13 +103,12 @@ final class PhabricatorPinboardItemView extends AphrontView {
array(
'class' => 'phabricator-pinboard-item-view',
),
- $this->renderSingleView(
- array(
- $header,
- $image,
- $icons,
- $content,
- )));
+ array(
+ $header,
+ $image,
+ $icons,
+ $content,
+ ));
}
}
diff --git a/src/view/layout/PhabricatorPinboardView.php b/src/view/layout/PhabricatorPinboardView.php
index ace3b0b34f..992580d6f7 100644
--- a/src/view/layout/PhabricatorPinboardView.php
+++ b/src/view/layout/PhabricatorPinboardView.php
@@ -31,7 +31,7 @@ final class PhabricatorPinboardView extends AphrontView {
array(
'class' => 'phabricator-pinboard-view',
),
- $this->renderSingleView($this->items));
+ $this->items);
}
}
diff --git a/src/view/layout/PhabricatorProfileHeaderView.php b/src/view/layout/PhabricatorProfileHeaderView.php
index c99b802907..50ca80909e 100644
--- a/src/view/layout/PhabricatorProfileHeaderView.php
+++ b/src/view/layout/PhabricatorProfileHeaderView.php
@@ -68,9 +68,9 @@ final class PhabricatorProfileHeaderView extends AphrontView {
%s',
$this->profileName,
- self::renderSingleView($this->profileActions),
+ $this->profileActions,
$image,
$description,
- phutil_implode_html('', $this->renderChildren()));
+ $this->renderChildren());
}
}
diff --git a/src/view/layout/PhabricatorPropertyListView.php b/src/view/layout/PhabricatorPropertyListView.php
index 645fdbf084..4950821403 100644
--- a/src/view/layout/PhabricatorPropertyListView.php
+++ b/src/view/layout/PhabricatorPropertyListView.php
@@ -112,7 +112,7 @@ final class PhabricatorPropertyListView extends AphrontView {
array(
'class' => 'phabricator-property-list-view',
),
- $this->renderSingleView($items));
+ $items);
}
private function renderPropertyPart(array $part) {
@@ -133,7 +133,7 @@ final class PhabricatorPropertyListView extends AphrontView {
array(
'class' => 'phabricator-property-list-value',
),
- $this->renderSingleView($value));
+ $value);
}
$list = phutil_tag(
diff --git a/src/view/layout/PhabricatorTimelineEventView.php b/src/view/layout/PhabricatorTimelineEventView.php
index fdc477340f..e113de5f49 100644
--- a/src/view/layout/PhabricatorTimelineEventView.php
+++ b/src/view/layout/PhabricatorTimelineEventView.php
@@ -138,7 +138,7 @@ final class PhabricatorTimelineEventView extends AphrontView {
),
array($title, $extra));
- $title = $this->renderSingleView(array($icon, $title));
+ $title = array($icon, $title);
}
$wedge = phutil_tag(
@@ -275,16 +275,15 @@ final class PhabricatorTimelineEventView extends AphrontView {
->setAnchorName($this->anchor)
->render();
- $date = $this->renderSingleView(
- array(
- $anchor,
- phutil_tag(
- 'a',
- array(
- 'href' => '#'.$this->anchor,
- ),
- $date),
- ));
+ $date = array(
+ $anchor,
+ phutil_tag(
+ 'a',
+ array(
+ 'href' => '#'.$this->anchor,
+ ),
+ $date),
+ );
}
$extra[] = $date;
}
diff --git a/src/view/layout/PhabricatorTimelineView.php b/src/view/layout/PhabricatorTimelineView.php
index 3977a320b2..cdd93134b2 100644
--- a/src/view/layout/PhabricatorTimelineView.php
+++ b/src/view/layout/PhabricatorTimelineView.php
@@ -23,7 +23,7 @@ final class PhabricatorTimelineView extends AphrontView {
$events = array();
foreach ($this->events as $event) {
$events[] = $spacer;
- $events[] = $this->renderSingleView($event);
+ $events[] = $event;
}
$events[] = $spacer;
diff --git a/src/view/layout/PhabricatorTransactionView.php b/src/view/layout/PhabricatorTransactionView.php
index a4906d6d54..a5f4c480c3 100644
--- a/src/view/layout/PhabricatorTransactionView.php
+++ b/src/view/layout/PhabricatorTransactionView.php
@@ -124,7 +124,7 @@ final class PhabricatorTransactionView extends AphrontView {
}
private function renderTransactionActions() {
- return phutil_implode_html('', $this->actions);
+ return $this->actions;
}
private function renderTransactionStyle() {
@@ -143,7 +143,7 @@ final class PhabricatorTransactionView extends AphrontView {
return phutil_tag(
'div',
array('class' => 'phabricator-transaction-content'),
- $this->renderSingleView($content));
+ $content);
}
}
diff --git a/src/view/page/menu/PhabricatorMainMenuView.php b/src/view/page/menu/PhabricatorMainMenuView.php
index 6ad736d817..7c3a3cb163 100644
--- a/src/view/page/menu/PhabricatorMainMenuView.php
+++ b/src/view/page/menu/PhabricatorMainMenuView.php
@@ -56,7 +56,7 @@ final class PhabricatorMainMenuView extends AphrontView {
array(
'class' => 'phabricator-main-menu-alerts',
),
- self::renderSingleView($alerts));
+ $alerts);
}
$application_menu = $this->getApplicationMenu();
@@ -72,17 +72,15 @@ final class PhabricatorMainMenuView extends AphrontView {
'id' => $header_id,
),
array(
- self::renderSingleView(array(
- $this->renderPhabricatorMenuButton($header_id),
- $application_menu
- ? $this->renderApplicationMenuButton($header_id)
- : null,
- $this->renderPhabricatorLogo(),
- $alerts,
- $phabricator_menu,
- $application_menu,
- )),
- self::renderSingleView($menus),
+ $this->renderPhabricatorMenuButton($header_id),
+ $application_menu
+ ? $this->renderApplicationMenuButton($header_id)
+ : null,
+ $this->renderPhabricatorLogo(),
+ $alerts,
+ $phabricator_menu,
+ $application_menu,
+ $menus,
));
}