diff --git a/src/applications/differential/render/DifferentialChangesetTwoUpRenderer.php b/src/applications/differential/render/DifferentialChangesetTwoUpRenderer.php index bf00225a64..74287042a8 100644 --- a/src/applications/differential/render/DifferentialChangesetTwoUpRenderer.php +++ b/src/applications/differential/render/DifferentialChangesetTwoUpRenderer.php @@ -342,7 +342,7 @@ final class DifferentialChangesetTwoUpRenderer array( 'class' => 'differential-image-stage' ), - phutil_render_tag( + phutil_tag( 'img', array( 'src' => $old_file->getBestURI(), @@ -358,7 +358,7 @@ final class DifferentialChangesetTwoUpRenderer array( 'class' => 'differential-image-stage' ), - phutil_render_tag( + phutil_tag( 'img', array( 'src' => $new_file->getBestURI(), diff --git a/src/applications/differential/view/DifferentialInlineCommentEditView.php b/src/applications/differential/view/DifferentialInlineCommentEditView.php index 73d44fb811..e60b198a0f 100644 --- a/src/applications/differential/view/DifferentialInlineCommentEditView.php +++ b/src/applications/differential/view/DifferentialInlineCommentEditView.php @@ -79,14 +79,13 @@ final class DifferentialInlineCommentEditView extends AphrontView { $out = array(); foreach ($this->inputs as $input) { list($name, $value) = $input; - $out[] = phutil_render_tag( + $out[] = phutil_tag( 'input', array( 'type' => 'hidden', 'name' => $name, 'value' => $value, - ), - null); + )); } return implode('', $out); } diff --git a/src/applications/differential/view/DifferentialRevisionListView.php b/src/applications/differential/view/DifferentialRevisionListView.php index a28485c325..3d8a9cb89a 100644 --- a/src/applications/differential/view/DifferentialRevisionListView.php +++ b/src/applications/differential/view/DifferentialRevisionListView.php @@ -130,7 +130,7 @@ final class DifferentialRevisionListView extends AphrontView { $src = '/rsrc/image/icon/fatcow/page_white_edit.png'; $flag = ''. - phutil_render_tag( + phutil_tag( 'img', array( 'src' => celerity_get_resource_uri($src), diff --git a/src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php b/src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php index d4b6417e55..ff00f973e9 100644 --- a/src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php +++ b/src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php @@ -92,7 +92,7 @@ final class DifferentialRevisionUpdateHistoryView extends AphrontView { if ($max_id != $id) { $uniq = celerity_generate_unique_node_id(); $old_checked = ($this->selectedVersusDiffID == $id); - $old = phutil_render_tag( + $old = phutil_tag( 'input', array( 'type' => 'radio', diff --git a/src/applications/diffusion/controller/DiffusionBrowseFileController.php b/src/applications/diffusion/controller/DiffusionBrowseFileController.php index e3f5592426..edab2227ed 100644 --- a/src/applications/diffusion/controller/DiffusionBrowseFileController.php +++ b/src/applications/diffusion/controller/DiffusionBrowseFileController.php @@ -789,7 +789,7 @@ final class DiffusionBrowseFileController extends DiffusionController { $properties->addProperty( pht('Image'), - phutil_render_tag( + phutil_tag( 'img', array( 'src' => $file_uri, diff --git a/src/applications/directory/controller/PhabricatorDirectoryMainController.php b/src/applications/directory/controller/PhabricatorDirectoryMainController.php index a59914bfec..841f38de61 100644 --- a/src/applications/directory/controller/PhabricatorDirectoryMainController.php +++ b/src/applications/directory/controller/PhabricatorDirectoryMainController.php @@ -301,7 +301,7 @@ final class PhabricatorDirectoryMainController ), 'Jump Nav User Guide'); - $jump_input = phutil_render_tag( + $jump_input = phutil_tag( 'input', array( 'type' => 'text', diff --git a/src/applications/files/controller/PhabricatorFileInfoController.php b/src/applications/files/controller/PhabricatorFileInfoController.php index cff0b780b1..26a095af51 100644 --- a/src/applications/files/controller/PhabricatorFileInfoController.php +++ b/src/applications/files/controller/PhabricatorFileInfoController.php @@ -141,7 +141,7 @@ final class PhabricatorFileInfoController extends PhabricatorFileController { // TODO: Clean this up after Pholio (dark backgrounds, standardization, // etc.) - $image = phutil_render_tag( + $image = phutil_tag( 'img', array( 'src' => $file->getViewURI(), diff --git a/src/applications/macro/controller/PhabricatorMacroViewController.php b/src/applications/macro/controller/PhabricatorMacroViewController.php index 3a0ad35e42..b2b7d1e98a 100644 --- a/src/applications/macro/controller/PhabricatorMacroViewController.php +++ b/src/applications/macro/controller/PhabricatorMacroViewController.php @@ -158,7 +158,7 @@ final class PhabricatorMacroViewController if ($file) { $view->addTextContent( - phutil_render_tag( + phutil_tag( 'img', array( 'src' => $file->getViewURI(), diff --git a/src/applications/maniphest/controller/ManiphestBatchEditController.php b/src/applications/maniphest/controller/ManiphestBatchEditController.php index 3d69493ae1..01b656539b 100644 --- a/src/applications/maniphest/controller/ManiphestBatchEditController.php +++ b/src/applications/maniphest/controller/ManiphestBatchEditController.php @@ -79,25 +79,23 @@ final class ManiphestBatchEditController extends ManiphestController { foreach ($tasks as $task) { $form->appendChild( - phutil_render_tag( + phutil_tag( 'input', array( 'type' => 'hidden', 'name' => 'batch[]', 'value' => $task->getID(), - ), - null)); + ))); } $form->appendChild( - phutil_render_tag( + phutil_tag( 'input', array( 'type' => 'hidden', 'name' => 'actions', 'id' => 'batch-form-actions', - ), - null)); + ))); $form->appendChild('

These tasks will be edited:

'); $form->appendChild($list); $form->appendChild( diff --git a/src/applications/maniphest/controller/ManiphestSavedQueryListController.php b/src/applications/maniphest/controller/ManiphestSavedQueryListController.php index 5f5a82666b..3578aad4e2 100644 --- a/src/applications/maniphest/controller/ManiphestSavedQueryListController.php +++ b/src/applications/maniphest/controller/ManiphestSavedQueryListController.php @@ -40,7 +40,7 @@ final class ManiphestSavedQueryListController extends ManiphestController { $default = $query; } $rows[] = array( - phutil_render_tag( + phutil_tag( 'input', array( 'type' => 'radio', @@ -73,7 +73,7 @@ final class ManiphestSavedQueryListController extends ManiphestController { } $rows[] = array( - phutil_render_tag( + phutil_tag( 'input', array( 'type' => 'radio', diff --git a/src/applications/phame/skins/PhameBasicBlogSkin.php b/src/applications/phame/skins/PhameBasicBlogSkin.php index 800f02e3da..2e1e2424d4 100644 --- a/src/applications/phame/skins/PhameBasicBlogSkin.php +++ b/src/applications/phame/skins/PhameBasicBlogSkin.php @@ -104,7 +104,7 @@ abstract class PhameBasicBlogSkin extends PhameBlogSkin { $pager = $this->renderOlderPageLink().$this->renderNewerPageLink(); if ($pager) { - $pager = phutil_render_tag( + $pager = phutil_tag( 'div', array( 'class' => 'phame-pager', diff --git a/src/applications/phame/skins/PhameBasicTemplateBlogSkin.php b/src/applications/phame/skins/PhameBasicTemplateBlogSkin.php index 709b3a1910..39dc7df989 100644 --- a/src/applications/phame/skins/PhameBasicTemplateBlogSkin.php +++ b/src/applications/phame/skins/PhameBasicTemplateBlogSkin.php @@ -18,7 +18,7 @@ final class PhameBasicTemplateBlogSkin extends PhameBasicBlogSkin { if (!preg_match('/.css$/', $path)) { continue; } - $this->cssResources[] = phutil_render_tag( + $this->cssResources[] = phutil_tag( 'link', array( 'rel' => 'stylesheet', diff --git a/src/applications/phame/view/PhamePostView.php b/src/applications/phame/view/PhamePostView.php index a7c2ac7382..6e63fe7f17 100644 --- a/src/applications/phame/view/PhamePostView.php +++ b/src/applications/phame/view/PhamePostView.php @@ -201,7 +201,7 @@ final class PhamePostView extends AphrontView { $post = $this->getPost(); - $disqus_thread = phutil_render_tag('div', + $disqus_thread = phutil_tag('div', array( 'id' => 'disqus_thread' ) diff --git a/src/applications/phortune/stripe/view/PhortuneStripePaymentFormView.php b/src/applications/phortune/stripe/view/PhortuneStripePaymentFormView.php index c55f7030f2..569f7db994 100644 --- a/src/applications/phortune/stripe/view/PhortuneStripePaymentFormView.php +++ b/src/applications/phortune/stripe/view/PhortuneStripePaymentFormView.php @@ -106,7 +106,7 @@ final class PhortuneStripePaymentFormView extends AphrontView { ) ) ->appendChild( - phutil_render_tag( + phutil_tag( 'input', array( 'hidden' => true, diff --git a/src/applications/phpast/controller/PhabricatorXHPASTViewFrameController.php b/src/applications/phpast/controller/PhabricatorXHPASTViewFrameController.php index 9fcf82bd5e..a800d37609 100644 --- a/src/applications/phpast/controller/PhabricatorXHPASTViewFrameController.php +++ b/src/applications/phpast/controller/PhabricatorXHPASTViewFrameController.php @@ -13,7 +13,7 @@ final class PhabricatorXHPASTViewFrameController $id = $this->id; return $this->buildStandardPageResponse( - phutil_render_tag( + phutil_tag( 'iframe', array( 'src' => '/xhpast/frameset/'.$id.'/', diff --git a/src/applications/project/controller/PhabricatorProjectProfileEditController.php b/src/applications/project/controller/PhabricatorProjectProfileEditController.php index e1e70b50c7..fcdcb34942 100644 --- a/src/applications/project/controller/PhabricatorProjectProfileEditController.php +++ b/src/applications/project/controller/PhabricatorProjectProfileEditController.php @@ -200,7 +200,7 @@ final class PhabricatorProjectProfileEditController id(new AphrontFormMarkupControl()) ->setLabel('Profile Image') ->setValue( - phutil_render_tag( + phutil_tag( 'img', array( 'src' => $img_src, diff --git a/src/applications/search/controller/PhabricatorSearchController.php b/src/applications/search/controller/PhabricatorSearchController.php index 4ffe4798aa..93e55a11de 100644 --- a/src/applications/search/controller/PhabricatorSearchController.php +++ b/src/applications/search/controller/PhabricatorSearchController.php @@ -145,7 +145,7 @@ final class PhabricatorSearchController ->setUser($user) ->setAction('/search/') ->appendChild( - phutil_render_tag( + phutil_tag( 'input', array( 'type' => 'hidden', diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelProfile.php b/src/applications/settings/panel/PhabricatorSettingsPanelProfile.php index 3eb398aa4b..692636405f 100644 --- a/src/applications/settings/panel/PhabricatorSettingsPanelProfile.php +++ b/src/applications/settings/panel/PhabricatorSettingsPanelProfile.php @@ -179,7 +179,7 @@ final class PhabricatorSettingsPanelProfile id(new AphrontFormMarkupControl()) ->setLabel('Profile Image') ->setValue( - phutil_render_tag( + phutil_tag( 'img', array( 'src' => $img_src, diff --git a/src/applications/slowvote/controller/PhabricatorSlowvotePollController.php b/src/applications/slowvote/controller/PhabricatorSlowvotePollController.php index e94c1fb691..18a76bee96 100644 --- a/src/applications/slowvote/controller/PhabricatorSlowvotePollController.php +++ b/src/applications/slowvote/controller/PhabricatorSlowvotePollController.php @@ -261,7 +261,7 @@ final class PhabricatorSlowvotePollController $checked = null; } - $input = phutil_render_tag( + $input = phutil_tag( 'input', array( 'type' => 'radio', @@ -282,7 +282,7 @@ final class PhabricatorSlowvotePollController } } - $input = phutil_render_tag( + $input = phutil_tag( 'input', array( 'type' => 'checkbox', @@ -407,7 +407,7 @@ final class PhabricatorSlowvotePollController 'href' => $handle->getURI(), 'class' => 'phabricator-slowvote-facepile', ), - phutil_render_tag( + phutil_tag( 'img', array( 'src' => $profile_image, diff --git a/src/infrastructure/celerity/CelerityStaticResourceResponse.php b/src/infrastructure/celerity/CelerityStaticResourceResponse.php index ae15728a95..c1f54033fc 100644 --- a/src/infrastructure/celerity/CelerityStaticResourceResponse.php +++ b/src/infrastructure/celerity/CelerityStaticResourceResponse.php @@ -106,7 +106,7 @@ final class CelerityStaticResourceResponse { $uri = PhabricatorEnv::getCDNURI($resource['uri']); switch ($resource['type']) { case 'css': - return phutil_render_tag( + return phutil_tag( 'link', array( 'rel' => 'stylesheet', diff --git a/src/infrastructure/javelin/markup.php b/src/infrastructure/javelin/markup.php index 49569f2126..cff2e68d97 100644 --- a/src/infrastructure/javelin/markup.php +++ b/src/infrastructure/javelin/markup.php @@ -46,14 +46,14 @@ function phabricator_render_form(PhabricatorUser $user, $attributes, $content) { function phabricator_render_form_magic(PhabricatorUser $user) { return - phutil_render_tag( + phutil_tag( 'input', array( 'type' => 'hidden', 'name' => AphrontRequest::getCSRFTokenName(), 'value' => $user->getCSRFToken(), )). - phutil_render_tag( + phutil_tag( 'input', array( 'type' => 'hidden', diff --git a/src/infrastructure/markup/rule/PhabricatorRemarkupRuleEmbedFile.php b/src/infrastructure/markup/rule/PhabricatorRemarkupRuleEmbedFile.php index e5113f8240..72851c048d 100644 --- a/src/infrastructure/markup/rule/PhabricatorRemarkupRuleEmbedFile.php +++ b/src/infrastructure/markup/rule/PhabricatorRemarkupRuleEmbedFile.php @@ -108,7 +108,7 @@ final class PhabricatorRemarkupRuleEmbedFile } require_celerity_resource('lightbox-attachment-css'); - $img = phutil_render_tag('img', $data['attrs']); + $img = phutil_tag('img', $data['attrs']); $embed = javelin_render_tag( 'a', diff --git a/src/infrastructure/markup/rule/PhabricatorRemarkupRuleImageMacro.php b/src/infrastructure/markup/rule/PhabricatorRemarkupRuleImageMacro.php index 19ff4b6bf0..0216850355 100644 --- a/src/infrastructure/markup/rule/PhabricatorRemarkupRuleImageMacro.php +++ b/src/infrastructure/markup/rule/PhabricatorRemarkupRuleImageMacro.php @@ -35,13 +35,13 @@ final class PhabricatorRemarkupRuleImageMacro $src_uri = null; } - $img = phutil_render_tag( + $img = phutil_tag( 'img', array( 'src' => $src_uri, 'alt' => $matches[1], - 'title' => $matches[1]), - null); + 'title' => $matches[1], + )); return $this->getEngine()->storeText($img); } else { return $matches[1]; diff --git a/src/view/control/AphrontAttachedFileView.php b/src/view/control/AphrontAttachedFileView.php index 6953f85677..499162ba63 100644 --- a/src/view/control/AphrontAttachedFileView.php +++ b/src/view/control/AphrontAttachedFileView.php @@ -15,7 +15,7 @@ final class AphrontAttachedFileView extends AphrontView { $file = $this->file; $phid = $file->getPHID(); - $thumb = phutil_render_tag( + $thumb = phutil_tag( 'img', array( 'src' => $file->getThumb60x45URI(), diff --git a/src/view/control/AphrontTokenizerTemplateView.php b/src/view/control/AphrontTokenizerTemplateView.php index c3cc811967..0eda5ec879 100644 --- a/src/view/control/AphrontTokenizerTemplateView.php +++ b/src/view/control/AphrontTokenizerTemplateView.php @@ -75,7 +75,7 @@ final class AphrontTokenizerTemplateView extends AphrontView { 'class' => 'jx-tokenizer-token', ), phutil_escape_html($value). - phutil_render_tag( + phutil_tag( 'input', array( 'type' => 'hidden', diff --git a/src/view/form/AphrontFormInsetView.php b/src/view/form/AphrontFormInsetView.php index 2668bbe5a6..002b074eb5 100644 --- a/src/view/form/AphrontFormInsetView.php +++ b/src/view/form/AphrontFormInsetView.php @@ -57,7 +57,7 @@ final class AphrontFormInsetView extends AphrontView { $hidden_inputs = array(); foreach ($this->hidden as $inp) { list($key, $value) = $inp; - $hidden_inputs[] = phutil_render_tag( + $hidden_inputs[] = phutil_tag( 'input', array( 'type' => 'hidden', diff --git a/src/view/form/AphrontFormView.php b/src/view/form/AphrontFormView.php index a1e18a184b..1dca03e2cc 100644 --- a/src/view/form/AphrontFormView.php +++ b/src/view/form/AphrontFormView.php @@ -100,7 +100,7 @@ final class AphrontFormView extends AphrontView { if ($value === null) { continue; } - $inputs[] = phutil_render_tag( + $inputs[] = phutil_tag( 'input', array( 'type' => 'hidden', diff --git a/src/view/form/control/AphrontFormCheckboxControl.php b/src/view/form/control/AphrontFormCheckboxControl.php index 543911d909..d2d05e77a3 100644 --- a/src/view/form/control/AphrontFormCheckboxControl.php +++ b/src/view/form/control/AphrontFormCheckboxControl.php @@ -22,7 +22,7 @@ final class AphrontFormCheckboxControl extends AphrontFormControl { $rows = array(); foreach ($this->boxes as $box) { $id = celerity_generate_unique_node_id(); - $checkbox = phutil_render_tag( + $checkbox = phutil_tag( 'input', array( 'id' => $id, diff --git a/src/view/form/control/AphrontFormFileControl.php b/src/view/form/control/AphrontFormFileControl.php index 8e0b75f477..9f7e7ab346 100644 --- a/src/view/form/control/AphrontFormFileControl.php +++ b/src/view/form/control/AphrontFormFileControl.php @@ -7,7 +7,7 @@ final class AphrontFormFileControl extends AphrontFormControl { } protected function renderInput() { - return phutil_render_tag( + return phutil_tag( 'input', array( 'type' => 'file', diff --git a/src/view/form/control/AphrontFormImageControl.php b/src/view/form/control/AphrontFormImageControl.php index d0acadb19a..c806ea38fc 100644 --- a/src/view/form/control/AphrontFormImageControl.php +++ b/src/view/form/control/AphrontFormImageControl.php @@ -10,7 +10,7 @@ final class AphrontFormImageControl extends AphrontFormControl { $id = celerity_generate_unique_node_id(); return - phutil_render_tag( + phutil_tag( 'input', array( 'type' => 'file', @@ -18,7 +18,7 @@ final class AphrontFormImageControl extends AphrontFormControl { 'class' => 'image', )). '
'. - phutil_render_tag( + phutil_tag( 'input', array( 'type' => 'checkbox', diff --git a/src/view/form/control/AphrontFormPasswordControl.php b/src/view/form/control/AphrontFormPasswordControl.php index 4cc0dd72d4..b2a3f1ef50 100644 --- a/src/view/form/control/AphrontFormPasswordControl.php +++ b/src/view/form/control/AphrontFormPasswordControl.php @@ -7,7 +7,7 @@ final class AphrontFormPasswordControl extends AphrontFormControl { } protected function renderInput() { - return phutil_render_tag( + return phutil_tag( 'input', array( 'type' => 'password', diff --git a/src/view/form/control/AphrontFormRadioButtonControl.php b/src/view/form/control/AphrontFormRadioButtonControl.php index 14373e0367..e15dd03c8d 100644 --- a/src/view/form/control/AphrontFormRadioButtonControl.php +++ b/src/view/form/control/AphrontFormRadioButtonControl.php @@ -22,7 +22,7 @@ final class AphrontFormRadioButtonControl extends AphrontFormControl { $rows = array(); foreach ($this->buttons as $button) { $id = celerity_generate_unique_node_id(); - $radio = phutil_render_tag( + $radio = phutil_tag( 'input', array( 'id' => $id, diff --git a/src/view/layout/PhabricatorPinboardItemView.php b/src/view/layout/PhabricatorPinboardItemView.php index a035325d63..7f97928c31 100644 --- a/src/view/layout/PhabricatorPinboardItemView.php +++ b/src/view/layout/PhabricatorPinboardItemView.php @@ -48,7 +48,7 @@ final class PhabricatorPinboardItemView extends AphrontView { 'href' => $this->uri, 'class' => 'phabricator-pinboard-item-image-link', ), - phutil_render_tag( + phutil_tag( 'img', array( 'src' => $this->imageURI, diff --git a/src/view/page/PhabricatorBarePageView.php b/src/view/page/PhabricatorBarePageView.php index 9755ab4375..ca3d039738 100644 --- a/src/view/page/PhabricatorBarePageView.php +++ b/src/view/page/PhabricatorBarePageView.php @@ -66,7 +66,7 @@ class PhabricatorBarePageView extends AphrontPageView { $viewport_tag = null; if ($this->getDeviceReady()) { - $viewport_tag = phutil_render_tag( + $viewport_tag = phutil_tag( 'meta', array( 'name' => 'viewport', diff --git a/src/view/page/menu/PhabricatorMainMenuSearchView.php b/src/view/page/menu/PhabricatorMainMenuSearchView.php index e3108e9805..c444ca9078 100644 --- a/src/view/page/menu/PhabricatorMainMenuSearchView.php +++ b/src/view/page/menu/PhabricatorMainMenuSearchView.php @@ -23,7 +23,7 @@ final class PhabricatorMainMenuSearchView extends AphrontView { $target_id = celerity_generate_unique_node_id(); $search_id = $this->getID(); - $input = phutil_render_tag( + $input = phutil_tag( 'input', array( 'type' => 'text', @@ -52,7 +52,7 @@ final class PhabricatorMainMenuSearchView extends AphrontView { 'placeholder' => PhabricatorSearchScope::getScopePlaceholder($scope), )); - $scope_input = phutil_render_tag( + $scope_input = phutil_tag( 'input', array( 'type' => 'hidden',