Update to use PHUIRemarkupView everywhere possible

chadlittle · chadlittle · commit f35509e30ee7 · 2016-02-16T14:05:53.000-08:00
Summary: Moves all the one off object calls to PHUIRemarkupView, adds a "Document" call as well (future plans). Test Plan: Visited most pages I could get access to, but may want extra careful eyes on this diff. Reviewers: epriestley Reviewed By: epriestley Subscribers: Korvin Differential Revision: https://secure.phabricator.com/D15281
diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php b/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
@@ -363,11 +363,7 @@ private function buildPropertyView(PhabricatorCalendarEvent $event) {
         ->getIconLabel($event->getIcon()));
 
     if (strlen($event->getDescription())) {
-      $description = PhabricatorMarkupEngine::renderOneObject(
-        id(new PhabricatorMarkupOneOff())->setContent($event->getDescription()),
-        'default',
-        $viewer);
-
+      $description = new PHUIRemarkupView($viewer, $event->getDescription());
       $properties->addSectionHeader(
         pht('Description'),
         PHUIPropertyListView::ICON_SUMMARY);
diff --git a/src/applications/config/controller/PhabricatorConfigWelcomeController.php b/src/applications/config/controller/PhabricatorConfigWelcomeController.php
@@ -341,23 +341,14 @@ public function buildWelcomeScreen(AphrontRequest $request) {
     $header = id(new PHUIHeaderView())
       ->setHeader(pht('Welcome to Phabricator'));
 
-    $setup_header = PhabricatorMarkupEngine::renderOneObject(
-      id(new PhabricatorMarkupOneOff())
-        ->setContent(pht('=Setup and Configuration')),
-      'default',
-      $viewer);
-
-    $explore_header = PhabricatorMarkupEngine::renderOneObject(
-      id(new PhabricatorMarkupOneOff())
-        ->setContent(pht('=Explore Phabricator')),
-      'default',
-      $viewer);
-
-    $quick_header = PhabricatorMarkupEngine::renderOneObject(
-      id(new PhabricatorMarkupOneOff())
-        ->setContent(pht('=Quick Start Guides')),
-      'default',
-      $viewer);
+    $setup_header = new PHUIRemarkupView(
+      $viewer, pht('=Setup and Configuration'));
+
+    $explore_header = new PHUIRemarkupView(
+      $viewer, pht('=Explore Phabricator'));
+
+    $quick_header = new PHUIRemarkupView(
+      $viewer, pht('=Quick Start Guide'));
 
     return id(new PHUIDocumentView())
       ->setHeader($header)
@@ -376,10 +367,7 @@ private function newItem(AphrontRequest $request, $icon, $content) {
     $icon = id(new PHUIIconView())
       ->setIcon($icon.' fa-2x');
 
-    $content = PhabricatorMarkupEngine::renderOneObject(
-      id(new PhabricatorMarkupOneOff())->setContent($content),
-      'default',
-      $viewer);
+    $content = new PHUIRemarkupView($viewer, $content);
 
     $icon = phutil_tag(
       'div',
diff --git a/src/applications/countdown/controller/PhabricatorCountdownViewController.php b/src/applications/countdown/controller/PhabricatorCountdownViewController.php
@@ -132,11 +132,7 @@ private function buildPropertyListView(
 
     $description = $countdown->getDescription();
     if (strlen($description)) {
-      $description = PhabricatorMarkupEngine::renderOneObject(
-        id(new PhabricatorMarkupOneOff())->setContent($description),
-        'default',
-        $viewer);
-
+      $description = new PHUIRemarkupView($viewer, $description);
       $view->addSectionHeader(
         pht('Description'),
         PHUIPropertyListView::ICON_SUMMARY);
diff --git a/src/applications/differential/customfield/DifferentialRevertPlanField.php b/src/applications/differential/customfield/DifferentialRevertPlanField.php
@@ -44,12 +44,7 @@ public function renderPropertyViewValue(array $handles) {
       return null;
     }
 
-    return PhabricatorMarkupEngine::renderOneObject(
-      id(new PhabricatorMarkupOneOff())
-        ->setPreserveLinebreaks(true)
-        ->setContent($this->getValue()),
-      'default',
-      $this->getViewer());
+    return new PHUIRemarkupView($this->getViewer(), $this->getValue());
   }
 
   public function shouldAppearInGlobalSearch() {
diff --git a/src/applications/differential/customfield/DifferentialSummaryField.php b/src/applications/differential/customfield/DifferentialSummaryField.php
@@ -122,12 +122,7 @@ public function renderPropertyViewValue(array $handles) {
       return null;
     }
 
-    return PhabricatorMarkupEngine::renderOneObject(
-      id(new PhabricatorMarkupOneOff())
-        ->setPreserveLinebreaks(true)
-        ->setContent($this->getValue()),
-      'default',
-      $this->getViewer());
+    return new PHUIRemarkupView($this->getViewer(), $this->getValue());
   }
 
   public function getApplicationTransactionRemarkupBlocks(
diff --git a/src/applications/differential/customfield/DifferentialTestPlanField.php b/src/applications/differential/customfield/DifferentialTestPlanField.php
@@ -136,12 +136,7 @@ public function renderPropertyViewValue(array $handles) {
       return null;
     }
 
-    return PhabricatorMarkupEngine::renderOneObject(
-      id(new PhabricatorMarkupOneOff())
-        ->setPreserveLinebreaks(true)
-        ->setContent($this->getValue()),
-      'default',
-      $this->getViewer());
+    return new PHUIRemarkupView($this->getViewer(), $this->getValue());
   }
 
   public function getApplicationTransactionRemarkupBlocks(
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryController.php b/src/applications/diffusion/controller/DiffusionRepositoryController.php
@@ -290,10 +290,7 @@ private function buildPropertiesTable(PhabricatorRepository $repository) {
 
     $description = $repository->getDetail('description');
     if (strlen($description)) {
-      $description = PhabricatorMarkupEngine::renderOneObject(
-        $repository,
-        'description',
-        $user);
+      $description = new PHUIRemarkupView($user, $description);
       $view->addSectionHeader(
         pht('Description'), PHUIPropertyListView::ICON_SUMMARY);
       $view->addTextContent($description);
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php
@@ -309,10 +309,7 @@ private function buildBasicProperties(
     if (!strlen($description)) {
       $description = phutil_tag('em', array(), pht('No description provided.'));
     } else {
-      $description = PhabricatorMarkupEngine::renderOneObject(
-        $repository,
-        'description',
-        $viewer);
+      $description = new PHUIRemarkupView($viewer, $description);
     }
     $view->addTextContent($description);
 
diff --git a/src/applications/diviner/controller/DivinerBookController.php b/src/applications/diviner/controller/DivinerBookController.php
@@ -94,11 +94,7 @@ public function handleRequest(AphrontRequest $request) {
     $preface = $book->getPreface();
     $preface_view = null;
     if (strlen($preface)) {
-      $preface_view =
-        PhabricatorMarkupEngine::renderOneObject(
-          id(new PhabricatorMarkupOneOff())->setContent($preface),
-          'default',
-          $viewer);
+      $preface_view = new PHUIRemarkupView($viewer, $preface);
     }
 
     $document->appendChild($preface_view);
diff --git a/src/applications/diviner/controller/DivinerMainController.php b/src/applications/diviner/controller/DivinerMainController.php
@@ -61,11 +61,7 @@ public function handleRequest(AphrontRequest $request) {
         "  %s\n\n",
         'phabricator/ $ ./bin/diviner generate');
 
-      $text = PhabricatorMarkupEngine::renderOneObject(
-        id(new PhabricatorMarkupOneOff())->setContent($text),
-        'default',
-        $viewer);
-
+      $text = new PHUIRemarkupView($viewer, $text);
       $document->appendChild($text);
     }
 
diff --git a/src/applications/doorkeeper/option/PhabricatorAsanaConfigOptions.php b/src/applications/doorkeeper/option/PhabricatorAsanaConfigOptions.php
@@ -111,10 +111,7 @@ public function renderContextualDescription(
       "The Asana Workspaces your linked account has access to are:\n\n%s",
       $out);
 
-    return PhabricatorMarkupEngine::renderOneObject(
-      id(new PhabricatorMarkupOneOff())->setContent($out),
-      'default',
-      $viewer);
+    return new PHUIRemarkupView($viewer, $out);
   }
 
   private function renderContextualProjectDescription(
@@ -155,10 +152,7 @@ private function renderContextualProjectDescription(
 
     $out = implode("\n", $out);
 
-    return PhabricatorMarkupEngine::renderOneObject(
-      id(new PhabricatorMarkupOneOff())->setContent($out),
-      'default',
-      $viewer);
+    return new PHUIRemarkupView($viewer, $out);
   }
 
 }
diff --git a/src/applications/fund/controller/FundInitiativeViewController.php b/src/applications/fund/controller/FundInitiativeViewController.php
@@ -98,23 +98,15 @@ private function buildPropertyListView(FundInitiative $initiative) {
 
     $description = $initiative->getDescription();
     if (strlen($description)) {
-      $description = PhabricatorMarkupEngine::renderOneObject(
-        id(new PhabricatorMarkupOneOff())->setContent($description),
-        'default',
-        $viewer);
-
+      $description = new PHUIRemarkupView($viewer, $description);
       $view->addSectionHeader(
         pht('Description'), PHUIPropertyListView::ICON_SUMMARY);
       $view->addTextContent($description);
     }
 
     $risks = $initiative->getRisks();
     if (strlen($risks)) {
-      $risks = PhabricatorMarkupEngine::renderOneObject(
-        id(new PhabricatorMarkupOneOff())->setContent($risks),
-        'default',
-        $viewer);
-
+      $risks = new PHUIRemarkupView($viewer, $risks);
       $view->addSectionHeader(
         pht('Risks/Challenges'), 'fa-ambulance');
       $view->addTextContent($risks);
diff --git a/src/applications/harbormaster/controller/HarbormasterBuildViewController.php b/src/applications/harbormaster/controller/HarbormasterBuildViewController.php
@@ -181,16 +181,10 @@ public function handleRequest(AphrontRequest $request) {
       if ($step) {
         $description = $step->getDescription();
         if ($description) {
-          $rendered = PhabricatorMarkupEngine::renderOneObject(
-            id(new PhabricatorMarkupOneOff())
-              ->setContent($description)
-              ->setPreserveLinebreaks(true),
-            'default',
-            $viewer);
-
+          $description = new PHUIRemarkupView($viewer, $description);
           $properties->addSectionHeader(
             pht('Description'), PHUIPropertyListView::ICON_SUMMARY);
-          $properties->addTextContent($rendered);
+          $properties->addTextContent($description);
         }
       } else {
         $target_box->setFormErrors(
diff --git a/src/applications/legalpad/controller/LegalpadDocumentSignController.php b/src/applications/legalpad/controller/LegalpadDocumentSignController.php
@@ -258,11 +258,7 @@ public function handleRequest(AphrontRequest $request) {
 
     $preamble_box = null;
     if (strlen($document->getPreamble())) {
-      $preamble_text = PhabricatorMarkupEngine::renderOneObject(
-        id(new PhabricatorMarkupOneOff())->setContent(
-          $document->getPreamble()),
-        'default',
-        $viewer);
+      $preamble_text = new PHUIRemarkupView($viewer, $document->getPreamble());
 
       // NOTE: We're avoiding `setObject()` here so we don't pick up extra UI
       // elements like "Subscribers". This information is available on the
diff --git a/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php b/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php
@@ -104,14 +104,11 @@ private function buildPropertyView(
     }
 
     $overview = $application->getOverview();
-    if ($overview) {
+    if (strlen($overview)) {
+      $overview = new PHUIRemarkupView($viewer, $overview);
       $properties->addSectionHeader(
         pht('Overview'), PHUIPropertyListView::ICON_SUMMARY);
-      $properties->addTextContent(
-        PhabricatorMarkupEngine::renderOneObject(
-          id(new PhabricatorMarkupOneOff())->setContent($overview),
-          'default',
-          $viewer));
+      $properties->addTextContent($overview);
     }
 
     $descriptions = PhabricatorPolicyQuery::renderPolicyDescriptions(
diff --git a/src/applications/meta/controller/PhabricatorApplicationEmailCommandsController.php b/src/applications/meta/controller/PhabricatorApplicationEmailCommandsController.php
@@ -117,10 +117,7 @@ public function handleRequest(AphrontRequest $request) {
     $crumbs->addTextCrumb($title);
     $crumbs->setBorder(true);
 
-    $content_box = PhabricatorMarkupEngine::renderOneObject(
-      id(new PhabricatorMarkupOneOff())->setContent($content),
-      'default',
-      $viewer);
+    $content_box = new PHUIRemarkupView($viewer, $content);
 
     $info_view = null;
     if (!PhabricatorEnv::getEnvConfig('metamta.reply-handler-domain')) {
diff --git a/src/applications/nuance/source/NuancePhabricatorFormSourceDefinition.php b/src/applications/nuance/source/NuancePhabricatorFormSourceDefinition.php
@@ -120,11 +120,7 @@ private function renderItemCommonProperties(
     PHUIPropertyListView $view) {
 
     $complaint = $item->getNuanceProperty('complaint');
-    $complaint = PhabricatorMarkupEngine::renderOneObject(
-      id(new PhabricatorMarkupOneOff())->setContent($complaint),
-      'default',
-      $viewer);
-
+    $complaint = new PHUIRemarkupView($viewer, $complaint);
     $view->addSectionHeader(
       pht('Complaint'), 'fa-exclamation-circle');
     $view->addTextContent($complaint);
diff --git a/src/applications/owners/controller/PhabricatorOwnersDetailController.php b/src/applications/owners/controller/PhabricatorOwnersDetailController.php
@@ -189,13 +189,10 @@ private function buildPackagePropertyView(
 
     $description = $package->getDescription();
     if (strlen($description)) {
+      $description = new PHUIRemarkupView($viewer, $description);
       $view->addSectionHeader(
         pht('Description'), PHUIPropertyListView::ICON_SUMMARY);
-      $view->addTextContent(
-        $output = PhabricatorMarkupEngine::renderOneObject(
-          id(new PhabricatorMarkupOneOff())->setContent($description),
-          'default',
-          $viewer));
+      $view->addTextContent($description);
     }
 
     $view->invokeWillRenderEvent();
diff --git a/src/applications/phame/controller/blog/PhameBlogManageController.php b/src/applications/phame/controller/blog/PhameBlogManageController.php
@@ -118,10 +118,7 @@ private function renderProperties(
     $properties->invokeWillRenderEvent();
 
     if (strlen($blog->getDescription())) {
-      $description = PhabricatorMarkupEngine::renderOneObject(
-        id(new PhabricatorMarkupOneOff())->setContent($blog->getDescription()),
-        'default',
-        $viewer);
+      $description = new PHUIRemarkupView($viewer, $description);
       $properties->addSectionHeader(
         pht('Description'),
         PHUIPropertyListView::ICON_SUMMARY);
diff --git a/src/applications/pholio/controller/PholioInlineController.php b/src/applications/pholio/controller/PholioInlineController.php
@@ -86,16 +86,13 @@ public function handleRequest(AphrontRequest $request) {
         ),
         $author_handle->renderLink());
 
+      $inline_content = new PHUIRemarkupView($viewer, $inline->getContent());
       $comment_body = phutil_tag(
         'div',
         array(
           'class' => 'pholio-inline-comment-body',
         ),
-        PhabricatorMarkupEngine::renderOneObject(
-            id(new PhabricatorMarkupOneOff())
-              ->setContent($inline->getContent()),
-            'default',
-            $viewer));
+        $inline_content);
 
       return $this->newDialog()
         ->setTitle(pht('Inline Comment'))
diff --git a/src/applications/phortune/controller/PhortuneCartController.php b/src/applications/phortune/controller/PhortuneCartController.php
@@ -48,12 +48,7 @@ protected function renderCartDescription(PhortuneCart $cart) {
       return null;
     }
 
-    $output = PhabricatorMarkupEngine::renderOneObject(
-      id(new PhabricatorMarkupOneOff())
-        ->setPreserveLinebreaks(true)
-        ->setContent($description),
-      'default',
-      $this->getViewer());
+    $output = new PHUIRemarkupView($this->getUser(), $description);
 
     $box = id(new PHUIBoxView())
       ->addMargin(PHUI::MARGIN_LARGE)
diff --git a/src/applications/phortune/controller/PhortuneMerchantViewController.php b/src/applications/phortune/controller/PhortuneMerchantViewController.php
@@ -136,11 +136,7 @@ private function buildPropertyListView(
 
     $description = $merchant->getDescription();
     if (strlen($description)) {
-      $description = PhabricatorMarkupEngine::renderOneObject(
-        id(new PhabricatorMarkupOneOff())->setContent($description),
-        'default',
-        $viewer);
-
+      $description = new PHUIRemarkupView($viewer, $description);
       $view->addSectionHeader(
         pht('Description'), PHUIPropertyListView::ICON_SUMMARY);
       $view->addTextContent($description);
diff --git a/src/applications/phurl/controller/PhabricatorPhurlURLViewController.php b/src/applications/phurl/controller/PhabricatorPhurlURLViewController.php
@@ -134,16 +134,12 @@ private function buildPropertyView(PhabricatorPhurlURL $url) {
 
     $properties->invokeWillRenderEvent();
 
-    if (strlen($url->getDescription())) {
-      $description = PhabricatorMarkupEngine::renderOneObject(
-        id(new PhabricatorMarkupOneOff())->setContent($url->getDescription()),
-        'default',
-        $viewer);
-
+    $description = $url->getDescription();
+    if (strlen($description)) {
+      $description = new PHUIRemarkupView($viewer, $description);
       $properties->addSectionHeader(
         pht('Description'),
         PHUIPropertyListView::ICON_SUMMARY);
-
       $properties->addTextContent($description);
     }
 
diff --git a/src/applications/slowvote/controller/PhabricatorSlowvotePollController.php b/src/applications/slowvote/controller/PhabricatorSlowvotePollController.php
diff --git a/src/applications/slowvote/view/SlowvoteEmbedView.php b/src/applications/slowvote/view/SlowvoteEmbedView.php
diff --git a/src/applications/spaces/controller/PhabricatorSpacesViewController.php b/src/applications/spaces/controller/PhabricatorSpacesViewController.php
diff --git a/src/applications/transactions/controller/PhabricatorApplicationTransactionCommentRawController.php b/src/applications/transactions/controller/PhabricatorApplicationTransactionCommentRawController.php
diff --git a/src/applications/typeahead/controller/PhabricatorTypeaheadFunctionHelpController.php b/src/applications/typeahead/controller/PhabricatorTypeaheadFunctionHelpController.php
diff --git a/src/applications/uiexample/examples/PhabricatorRemarkupUIExample.php b/src/applications/uiexample/examples/PhabricatorRemarkupUIExample.php
diff --git a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldRemarkup.php b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldRemarkup.php
diff --git a/src/infrastructure/markup/view/PHUIRemarkupView.php b/src/infrastructure/markup/view/PHUIRemarkupView.php
diff --git a/src/view/form/AphrontFormView.php b/src/view/form/AphrontFormView.php
diff --git a/src/view/form/PHUIFormLayoutView.php b/src/view/form/PHUIFormLayoutView.php
diff --git a/src/view/form/PHUIFormPageView.php b/src/view/form/PHUIFormPageView.php

Original file line number	Diff line number	Diff line change
`@@ -44,12 +44,7 @@ public function renderPropertyViewValue(array $handles) {`
`44`	`44`	`return null;`
`45`	`45`	`}`
`46`	`46`
`47`		`- return PhabricatorMarkupEngine::renderOneObject(`
`48`		`- id(new PhabricatorMarkupOneOff())`
`49`		`- ->setPreserveLinebreaks(true)`
`50`		`- ->setContent($this->getValue()),`
`51`		`- 'default',`
`52`		`- $this->getViewer());`
	`47`	`+ return new PHUIRemarkupView($this->getViewer(), $this->getValue());`
`53`	`48`	`}`
`54`	`49`
`55`	`50`	`public function shouldAppearInGlobalSearch() {`
Original file line number	Diff line number	Diff line change
`@@ -122,12 +122,7 @@ public function renderPropertyViewValue(array $handles) {`
`122`	`122`	`return null;`
`123`	`123`	`}`
`124`	`124`
`125`		`- return PhabricatorMarkupEngine::renderOneObject(`
`126`		`- id(new PhabricatorMarkupOneOff())`
`127`		`- ->setPreserveLinebreaks(true)`
`128`		`- ->setContent($this->getValue()),`
`129`		`- 'default',`
`130`		`- $this->getViewer());`
	`125`	`+ return new PHUIRemarkupView($this->getViewer(), $this->getValue());`
`131`	`126`	`}`
`132`	`127`
`133`	`128`	`public function getApplicationTransactionRemarkupBlocks(`
Original file line number	Diff line number	Diff line change
`@@ -136,12 +136,7 @@ public function renderPropertyViewValue(array $handles) {`
`136`	`136`	`return null;`
`137`	`137`	`}`
`138`	`138`
`139`		`- return PhabricatorMarkupEngine::renderOneObject(`
`140`		`- id(new PhabricatorMarkupOneOff())`
`141`		`- ->setPreserveLinebreaks(true)`
`142`		`- ->setContent($this->getValue()),`
`143`		`- 'default',`
`144`		`- $this->getViewer());`
	`139`	`+ return new PHUIRemarkupView($this->getViewer(), $this->getValue());`
`145`	`140`	`}`
`146`	`141`
`147`	`142`	`public function getApplicationTransactionRemarkupBlocks(`