@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 Audit for handleRequest
Summary: Updates Audit controllers for handleRequest
Test Plan: See list of audits, raise concern, clear concern, comment.
Reviewers: epriestley
Reviewed By: epriestley
Subscribers: epriestley, Korvin
Maniphest Tasks: T8628
Differential Revision: https://secure.phabricator.com/D13771
+15
-22
+6
-7
src/applications/audit/controller/PhabricatorAuditAddCommentController.php
+6
-7
src/applications/audit/controller/PhabricatorAuditAddCommentController.php
···
3
3
final class PhabricatorAuditAddCommentController
4
4
extends PhabricatorAuditController {
5
5
6
-
public function processRequest() {
7
-
$request = $this->getRequest();
8
-
$user = $request->getUser();
6
+
public function handleRequest(AphrontRequest $request) {
7
+
$viewer = $request->getViewer();
9
8
10
9
if (!$request->isFormPost()) {
11
10
return new Aphront403Response();
···
13
12
14
13
$commit_phid = $request->getStr('commit');
15
14
$commit = id(new DiffusionCommitQuery())
16
-
->setViewer($user)
15
+
->setViewer($viewer)
17
16
->withPHIDs(array($commit_phid))
18
17
->needAuditRequests(true)
19
18
->executeOne();
···
61
60
}
62
61
63
62
$inlines = PhabricatorAuditInlineComment::loadDraftComments(
64
-
$user,
63
+
$viewer,
65
64
$commit->getPHID());
66
65
foreach ($inlines as $inline) {
67
66
$xactions[] = id(new PhabricatorAuditTransaction())
···
70
69
}
71
70
72
71
id(new PhabricatorAuditEditor())
73
-
->setActor($user)
72
+
->setActor($viewer)
74
73
->setContentSourceFromRequest($request)
75
74
->setContinueOnMissingFields(true)
76
75
->applyTransactions($commit, $xactions);
77
76
78
77
$draft = id(new PhabricatorDraft())->loadOneWhere(
79
78
'authorPHID = %s AND draftKey = %s',
80
-
$user->getPHID(),
79
+
$viewer->getPHID(),
81
80
'diffusion-audit-'.$commit->getID());
82
81
if ($draft) {
83
82
$draft->delete();
+9
-15
src/applications/audit/controller/PhabricatorAuditPreviewController.php
+9
-15
src/applications/audit/controller/PhabricatorAuditPreviewController.php
···
3
3
final class PhabricatorAuditPreviewController
4
4
extends PhabricatorAuditController {
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
-
$user = $request->getUser();
6
+
public function handleRequest(AphrontRequest $request) {
7
+
$viewer = $request->getViewer();
8
+
$id = $request->getURIData('id');
15
9
16
-
$commit = id(new PhabricatorRepositoryCommit())->load($this->id);
10
+
$commit = id(new PhabricatorRepositoryCommit())->load($id);
17
11
if (!$commit) {
18
12
return new Aphront404Response();
19
13
}
···
23
17
$action = $request->getStr('action');
24
18
if ($action != PhabricatorAuditActionConstants::COMMENT) {
25
19
$action_xaction = id(new PhabricatorAuditTransaction())
26
-
->setAuthorPHID($user->getPHID())
20
+
->setAuthorPHID($viewer->getPHID())
27
21
->setObjectPHID($commit->getPHID())
28
22
->setTransactionType(PhabricatorAuditActionConstants::ACTION)
29
23
->setNewValue($action);
···
52
46
$content = $request->getStr('content');
53
47
if (strlen($content)) {
54
48
$xactions[] = id(new PhabricatorAuditTransaction())
55
-
->setAuthorPHID($user->getPHID())
49
+
->setAuthorPHID($viewer->getPHID())
56
50
->setObjectPHID($commit->getPHID())
57
51
->setTransactionType(PhabricatorTransactions::TYPE_COMMENT)
58
52
->attachComment(
···
72
66
73
67
$view = id(new PhabricatorAuditTransactionView())
74
68
->setIsPreview(true)
75
-
->setUser($user)
69
+
->setUser($viewer)
76
70
->setObjectPHID($commit->getPHID())
77
71
->setTransactions($xactions);
78
72
79
73
id(new PhabricatorDraft())
80
-
->setAuthorPHID($user->getPHID())
81
-
->setDraftKey('diffusion-audit-'.$this->id)
74
+
->setAuthorPHID($viewer->getPHID())
75
+
->setDraftKey('diffusion-audit-'.$id)
82
76
->setDraft($content)
83
77
->replaceOrDelete();
84
78