@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Update Differential for handleRequest
Summary: Moves from processRequest to handleRequest.
Test Plan: New diff, edit diff, leave comment, view list, browse revisions, etc.
Reviewers: epriestley
Reviewed By: epriestley
Subscribers: Korvin
Differential Revision: https://secure.phabricator.com/D14252
+47
-91
+5
-11
src/applications/differential/controller/DifferentialCommentPreviewController.php
+5
-11
src/applications/differential/controller/DifferentialCommentPreviewController.php
···
3
3
final class DifferentialCommentPreviewController
4
4
extends DifferentialController {
5
5
6
-
private $id;
7
-
8
-
public function willProcessRequest(array $data) {
9
-
$this->id = $data['id'];
10
-
}
11
-
12
-
public function processRequest() {
13
-
$request = $this->getRequest();
14
-
$viewer = $request->getUser();
6
+
public function handleRequest(AphrontRequest $request) {
7
+
$viewer = $this->getViewer();
8
+
$id = $request->getURIData('id');
15
9
16
10
$revision = id(new DifferentialRevisionQuery())
17
11
->setViewer($viewer)
18
-
->withIDs(array($this->id))
12
+
->withIDs(array($id))
19
13
->executeOne();
20
14
if (!$revision) {
21
15
return new Aphront404Response();
···
119
113
$metadata['action'] = $action;
120
114
}
121
115
122
-
$draft_key = 'differential-comment-'.$this->id;
116
+
$draft_key = 'differential-comment-'.$id;
123
117
$draft = id(new PhabricatorDraft())
124
118
->setAuthorPHID($viewer->getPHID())
125
119
->setDraftKey($draft_key)
+4
-10
src/applications/differential/controller/DifferentialCommentSaveController.php
+4
-10
src/applications/differential/controller/DifferentialCommentSaveController.php
···
3
3
final class DifferentialCommentSaveController
4
4
extends DifferentialController {
5
5
6
-
private $id;
7
-
8
-
public function willProcessRequest(array $data) {
9
-
$this->id = $data['id'];
10
-
}
11
-
12
-
public function processRequest() {
13
-
$request = $this->getRequest();
14
-
$viewer = $request->getUser();
6
+
public function handleRequest(AphrontRequest $request) {
7
+
$viewer = $this->getViewer();
8
+
$id = $request->getURIData('id');
15
9
16
10
if (!$request->isFormPost()) {
17
11
return new Aphront400Response();
···
19
13
20
14
$revision = id(new DifferentialRevisionQuery())
21
15
->setViewer($viewer)
22
-
->withIDs(array($this->id))
16
+
->withIDs(array($id))
23
17
->needReviewerStatus(true)
24
18
->needReviewerAuthority(true)
25
19
->executeOne();
+4
-10
src/applications/differential/controller/DifferentialDiffViewController.php
+4
-10
src/applications/differential/controller/DifferentialDiffViewController.php
···
2
2
3
3
final class DifferentialDiffViewController extends DifferentialController {
4
4
5
-
private $id;
6
-
7
5
public function shouldAllowPublic() {
8
6
return true;
9
7
}
10
8
11
-
public function willProcessRequest(array $data) {
12
-
$this->id = $data['id'];
13
-
}
14
-
15
-
public function processRequest() {
16
-
$request = $this->getRequest();
17
-
$viewer = $request->getUser();
9
+
public function handleRequest(AphrontRequest $request) {
10
+
$viewer = $this->getViewer();
11
+
$id = $request->getURIData('id');
18
12
19
13
$diff = id(new DifferentialDiffQuery())
20
14
->setViewer($viewer)
21
-
->withIDs(array($this->id))
15
+
->withIDs(array($id))
22
16
->executeOne();
23
17
if (!$diff) {
24
18
return new Aphront404Response();
+3
-12
src/applications/differential/controller/DifferentialRevisionCloseDetailsController.php
+3
-12
src/applications/differential/controller/DifferentialRevisionCloseDetailsController.php
···
3
3
final class DifferentialRevisionCloseDetailsController
4
4
extends DifferentialController {
5
5
6
-
private $phid;
7
-
8
-
public function willProcessRequest(array $data) {
9
-
$this->phid = idx($data, 'phid');
10
-
}
11
-
12
-
public function processRequest() {
13
-
$request = $this->getRequest();
14
-
15
-
$viewer = $request->getUser();
16
-
$xaction_phid = $this->phid;
6
+
public function handleRequest(AphrontRequest $request) {
7
+
$viewer = $this->getViewer();
17
8
18
9
$xaction = id(new PhabricatorObjectQuery())
19
-
->withPHIDs(array($xaction_phid))
10
+
->withPHIDs(array($request->getURIData('phid')))
20
11
->setViewer($viewer)
21
12
->executeOne();
22
13
if (!$xaction) {
+7
-13
src/applications/differential/controller/DifferentialRevisionEditController.php
+7
-13
src/applications/differential/controller/DifferentialRevisionEditController.php
···
3
3
final class DifferentialRevisionEditController
4
4
extends DifferentialController {
5
5
6
-
private $id;
7
-
8
-
public function willProcessRequest(array $data) {
9
-
$this->id = idx($data, 'id');
10
-
}
11
-
12
-
public function processRequest() {
13
-
$request = $this->getRequest();
14
-
$viewer = $request->getUser();
6
+
public function handleRequest(AphrontRequest $request) {
7
+
$viewer = $this->getViewer();
8
+
$id = $request->getURIData('id');
15
9
16
-
if (!$this->id) {
17
-
$this->id = $request->getInt('revisionID');
10
+
if (!$id) {
11
+
$id = $request->getInt('revisionID');
18
12
}
19
13
20
-
if ($this->id) {
14
+
if ($id) {
21
15
$revision = id(new DifferentialRevisionQuery())
22
16
->setViewer($viewer)
23
-
->withIDs(array($this->id))
17
+
->withIDs(array($id))
24
18
->needRelationships(true)
25
19
->needReviewerStatus(true)
26
20
->needActiveDiffs(true)
+2
-3
src/applications/differential/controller/DifferentialRevisionLandController.php
+2
-3
src/applications/differential/controller/DifferentialRevisionLandController.php
···
11
11
$this->strategyClass = $data['strategy'];
12
12
}
13
13
14
-
public function processRequest() {
15
-
$request = $this->getRequest();
16
-
$viewer = $request->getUser();
14
+
public function handleRequest(AphrontRequest $request) {
15
+
$viewer = $this->getViewer();
17
16
18
17
$revision_id = $this->revisionID;
19
18
+2
-8
src/applications/differential/controller/DifferentialRevisionListController.php
+2
-8
src/applications/differential/controller/DifferentialRevisionListController.php
···
2
2
3
3
final class DifferentialRevisionListController extends DifferentialController {
4
4
5
-
private $queryKey;
6
-
7
5
public function shouldAllowPublic() {
8
6
return true;
9
7
}
10
8
11
-
public function willProcessRequest(array $data) {
12
-
$this->queryKey = idx($data, 'queryKey');
13
-
}
14
-
15
-
public function processRequest() {
9
+
public function handleRequest(AphrontRequest $request) {
16
10
$controller = id(new PhabricatorApplicationSearchController())
17
-
->setQueryKey($this->queryKey)
11
+
->setQueryKey($request->getURIData('queryKey'))
18
12
->setSearchEngine(new DifferentialRevisionSearchEngine())
19
13
->setNavigation($this->buildSideNavView());
20
14
+20
-24
src/applications/differential/controller/DifferentialRevisionViewController.php
+20
-24
src/applications/differential/controller/DifferentialRevisionViewController.php
···
8
8
return true;
9
9
}
10
10
11
-
public function willProcessRequest(array $data) {
12
-
$this->revisionID = $data['id'];
13
-
}
11
+
public function handleRequest(AphrontRequest $request) {
12
+
$viewer = $this->getViewer();
13
+
$this->revisionID = $request->getURIData('id');
14
14
15
-
public function processRequest() {
16
-
17
-
$request = $this->getRequest();
18
-
$user = $request->getUser();
19
-
$viewer_is_anonymous = !$user->isLoggedIn();
15
+
$viewer_is_anonymous = !$viewer->isLoggedIn();
20
16
21
17
$revision = id(new DifferentialRevisionQuery())
22
18
->withIDs(array($this->revisionID))
···
68
64
$repository = $revision->getRepository();
69
65
} else {
70
66
$repository = id(new PhabricatorRepositoryQuery())
71
-
->setViewer($user)
67
+
->setViewer($viewer)
72
68
->withPHIDs(array($repository_phid))
73
69
->executeOne();
74
70
}
···
117
113
$revision->loadCommitPHIDs(),
118
114
array(
119
115
$revision->getAuthorPHID(),
120
-
$user->getPHID(),
116
+
$viewer->getPHID(),
121
117
));
122
118
123
119
foreach ($revision->getAttached() as $type => $phids) {
···
130
126
$revision,
131
127
PhabricatorCustomField::ROLE_VIEW);
132
128
133
-
$field_list->setViewer($user);
129
+
$field_list->setViewer($viewer);
134
130
$field_list->readFieldsFromStorage($revision);
135
131
136
132
$warning_handle_map = array();
···
174
170
$new = array_select_keys($changesets, $new_ids);
175
171
176
172
$query = id(new DifferentialInlineCommentQuery())
177
-
->setViewer($user)
173
+
->setViewer($viewer)
178
174
->needHidden(true)
179
175
->withRevisionPHIDs(array($revision->getPHID()));
180
176
$inlines = $query->execute();
···
205
201
$commit_hashes = array_unique(array_filter($commit_hashes));
206
202
if ($commit_hashes) {
207
203
$commits_for_links = id(new DiffusionCommitQuery())
208
-
->setViewer($user)
204
+
->setViewer($viewer)
209
205
->withIdentifiers($commit_hashes)
210
206
->execute();
211
207
$commits_for_links = mpull(
···
217
213
}
218
214
219
215
$revision_detail = id(new DifferentialRevisionDetailView())
220
-
->setUser($user)
216
+
->setUser($viewer)
221
217
->setRevision($revision)
222
218
->setDiff(end($diffs))
223
219
->setCustomFields($field_list)
···
239
235
}
240
236
241
237
$revision_detail->setActions($actions);
242
-
$revision_detail->setUser($user);
238
+
$revision_detail->setUser($viewer);
243
239
244
240
$revision_detail_box = $revision_detail->render();
245
241
···
261
257
$detail_diffs = mpull($detail_diffs, null, 'getPHID');
262
258
263
259
$buildables = id(new HarbormasterBuildableQuery())
264
-
->setViewer($user)
260
+
->setViewer($viewer)
265
261
->withBuildablePHIDs(array_keys($detail_diffs))
266
262
->withManualBuildables(false)
267
263
->needBuilds(true)
···
311
307
'/differential/changeset/?view=old',
312
308
'/differential/changeset/?view=new');
313
309
314
-
$changeset_view->setUser($user);
310
+
$changeset_view->setUser($viewer);
315
311
$changeset_view->setDiff($target);
316
312
$changeset_view->setRenderingReferences($rendering_references);
317
313
$changeset_view->setVsMap($vs_map);
···
323
319
$changeset_view->setTitle(pht('Diff %s', $target->getID()));
324
320
325
321
$diff_history = id(new DifferentialRevisionUpdateHistoryView())
326
-
->setUser($user)
322
+
->setUser($viewer)
327
323
->setDiffs($diffs)
328
324
->setSelectedVersusDiffID($diff_vs)
329
325
->setSelectedDiffID($target->getID())
···
331
327
->setCommitsForLinks($commits_for_links);
332
328
333
329
$local_view = id(new DifferentialLocalCommitsView())
334
-
->setUser($user)
330
+
->setUser($viewer)
335
331
->setLocalCommits(idx($props, 'local:commits'))
336
332
->setCommitsForLinks($commits_for_links);
337
333
···
352
348
$toc_view = $this->buildTableOfContents(
353
349
$changesets,
354
350
$visible_changesets,
355
-
$target->loadCoverageMap($user));
351
+
$target->loadCoverageMap($viewer));
356
352
357
353
$comment_form = null;
358
354
if (!$viewer_is_anonymous) {
359
355
$draft = id(new PhabricatorDraft())->loadOneWhere(
360
356
'authorPHID = %s AND draftKey = %s',
361
-
$user->getPHID(),
357
+
$viewer->getPHID(),
362
358
'differential-comment-'.$revision->getID());
363
359
364
360
$reviewers = array();
···
394
390
'comment/save/'.$revision->getID().'/');
395
391
396
392
$comment_form->setActionURI($action_uri);
397
-
$comment_form->setUser($user);
393
+
$comment_form->setUser($viewer);
398
394
$comment_form->setDraft($draft);
399
395
$comment_form->setReviewers(mpull($reviewers, 'getFullName', 'getPHID'));
400
396
$comment_form->setCCs(mpull($ccs, 'getFullName', 'getPHID'));
···
461
457
// TODO: For now, just use this to get "Login to Comment".
462
458
$page_pane->appendChild(
463
459
id(new PhabricatorApplicationTransactionCommentView())
464
-
->setUser($user)
460
+
->setUser($viewer)
465
461
->setRequestURI($request->getRequestURI()));
466
462
}
467
463
···
476
472
$crumbs = $this->buildApplicationCrumbs();
477
473
$crumbs->addTextCrumb($object_id, '/'.$object_id);
478
474
479
-
$prefs = $user->loadPreferences();
475
+
$prefs = $viewer->loadPreferences();
480
476
481
477
$pref_filetree = PhabricatorUserPreferences::PREFERENCE_DIFF_FILETREE;
482
478
if ($prefs->getPreference($pref_filetree)) {