Skip to content

Commit f35509e

Browse files
chadlittlechadlittle
committed
Update to use PHUIRemarkupView everywhere possible
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
1 parent 376c85a commit f35509e

File tree

34 files changed

+83
-199
lines changed

34 files changed

+83
-199
lines changed

‎src/applications/calendar/controller/PhabricatorCalendarEventViewController.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -363,11 +363,7 @@ private function buildPropertyView(PhabricatorCalendarEvent $event) {
363363
->getIconLabel($event->getIcon()));
364364

365365
if (strlen($event->getDescription())) {
366-
$description = PhabricatorMarkupEngine::renderOneObject(
367-
id(new PhabricatorMarkupOneOff())->setContent($event->getDescription()),
368-
'default',
369-
$viewer);
370-
366+
$description = new PHUIRemarkupView($viewer, $event->getDescription());
371367
$properties->addSectionHeader(
372368
pht('Description'),
373369
PHUIPropertyListView::ICON_SUMMARY);

‎src/applications/config/controller/PhabricatorConfigWelcomeController.php

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -341,23 +341,14 @@ public function buildWelcomeScreen(AphrontRequest $request) {
341341
$header = id(new PHUIHeaderView())
342342
->setHeader(pht('Welcome to Phabricator'));
343343

344-
$setup_header = PhabricatorMarkupEngine::renderOneObject(
345-
id(new PhabricatorMarkupOneOff())
346-
->setContent(pht('=Setup and Configuration')),
347-
'default',
348-
$viewer);
349-
350-
$explore_header = PhabricatorMarkupEngine::renderOneObject(
351-
id(new PhabricatorMarkupOneOff())
352-
->setContent(pht('=Explore Phabricator')),
353-
'default',
354-
$viewer);
355-
356-
$quick_header = PhabricatorMarkupEngine::renderOneObject(
357-
id(new PhabricatorMarkupOneOff())
358-
->setContent(pht('=Quick Start Guides')),
359-
'default',
360-
$viewer);
344+
$setup_header = new PHUIRemarkupView(
345+
$viewer, pht('=Setup and Configuration'));
346+
347+
$explore_header = new PHUIRemarkupView(
348+
$viewer, pht('=Explore Phabricator'));
349+
350+
$quick_header = new PHUIRemarkupView(
351+
$viewer, pht('=Quick Start Guide'));
361352

362353
return id(new PHUIDocumentView())
363354
->setHeader($header)
@@ -376,10 +367,7 @@ private function newItem(AphrontRequest $request, $icon, $content) {
376367
$icon = id(new PHUIIconView())
377368
->setIcon($icon.' fa-2x');
378369

379-
$content = PhabricatorMarkupEngine::renderOneObject(
380-
id(new PhabricatorMarkupOneOff())->setContent($content),
381-
'default',
382-
$viewer);
370+
$content = new PHUIRemarkupView($viewer, $content);
383371

384372
$icon = phutil_tag(
385373
'div',

‎src/applications/countdown/controller/PhabricatorCountdownViewController.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,7 @@ private function buildPropertyListView(
132132

133133
$description = $countdown->getDescription();
134134
if (strlen($description)) {
135-
$description = PhabricatorMarkupEngine::renderOneObject(
136-
id(new PhabricatorMarkupOneOff())->setContent($description),
137-
'default',
138-
$viewer);
139-
135+
$description = new PHUIRemarkupView($viewer, $description);
140136
$view->addSectionHeader(
141137
pht('Description'),
142138
PHUIPropertyListView::ICON_SUMMARY);

‎src/applications/differential/customfield/DifferentialRevertPlanField.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,7 @@ public function renderPropertyViewValue(array $handles) {
4444
return null;
4545
}
4646

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());
5348
}
5449

5550
public function shouldAppearInGlobalSearch() {

‎src/applications/differential/customfield/DifferentialSummaryField.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,7 @@ public function renderPropertyViewValue(array $handles) {
122122
return null;
123123
}
124124

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());
131126
}
132127

133128
public function getApplicationTransactionRemarkupBlocks(

‎src/applications/differential/customfield/DifferentialTestPlanField.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -136,12 +136,7 @@ public function renderPropertyViewValue(array $handles) {
136136
return null;
137137
}
138138

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());
145140
}
146141

147142
public function getApplicationTransactionRemarkupBlocks(

‎src/applications/diffusion/controller/DiffusionRepositoryController.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -290,10 +290,7 @@ private function buildPropertiesTable(PhabricatorRepository $repository) {
290290

291291
$description = $repository->getDetail('description');
292292
if (strlen($description)) {
293-
$description = PhabricatorMarkupEngine::renderOneObject(
294-
$repository,
295-
'description',
296-
$user);
293+
$description = new PHUIRemarkupView($user, $description);
297294
$view->addSectionHeader(
298295
pht('Description'), PHUIPropertyListView::ICON_SUMMARY);
299296
$view->addTextContent($description);

‎src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -309,10 +309,7 @@ private function buildBasicProperties(
309309
if (!strlen($description)) {
310310
$description = phutil_tag('em', array(), pht('No description provided.'));
311311
} else {
312-
$description = PhabricatorMarkupEngine::renderOneObject(
313-
$repository,
314-
'description',
315-
$viewer);
312+
$description = new PHUIRemarkupView($viewer, $description);
316313
}
317314
$view->addTextContent($description);
318315

‎src/applications/diviner/controller/DivinerBookController.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,7 @@ public function handleRequest(AphrontRequest $request) {
9494
$preface = $book->getPreface();
9595
$preface_view = null;
9696
if (strlen($preface)) {
97-
$preface_view =
98-
PhabricatorMarkupEngine::renderOneObject(
99-
id(new PhabricatorMarkupOneOff())->setContent($preface),
100-
'default',
101-
$viewer);
97+
$preface_view = new PHUIRemarkupView($viewer, $preface);
10298
}
10399

104100
$document->appendChild($preface_view);

‎src/applications/diviner/controller/DivinerMainController.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,7 @@ public function handleRequest(AphrontRequest $request) {
6161
" %s\n\n",
6262
'phabricator/ $ ./bin/diviner generate');
6363

64-
$text = PhabricatorMarkupEngine::renderOneObject(
65-
id(new PhabricatorMarkupOneOff())->setContent($text),
66-
'default',
67-
$viewer);
68-
64+
$text = new PHUIRemarkupView($viewer, $text);
6965
$document->appendChild($text);
7066
}
7167

‎src/applications/doorkeeper/option/PhabricatorAsanaConfigOptions.php

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,7 @@ public function renderContextualDescription(
111111
"The Asana Workspaces your linked account has access to are:\n\n%s",
112112
$out);
113113

114-
return PhabricatorMarkupEngine::renderOneObject(
115-
id(new PhabricatorMarkupOneOff())->setContent($out),
116-
'default',
117-
$viewer);
114+
return new PHUIRemarkupView($viewer, $out);
118115
}
119116

120117
private function renderContextualProjectDescription(
@@ -155,10 +152,7 @@ private function renderContextualProjectDescription(
155152

156153
$out = implode("\n", $out);
157154

158-
return PhabricatorMarkupEngine::renderOneObject(
159-
id(new PhabricatorMarkupOneOff())->setContent($out),
160-
'default',
161-
$viewer);
155+
return new PHUIRemarkupView($viewer, $out);
162156
}
163157

164158
}

‎src/applications/fund/controller/FundInitiativeViewController.php

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -98,23 +98,15 @@ private function buildPropertyListView(FundInitiative $initiative) {
9898

9999
$description = $initiative->getDescription();
100100
if (strlen($description)) {
101-
$description = PhabricatorMarkupEngine::renderOneObject(
102-
id(new PhabricatorMarkupOneOff())->setContent($description),
103-
'default',
104-
$viewer);
105-
101+
$description = new PHUIRemarkupView($viewer, $description);
106102
$view->addSectionHeader(
107103
pht('Description'), PHUIPropertyListView::ICON_SUMMARY);
108104
$view->addTextContent($description);
109105
}
110106

111107
$risks = $initiative->getRisks();
112108
if (strlen($risks)) {
113-
$risks = PhabricatorMarkupEngine::renderOneObject(
114-
id(new PhabricatorMarkupOneOff())->setContent($risks),
115-
'default',
116-
$viewer);
117-
109+
$risks = new PHUIRemarkupView($viewer, $risks);
118110
$view->addSectionHeader(
119111
pht('Risks/Challenges'), 'fa-ambulance');
120112
$view->addTextContent($risks);

‎src/applications/harbormaster/controller/HarbormasterBuildViewController.php

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -181,16 +181,10 @@ public function handleRequest(AphrontRequest $request) {
181181
if ($step) {
182182
$description = $step->getDescription();
183183
if ($description) {
184-
$rendered = PhabricatorMarkupEngine::renderOneObject(
185-
id(new PhabricatorMarkupOneOff())
186-
->setContent($description)
187-
->setPreserveLinebreaks(true),
188-
'default',
189-
$viewer);
190-
184+
$description = new PHUIRemarkupView($viewer, $description);
191185
$properties->addSectionHeader(
192186
pht('Description'), PHUIPropertyListView::ICON_SUMMARY);
193-
$properties->addTextContent($rendered);
187+
$properties->addTextContent($description);
194188
}
195189
} else {
196190
$target_box->setFormErrors(

‎src/applications/legalpad/controller/LegalpadDocumentSignController.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -258,11 +258,7 @@ public function handleRequest(AphrontRequest $request) {
258258

259259
$preamble_box = null;
260260
if (strlen($document->getPreamble())) {
261-
$preamble_text = PhabricatorMarkupEngine::renderOneObject(
262-
id(new PhabricatorMarkupOneOff())->setContent(
263-
$document->getPreamble()),
264-
'default',
265-
$viewer);
261+
$preamble_text = new PHUIRemarkupView($viewer, $document->getPreamble());
266262

267263
// NOTE: We're avoiding `setObject()` here so we don't pick up extra UI
268264
// elements like "Subscribers". This information is available on the

‎src/applications/meta/controller/PhabricatorApplicationDetailViewController.php

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,11 @@ private function buildPropertyView(
104104
}
105105

106106
$overview = $application->getOverview();
107-
if ($overview) {
107+
if (strlen($overview)) {
108+
$overview = new PHUIRemarkupView($viewer, $overview);
108109
$properties->addSectionHeader(
109110
pht('Overview'), PHUIPropertyListView::ICON_SUMMARY);
110-
$properties->addTextContent(
111-
PhabricatorMarkupEngine::renderOneObject(
112-
id(new PhabricatorMarkupOneOff())->setContent($overview),
113-
'default',
114-
$viewer));
111+
$properties->addTextContent($overview);
115112
}
116113

117114
$descriptions = PhabricatorPolicyQuery::renderPolicyDescriptions(

‎src/applications/meta/controller/PhabricatorApplicationEmailCommandsController.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,7 @@ public function handleRequest(AphrontRequest $request) {
117117
$crumbs->addTextCrumb($title);
118118
$crumbs->setBorder(true);
119119

120-
$content_box = PhabricatorMarkupEngine::renderOneObject(
121-
id(new PhabricatorMarkupOneOff())->setContent($content),
122-
'default',
123-
$viewer);
120+
$content_box = new PHUIRemarkupView($viewer, $content);
124121

125122
$info_view = null;
126123
if (!PhabricatorEnv::getEnvConfig('metamta.reply-handler-domain')) {

‎src/applications/nuance/source/NuancePhabricatorFormSourceDefinition.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,7 @@ private function renderItemCommonProperties(
120120
PHUIPropertyListView $view) {
121121

122122
$complaint = $item->getNuanceProperty('complaint');
123-
$complaint = PhabricatorMarkupEngine::renderOneObject(
124-
id(new PhabricatorMarkupOneOff())->setContent($complaint),
125-
'default',
126-
$viewer);
127-
123+
$complaint = new PHUIRemarkupView($viewer, $complaint);
128124
$view->addSectionHeader(
129125
pht('Complaint'), 'fa-exclamation-circle');
130126
$view->addTextContent($complaint);

‎src/applications/owners/controller/PhabricatorOwnersDetailController.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -189,13 +189,10 @@ private function buildPackagePropertyView(
189189

190190
$description = $package->getDescription();
191191
if (strlen($description)) {
192+
$description = new PHUIRemarkupView($viewer, $description);
192193
$view->addSectionHeader(
193194
pht('Description'), PHUIPropertyListView::ICON_SUMMARY);
194-
$view->addTextContent(
195-
$output = PhabricatorMarkupEngine::renderOneObject(
196-
id(new PhabricatorMarkupOneOff())->setContent($description),
197-
'default',
198-
$viewer));
195+
$view->addTextContent($description);
199196
}
200197

201198
$view->invokeWillRenderEvent();

‎src/applications/phame/controller/blog/PhameBlogManageController.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,7 @@ private function renderProperties(
118118
$properties->invokeWillRenderEvent();
119119

120120
if (strlen($blog->getDescription())) {
121-
$description = PhabricatorMarkupEngine::renderOneObject(
122-
id(new PhabricatorMarkupOneOff())->setContent($blog->getDescription()),
123-
'default',
124-
$viewer);
121+
$description = new PHUIRemarkupView($viewer, $description);
125122
$properties->addSectionHeader(
126123
pht('Description'),
127124
PHUIPropertyListView::ICON_SUMMARY);

‎src/applications/pholio/controller/PholioInlineController.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,16 +86,13 @@ public function handleRequest(AphrontRequest $request) {
8686
),
8787
$author_handle->renderLink());
8888

89+
$inline_content = new PHUIRemarkupView($viewer, $inline->getContent());
8990
$comment_body = phutil_tag(
9091
'div',
9192
array(
9293
'class' => 'pholio-inline-comment-body',
9394
),
94-
PhabricatorMarkupEngine::renderOneObject(
95-
id(new PhabricatorMarkupOneOff())
96-
->setContent($inline->getContent()),
97-
'default',
98-
$viewer));
95+
$inline_content);
9996

10097
return $this->newDialog()
10198
->setTitle(pht('Inline Comment'))

‎src/applications/phortune/controller/PhortuneCartController.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,7 @@ protected function renderCartDescription(PhortuneCart $cart) {
4848
return null;
4949
}
5050

51-
$output = PhabricatorMarkupEngine::renderOneObject(
52-
id(new PhabricatorMarkupOneOff())
53-
->setPreserveLinebreaks(true)
54-
->setContent($description),
55-
'default',
56-
$this->getViewer());
51+
$output = new PHUIRemarkupView($this->getUser(), $description);
5752

5853
$box = id(new PHUIBoxView())
5954
->addMargin(PHUI::MARGIN_LARGE)

‎src/applications/phortune/controller/PhortuneMerchantViewController.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,7 @@ private function buildPropertyListView(
136136

137137
$description = $merchant->getDescription();
138138
if (strlen($description)) {
139-
$description = PhabricatorMarkupEngine::renderOneObject(
140-
id(new PhabricatorMarkupOneOff())->setContent($description),
141-
'default',
142-
$viewer);
143-
139+
$description = new PHUIRemarkupView($viewer, $description);
144140
$view->addSectionHeader(
145141
pht('Description'), PHUIPropertyListView::ICON_SUMMARY);
146142
$view->addTextContent($description);

‎src/applications/phurl/controller/PhabricatorPhurlURLViewController.php

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -134,16 +134,12 @@ private function buildPropertyView(PhabricatorPhurlURL $url) {
134134

135135
$properties->invokeWillRenderEvent();
136136

137-
if (strlen($url->getDescription())) {
138-
$description = PhabricatorMarkupEngine::renderOneObject(
139-
id(new PhabricatorMarkupOneOff())->setContent($url->getDescription()),
140-
'default',
141-
$viewer);
142-
137+
$description = $url->getDescription();
138+
if (strlen($description)) {
139+
$description = new PHUIRemarkupView($viewer, $description);
143140
$properties->addSectionHeader(
144141
pht('Description'),
145142
PHUIPropertyListView::ICON_SUMMARY);
146-
147143
$properties->addTextContent($description);
148144
}
149145

0 commit comments

Comments
 (0)