@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 Herald for handleRequest
Summary: Update Herald for handleRequest
Test Plan: New rule, test console, logs, lists.
Reviewers: epriestley
Reviewed By: epriestley
Subscribers: epriestley, Korvin
Maniphest Tasks: T8628
Differential Revision: https://secure.phabricator.com/D13765
+31
-67
+5
-13
src/applications/herald/controller/HeraldDisableController.php
+5
-13
src/applications/herald/controller/HeraldDisableController.php
···
2
2
3
3
final class HeraldDisableController extends HeraldController {
4
4
5
-
private $id;
6
-
private $action;
7
-
8
-
public function willProcessRequest(array $data) {
9
-
$this->id = $data['id'];
10
-
$this->action = $data['action'];
11
-
}
12
-
13
-
public function processRequest() {
14
-
$request = $this->getRequest();
15
-
$viewer = $request->getUser();
16
-
$id = $this->id;
5
+
public function handleRequest(AphrontRequest $request) {
6
+
$viewer = $request->getViewer();
7
+
$id = $request->getURIData('id');
8
+
$action = $request->getURIData('action');
17
9
18
10
$rule = id(new HeraldRuleQuery())
19
11
->setViewer($viewer)
···
35
27
36
28
$view_uri = $this->getApplicationURI("rule/{$id}/");
37
29
38
-
$is_disable = ($this->action === 'disable');
30
+
$is_disable = ($action === 'disable');
39
31
40
32
if ($request->isFormPost()) {
41
33
$xaction = id(new HeraldRuleTransaction())
+2
-3
src/applications/herald/controller/HeraldNewController.php
+2
-3
src/applications/herald/controller/HeraldNewController.php
···
2
2
3
3
final class HeraldNewController extends HeraldController {
4
4
5
-
public function processRequest() {
6
-
$request = $this->getRequest();
7
-
$viewer = $request->getUser();
5
+
public function handleRequest(AphrontRequest $request) {
6
+
$viewer = $request->getViewer();
8
7
9
8
$content_type_map = HeraldAdapter::getEnabledAdapterMap($viewer);
10
9
$rule_type_map = HeraldRuleTypeConfig::getRuleTypeMap();
+9
-17
src/applications/herald/controller/HeraldRuleController.php
+9
-17
src/applications/herald/controller/HeraldRuleController.php
···
2
2
3
3
final class HeraldRuleController extends HeraldController {
4
4
5
-
private $id;
6
-
private $filter;
7
-
8
-
public function willProcessRequest(array $data) {
9
-
$this->id = (int)idx($data, 'id');
10
-
}
11
-
12
-
public function processRequest() {
13
-
$request = $this->getRequest();
14
-
$user = $request->getUser();
5
+
public function handleRequest(AphrontRequest $request) {
6
+
$viewer = $request->getViewer();
7
+
$id = $request->getURIData('id');
15
8
16
-
$content_type_map = HeraldAdapter::getEnabledAdapterMap($user);
9
+
$content_type_map = HeraldAdapter::getEnabledAdapterMap($viewer);
17
10
$rule_type_map = HeraldRuleTypeConfig::getRuleTypeMap();
18
11
19
-
if ($this->id) {
20
-
$id = $this->id;
12
+
if ($id) {
21
13
$rule = id(new HeraldRuleQuery())
22
-
->setViewer($user)
14
+
->setViewer($viewer)
23
15
->withIDs(array($id))
24
16
->requireCapabilities(
25
17
array(
···
33
25
$cancel_uri = $this->getApplicationURI("rule/{$id}/");
34
26
} else {
35
27
$rule = new HeraldRule();
36
-
$rule->setAuthorPHID($user->getPHID());
28
+
$rule->setAuthorPHID($viewer->getPHID());
37
29
$rule->setMustMatchAll(1);
38
30
39
31
$content_type = $request->getStr('content_type');
···
58
50
if ($rule->isObjectRule()) {
59
51
$rule->setTriggerObjectPHID($request->getStr('targetPHID'));
60
52
$object = id(new PhabricatorObjectQuery())
61
-
->setViewer($user)
53
+
->setViewer($viewer)
62
54
->withPHIDs(array($rule->getTriggerObjectPHID()))
63
55
->requireCapabilities(
64
56
array(
···
128
120
$rule_type_name = $rule_type_map[$rule->getRuleType()];
129
121
130
122
$form = id(new AphrontFormView())
131
-
->setUser($user)
123
+
->setUser($viewer)
132
124
->setID('herald-rule-edit-form')
133
125
->addHiddenInput('content_type', $rule->getContentType())
134
126
->addHiddenInput('rule_type', $rule->getRuleType())
+3
-7
src/applications/herald/controller/HeraldRuleListController.php
+3
-7
src/applications/herald/controller/HeraldRuleListController.php
···
2
2
3
3
final class HeraldRuleListController extends HeraldController {
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
-
}
9
+
public function handleRequest(AphrontRequest $request) {
10
+
$querykey = $request->getURIData('queryKey');
14
11
15
-
public function processRequest() {
16
12
$controller = id(new PhabricatorApplicationSearchController())
17
-
->setQueryKey($this->queryKey)
13
+
->setQueryKey($querykey)
18
14
->setSearchEngine(new HeraldRuleSearchEngine())
19
15
->setNavigation($this->buildSideNavView());
20
16
+4
-10
src/applications/herald/controller/HeraldRuleViewController.php
+4
-10
src/applications/herald/controller/HeraldRuleViewController.php
···
2
2
3
3
final class HeraldRuleViewController extends HeraldController {
4
4
5
-
private $id;
6
-
7
-
public function willProcessRequest(array $data) {
8
-
$this->id = $data['id'];
9
-
}
10
-
11
-
public function processRequest() {
12
-
$request = $this->getRequest();
13
-
$viewer = $request->getUser();
5
+
public function handleRequest(AphrontRequest $request) {
6
+
$viewer = $request->getViewer();
7
+
$id = $request->getURIData('id');
14
8
15
9
$rule = id(new HeraldRuleQuery())
16
10
->setViewer($viewer)
17
-
->withIDs(array($this->id))
11
+
->withIDs(array($id))
18
12
->needConditionsAndActions(true)
19
13
->executeOne();
20
14
if (!$rule) {
+5
-10
src/applications/herald/controller/HeraldTestConsoleController.php
+5
-10
src/applications/herald/controller/HeraldTestConsoleController.php
···
2
2
3
3
final class HeraldTestConsoleController extends HeraldController {
4
4
5
-
public function processRequest() {
6
-
7
-
$request = $this->getRequest();
8
-
$user = $request->getUser();
9
-
10
-
$request = $this->getRequest();
11
-
5
+
public function handleRequest(AphrontRequest $request) {
6
+
$viewer = $request->getViewer();
12
7
$object_name = trim($request->getStr('object_name'));
13
8
14
9
$e_name = true;
···
21
16
22
17
if (!$errors) {
23
18
$object = id(new PhabricatorObjectQuery())
24
-
->setViewer($user)
19
+
->setViewer($viewer)
25
20
->withNames(array($object_name))
26
21
->executeOne();
27
22
···
57
52
$adapter->setIsNewObject(false);
58
53
59
54
$rules = id(new HeraldRuleQuery())
60
-
->setViewer($user)
55
+
->setViewer($viewer)
61
56
->withContentTypes(array($adapter->getAdapterContentType()))
62
57
->withDisabled(false)
63
58
->needConditionsAndActions(true)
···
80
75
}
81
76
82
77
$form = id(new AphrontFormView())
83
-
->setUser($user)
78
+
->setUser($viewer)
84
79
->appendRemarkupInstructions(
85
80
pht(
86
81
'Enter an object to test rules for, like a Diffusion commit (e.g., '.
+3
-7
src/applications/herald/controller/HeraldTranscriptListController.php
+3
-7
src/applications/herald/controller/HeraldTranscriptListController.php
···
2
2
3
3
final class HeraldTranscriptListController extends HeraldController {
4
4
5
-
private $queryKey;
6
-
7
5
public function buildSideNavView($for_app = false) {
8
6
$user = $this->getRequest()->getUser();
9
7
···
32
30
return $crumbs;
33
31
}
34
32
35
-
public function willProcessRequest(array $data) {
36
-
$this->queryKey = idx($data, 'queryKey');
37
-
}
33
+
public function handleRequest(AphrontRequest $request) {
34
+
$querykey = $request->getURIData('queryKey');
38
35
39
-
public function processRequest() {
40
36
$controller = id(new PhabricatorApplicationSearchController())
41
-
->setQueryKey($this->queryKey)
37
+
->setQueryKey($querykey)
42
38
->setSearchEngine(new HeraldTranscriptSearchEngine())
43
39
->setNavigation($this->buildSideNavView());
44
40