Skip to content

Commit aaab101

Browse files
author
epriestley
committed
Give AphrontTagView a getViewer(), deprecate getUser()
Summary: Two minor changes here: - Replace `get/setUser()` with `get/setViewer()` for consistency with everything else. - `getViewer()` now throws if no viewer is set. We had a lot of code that either "should" check this but didn't, or did check it in an identical way, duplicating work. In contrast, very little code checks for a viewer but works if one is not present. Test Plan: - Grepped for `->user`. - Attempted to fix all callsites inside `*View` classes. - Browsed around a bunch of applications, particularly Calendar, Differential and Diffusion, which seemed most heavily affected. Reviewers: chad Reviewed By: chad Differential Revision: https://secure.phabricator.com/D15412
1 parent abb4c03 commit aaab101

27 files changed

+133
-125
lines changed

src/applications/badges/view/PhabricatorBadgesRecipientsListView.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ public function setHandles(array $handles) {
1616
}
1717

1818
public function render() {
19-
20-
$viewer = $this->user;
19+
$viewer = $this->getViewer();
2120

2221
$badge = $this->badge;
2322
$handles = $this->handles;

src/applications/daemon/view/PhabricatorDaemonLogEventsView.php

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,9 @@ public function setCombinedLog($is_combined) {
2424
}
2525

2626
public function render() {
27+
$viewer = $this->getViewer();
2728
$rows = array();
2829

29-
if (!$this->user) {
30-
throw new PhutilInvalidStateException('setUser');
31-
}
32-
3330
foreach ($this->events as $event) {
3431

3532
// Limit display log size. If a daemon gets stuck in an output loop this
@@ -83,8 +80,8 @@ public function render() {
8380

8481
$row = array(
8582
$event->getLogType(),
86-
phabricator_date($event->getEpoch(), $this->user),
87-
phabricator_time($event->getEpoch(), $this->user),
83+
phabricator_date($event->getEpoch(), $viewer),
84+
phabricator_time($event->getEpoch(), $viewer),
8885
array(
8986
$message,
9087
$more,

src/applications/daemon/view/PhabricatorDaemonLogListView.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,9 @@ public function setDaemonLogs(array $daemon_logs) {
1111
}
1212

1313
public function render() {
14-
$rows = array();
14+
$viewer = $this->getViewer();
1515

16-
if (!$this->user) {
17-
throw new PhutilInvalidStateException('setUser');
18-
}
16+
$rows = array();
1917

2018
$list = new PHUIObjectItemListView();
2119
$list->setFlush(true);
@@ -27,7 +25,7 @@ public function render() {
2725
->setObjectName(pht('Daemon %s', $id))
2826
->setHeader($log->getDaemon())
2927
->setHref("/daemon/log/{$id}/")
30-
->addIcon('none', phabricator_datetime($epoch, $this->user));
28+
->addIcon('none', phabricator_datetime($epoch, $viewer));
3129

3230
$status = $log->getStatus();
3331
switch ($status) {

src/applications/differential/view/DifferentialAddCommentView.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ public function setCCs(array $names) {
5050
}
5151

5252
public function render() {
53+
$viewer = $this->getViewer();
5354

5455
$this->requireResource('differential-revision-add-comment-css');
5556
$revision = $this->revision;
@@ -73,7 +74,7 @@ public function render() {
7374
$form = new AphrontFormView();
7475
$form
7576
->setWorkflow(true)
76-
->setUser($this->user)
77+
->setViewer($viewer)
7778
->setAction($this->actionURI)
7879
->addHiddenInput('revision_id', $revision->getID())
7980
->appendChild(
@@ -108,7 +109,7 @@ public function render() {
108109
->setID('comment-content')
109110
->setLabel(pht('Comment'))
110111
->setValue($this->draft ? $this->draft->getDraft() : null)
111-
->setUser($this->user))
112+
->setViewer($viewer))
112113
->appendChild(
113114
id(new AphrontFormSubmitControl())
114115
->setValue(pht('Submit')));

src/applications/differential/view/DifferentialChangesetListView.php

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,8 @@ public function setRawFileURIs($l, $r) {
113113
}
114114

115115
public function render() {
116+
$viewer = $this->getViewer();
117+
116118
$this->requireResource('differential-changeset-view-css');
117119

118120
$changesets = $this->changesets;
@@ -148,7 +150,7 @@ public function render() {
148150
));
149151

150152
$renderer = DifferentialChangesetParser::getDefaultRendererForViewer(
151-
$this->getUser());
153+
$viewer);
152154

153155
$output = array();
154156
$ids = array();
@@ -163,7 +165,7 @@ public function render() {
163165
$ref = $this->references[$key];
164166

165167
$detail = id(new DifferentialChangesetDetailView())
166-
->setUser($this->getUser());
168+
->setUser($viewer);
167169

168170
$uniq_id = 'diff-'.$changeset->getAnchorName();
169171
$detail->setID($uniq_id);
@@ -261,6 +263,7 @@ private function renderViewOptionsDropdown(
261263
DifferentialChangesetDetailView $detail,
262264
$ref,
263265
DifferentialChangeset $changeset) {
266+
$viewer = $this->getViewer();
264267

265268
$meta = array();
266269

@@ -280,7 +283,7 @@ private function renderViewOptionsDropdown(
280283
try {
281284
$meta['diffusionURI'] =
282285
(string)$repository->getDiffusionBrowseURIForPath(
283-
$this->user,
286+
$viewer,
284287
$changeset->getAbsoluteRepositoryPath($repository, $this->diff),
285288
idx($changeset->getMetadata(), 'line:first'),
286289
$this->getBranch());
@@ -308,13 +311,12 @@ private function renderViewOptionsDropdown(
308311
}
309312
}
310313

311-
$user = $this->user;
312-
if ($user && $repository) {
314+
if ($viewer && $repository) {
313315
$path = ltrim(
314316
$changeset->getAbsoluteRepositoryPath($repository, $this->diff),
315317
'/');
316318
$line = idx($changeset->getMetadata(), 'line:first', 1);
317-
$editor_link = $user->loadEditorLink($path, $line, $repository);
319+
$editor_link = $viewer->loadEditorLink($path, $line, $repository);
318320
if ($editor_link) {
319321
$meta['editor'] = $editor_link;
320322
} else {

src/applications/differential/view/DifferentialLocalCommitsView.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@ public function setCommitsForLinks(array $commits) {
1717
}
1818

1919
public function render() {
20-
$user = $this->user;
21-
if (!$user) {
22-
throw new PhutilInvalidStateException('setUser');
23-
}
20+
$viewer = $this->getViewer();
2421

2522
$local = $this->localCommits;
2623
if (!$local) {
@@ -94,7 +91,7 @@ public function render() {
9491
idx($commit, 'date'),
9592
idx($commit, 'time'));
9693
if ($date) {
97-
$date = phabricator_datetime($date, $user);
94+
$date = phabricator_datetime($date, $viewer);
9895
}
9996
$row[] = $date;
10097

src/applications/differential/view/DifferentialRevisionListView.php

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,7 @@ public function setHandles(array $handles) {
5757
}
5858

5959
public function render() {
60-
$user = $this->user;
61-
if (!$user) {
62-
throw new PhutilInvalidStateException('setUser');
63-
}
60+
$viewer = $this->getViewer();
6461

6562
$fresh = PhabricatorEnv::getEnvConfig('differential.days-fresh');
6663
if ($fresh) {
@@ -83,12 +80,12 @@ public function render() {
8380

8481
foreach ($this->revisions as $revision) {
8582
$item = id(new PHUIObjectItemView())
86-
->setUser($user);
83+
->setUser($viewer);
8784

8885
$icons = array();
8986

9087
$phid = $revision->getPHID();
91-
$flag = $revision->getFlag($user);
88+
$flag = $revision->getFlag($viewer);
9289
if ($flag) {
9390
$flag_class = PhabricatorFlagColor::getCSSClass($flag->getColor());
9491
$icons['flag'] = phutil_tag(
@@ -99,7 +96,7 @@ public function render() {
9996
'');
10097
}
10198

102-
if ($revision->getDrafts($user)) {
99+
if ($revision->getDrafts($viewer)) {
103100
$icons['draft'] = true;
104101
}
105102

src/applications/diffusion/view/DiffusionTagListView.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public function render() {
100100
$build,
101101
$author,
102102
$description,
103-
phabricator_datetime($tag->getEpoch(), $this->user),
103+
phabricator_datetime($tag->getEpoch(), $this->getViewer()),
104104
);
105105
}
106106

src/applications/phame/view/PhameBlogListView.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,13 @@
33
final class PhameBlogListView extends AphrontTagView {
44

55
private $blogs;
6-
private $viewer;
76

87
public function setBlogs($blogs) {
98
assert_instances_of($blogs, 'PhameBlog');
109
$this->blogs = $blogs;
1110
return $this;
1211
}
1312

14-
public function setViewer($viewer) {
15-
$this->viewer = $viewer;
16-
return $this;
17-
}
18-
1913
protected function getTagAttributes() {
2014
$classes = array();
2115
$classes[] = 'phame-blog-list';

src/applications/phame/view/PhameDraftListView.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ final class PhameDraftListView extends AphrontTagView {
44

55
private $posts;
66
private $blogs;
7-
private $viewer;
87

98
public function setPosts($posts) {
109
assert_instances_of($posts, 'PhamePost');
@@ -18,11 +17,6 @@ public function setBlogs($blogs) {
1817
return $this;
1918
}
2019

21-
public function setViewer($viewer) {
22-
$this->viewer = $viewer;
23-
return $this;
24-
}
25-
2620
protected function getTagAttributes() {
2721
$classes = array();
2822
$classes[] = 'phame-blog-list';

0 commit comments

Comments
 (0)