@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
Rename "PhabricatorAuditCommitStatusConstants" to "DiffusionCommitAuditStatus"; remove "MODERN_"
Summary:
Depends on D19656. Ref T13197. See PHI851.
- This class is now a real object, so get rid of the "Constants" part of the name.
- Rename it for greater consistency with other modern objects.
- Get rid of the `MODERN_` tag now that the old constants are gone.
Test Plan: Bunch of `grep`, browsed around.
Reviewers: amckinley
Reviewed By: amckinley
Maniphest Tasks: T13197
Differential Revision: https://secure.phabricator.com/D19657
+52
-57
+2
-2
src/__phutil_library_map__.php
+2
-2
src/__phutil_library_map__.php
···
704
704
'DiffusionCommitAcceptTransaction' => 'applications/diffusion/xaction/DiffusionCommitAcceptTransaction.php',
705
705
'DiffusionCommitActionTransaction' => 'applications/diffusion/xaction/DiffusionCommitActionTransaction.php',
706
706
'DiffusionCommitAffectedFilesHeraldField' => 'applications/diffusion/herald/DiffusionCommitAffectedFilesHeraldField.php',
707
+
'DiffusionCommitAuditStatus' => 'applications/diffusion/DiffusionCommitAuditStatus.php',
707
708
'DiffusionCommitAuditTransaction' => 'applications/diffusion/xaction/DiffusionCommitAuditTransaction.php',
708
709
'DiffusionCommitAuditorsHeraldField' => 'applications/diffusion/herald/DiffusionCommitAuditorsHeraldField.php',
709
710
'DiffusionCommitAuditorsTransaction' => 'applications/diffusion/xaction/DiffusionCommitAuditorsTransaction.php',
···
2147
2148
'PhabricatorAuditActionConstants' => 'applications/audit/constants/PhabricatorAuditActionConstants.php',
2148
2149
'PhabricatorAuditApplication' => 'applications/audit/application/PhabricatorAuditApplication.php',
2149
2150
'PhabricatorAuditCommentEditor' => 'applications/audit/editor/PhabricatorAuditCommentEditor.php',
2150
-
'PhabricatorAuditCommitStatusConstants' => 'applications/audit/constants/PhabricatorAuditCommitStatusConstants.php',
2151
2151
'PhabricatorAuditController' => 'applications/audit/controller/PhabricatorAuditController.php',
2152
2152
'PhabricatorAuditEditor' => 'applications/audit/editor/PhabricatorAuditEditor.php',
2153
2153
'PhabricatorAuditInlineComment' => 'applications/audit/storage/PhabricatorAuditInlineComment.php',
···
6066
6066
'DiffusionCommitAcceptTransaction' => 'DiffusionCommitAuditTransaction',
6067
6067
'DiffusionCommitActionTransaction' => 'DiffusionCommitTransactionType',
6068
6068
'DiffusionCommitAffectedFilesHeraldField' => 'DiffusionCommitHeraldField',
6069
+
'DiffusionCommitAuditStatus' => 'Phobject',
6069
6070
'DiffusionCommitAuditTransaction' => 'DiffusionCommitActionTransaction',
6070
6071
'DiffusionCommitAuditorsHeraldField' => 'DiffusionCommitHeraldField',
6071
6072
'DiffusionCommitAuditorsTransaction' => 'DiffusionCommitTransactionType',
···
7715
7716
'PhabricatorAuditActionConstants' => 'Phobject',
7716
7717
'PhabricatorAuditApplication' => 'PhabricatorApplication',
7717
7718
'PhabricatorAuditCommentEditor' => 'PhabricatorEditor',
7718
-
'PhabricatorAuditCommitStatusConstants' => 'Phobject',
7719
7719
'PhabricatorAuditController' => 'PhabricatorController',
7720
7720
'PhabricatorAuditEditor' => 'PhabricatorApplicationTransactionEditor',
7721
7721
'PhabricatorAuditInlineComment' => array(
+5
-5
src/applications/audit/conduit/AuditQueryConduitAPIMethod.php
+5
-5
src/applications/audit/conduit/AuditQueryConduitAPIMethod.php
···
68
68
69
69
$status_map = array(
70
70
self::AUDIT_LEGACYSTATUS_OPEN => array(
71
-
PhabricatorAuditCommitStatusConstants::MODERN_NEEDS_AUDIT,
72
-
PhabricatorAuditCommitStatusConstants::MODERN_CONCERN_RAISED,
71
+
DiffusionCommitAuditStatus::NEEDS_AUDIT,
72
+
DiffusionCommitAuditStatus::CONCERN_RAISED,
73
73
),
74
74
self::AUDIT_LEGACYSTATUS_CONCERN => array(
75
-
PhabricatorAuditCommitStatusConstants::MODERN_CONCERN_RAISED,
75
+
DiffusionCommitAuditStatus::CONCERN_RAISED,
76
76
),
77
77
self::AUDIT_LEGACYSTATUS_ACCEPTED => array(
78
-
PhabricatorAuditCommitStatusConstants::MODERN_AUDITED,
78
+
DiffusionCommitAuditStatus::AUDITED,
79
79
),
80
80
self::AUDIT_LEGACYSTATUS_PARTIAL => array(
81
-
PhabricatorAuditCommitStatusConstants::MODERN_PARTIALLY_AUDITED,
81
+
DiffusionCommitAuditStatus::PARTIALLY_AUDITED,
82
82
),
83
83
);
84
84
+19
-19
src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php
src/applications/diffusion/DiffusionCommitAuditStatus.php
+19
-19
src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php
src/applications/diffusion/DiffusionCommitAuditStatus.php
···
1
1
<?php
2
2
3
-
final class PhabricatorAuditCommitStatusConstants extends Phobject {
3
+
final class DiffusionCommitAuditStatus extends Phobject {
4
4
5
5
private $key;
6
6
private $spec = array();
7
7
8
-
const MODERN_NONE = 'none';
9
-
const MODERN_NEEDS_AUDIT = 'needs-audit';
10
-
const MODERN_CONCERN_RAISED = 'concern-raised';
11
-
const MODERN_PARTIALLY_AUDITED = 'partially-audited';
12
-
const MODERN_AUDITED = 'audited';
13
-
const MODERN_NEEDS_VERIFICATION = 'needs-verification';
8
+
const NONE = 'none';
9
+
const NEEDS_AUDIT = 'needs-audit';
10
+
const CONCERN_RAISED = 'concern-raised';
11
+
const PARTIALLY_AUDITED = 'partially-audited';
12
+
const AUDITED = 'audited';
13
+
const NEEDS_VERIFICATION = 'needs-verification';
14
14
15
15
public static function newModernKeys(array $values) {
16
16
$map = self::getMap();
···
59
59
}
60
60
61
61
public function isNoAudit() {
62
-
return ($this->key == self::MODERN_NONE);
62
+
return ($this->key == self::NONE);
63
63
}
64
64
65
65
public function isNeedsAudit() {
66
-
return ($this->key == self::MODERN_NEEDS_AUDIT);
66
+
return ($this->key == self::NEEDS_AUDIT);
67
67
}
68
68
69
69
public function isConcernRaised() {
70
-
return ($this->key == self::MODERN_CONCERN_RAISED);
70
+
return ($this->key == self::CONCERN_RAISED);
71
71
}
72
72
73
73
public function isNeedsVerification() {
74
-
return ($this->key == self::MODERN_NEEDS_VERIFICATION);
74
+
return ($this->key == self::NEEDS_VERIFICATION);
75
75
}
76
76
77
77
public function isPartiallyAudited() {
78
-
return ($this->key == self::MODERN_PARTIALLY_AUDITED);
78
+
return ($this->key == self::PARTIALLY_AUDITED);
79
79
}
80
80
81
81
public function isAudited() {
82
-
return ($this->key == self::MODERN_AUDITED);
82
+
return ($this->key == self::AUDITED);
83
83
}
84
84
85
85
public function getIsClosed() {
···
116
116
117
117
private static function getMap() {
118
118
return array(
119
-
self::MODERN_NONE => array(
119
+
self::NONE => array(
120
120
'name' => pht('No Audits'),
121
121
'legacy' => 0,
122
122
'icon' => 'fa-check',
123
123
'color' => 'bluegrey',
124
124
'closed' => true,
125
125
),
126
-
self::MODERN_NEEDS_AUDIT => array(
126
+
self::NEEDS_AUDIT => array(
127
127
'name' => pht('Audit Required'),
128
128
'legacy' => 1,
129
129
'icon' => 'fa-exclamation-circle',
130
130
'color' => 'orange',
131
131
'closed' => false,
132
132
),
133
-
self::MODERN_CONCERN_RAISED => array(
133
+
self::CONCERN_RAISED => array(
134
134
'name' => pht('Concern Raised'),
135
135
'legacy' => 2,
136
136
'icon' => 'fa-times-circle',
137
137
'color' => 'red',
138
138
'closed' => false,
139
139
),
140
-
self::MODERN_PARTIALLY_AUDITED => array(
140
+
self::PARTIALLY_AUDITED => array(
141
141
'name' => pht('Partially Audited'),
142
142
'legacy' => 3,
143
143
'icon' => 'fa-check-circle-o',
144
144
'color' => 'yellow',
145
145
'closed' => false,
146
146
),
147
-
self::MODERN_AUDITED => array(
147
+
self::AUDITED => array(
148
148
'name' => pht('Audited'),
149
149
'legacy' => 4,
150
150
'icon' => 'fa-check-circle',
151
151
'color' => 'green',
152
152
'closed' => true,
153
153
),
154
-
self::MODERN_NEEDS_VERIFICATION => array(
154
+
self::NEEDS_VERIFICATION => array(
155
155
'name' => pht('Needs Verification'),
156
156
'legacy' => 5,
157
157
'icon' => 'fa-refresh',
+3
-3
src/applications/audit/query/PhabricatorCommitSearchEngine.php
+3
-3
src/applications/audit/query/PhabricatorCommitSearchEngine.php
···
92
92
->setLabel(pht('Audit Status'))
93
93
->setKey('statuses')
94
94
->setAliases(array('status'))
95
-
->setOptions(PhabricatorAuditCommitStatusConstants::newOptions())
95
+
->setOptions(DiffusionCommitAuditStatus::newOptions())
96
96
->setDeprecatedOptions(
97
-
PhabricatorAuditCommitStatusConstants::newDeprecatedOptions())
97
+
DiffusionCommitAuditStatus::newDeprecatedOptions())
98
98
->setDescription(pht('Find commits with given audit statuses.')),
99
99
id(new PhabricatorSearchDatasourceField())
100
100
->setLabel(pht('Repositories'))
···
162
162
case 'active':
163
163
$bucket_key = DiffusionCommitRequiredActionResultBucket::BUCKETKEY;
164
164
165
-
$open = PhabricatorAuditCommitStatusConstants::getOpenStatusConstants();
165
+
$open = DiffusionCommitAuditStatus::getOpenStatusConstants();
166
166
167
167
$query
168
168
->setParameter('responsiblePHIDs', array($viewer_phid))
+1
-1
src/applications/diffusion/query/DiffusionCommitQuery.php
+1
-1
src/applications/diffusion/query/DiffusionCommitQuery.php
+1
-2
src/applications/diffusion/xaction/DiffusionCommitConcernTransaction.php
+1
-2
src/applications/diffusion/xaction/DiffusionCommitConcernTransaction.php
···
33
33
public function applyInternalEffects($object, $value) {
34
34
// NOTE: We force the commit directly into "Concern Raised" so that we
35
35
// override a possible "Needs Verification" state.
36
-
$object->setAuditStatus(
37
-
PhabricatorAuditCommitStatusConstants::MODERN_CONCERN_RAISED);
36
+
$object->setAuditStatus(DiffusionCommitAuditStatus::CONCERN_RAISED);
38
37
}
39
38
40
39
public function applyExternalEffects($object, $value) {
+11
-11
src/applications/diffusion/xaction/DiffusionCommitStateTransaction.php
+11
-11
src/applications/diffusion/xaction/DiffusionCommitStateTransaction.php
···
13
13
14
14
private function getAuditStatusObject() {
15
15
$new = $this->getNewValue();
16
-
return PhabricatorAuditCommitStatusConstants::newForStatus($new);
16
+
return DiffusionCommitAuditStatus::newForStatus($new);
17
17
}
18
18
19
19
public function getIcon() {
···
28
28
$status = $this->getAuditStatusObject();
29
29
30
30
switch ($status->getKey()) {
31
-
case PhabricatorAuditCommitStatusConstants::MODERN_NONE:
31
+
case DiffusionCommitAuditStatus::NONE:
32
32
return pht('This commit no longer requires audit.');
33
-
case PhabricatorAuditCommitStatusConstants::MODERN_NEEDS_AUDIT:
33
+
case DiffusionCommitAuditStatus::NEEDS_AUDIT:
34
34
return pht('This commit now requires audit.');
35
-
case PhabricatorAuditCommitStatusConstants::MODERN_CONCERN_RAISED:
35
+
case DiffusionCommitAuditStatus::CONCERN_RAISED:
36
36
return pht('This commit now has outstanding concerns.');
37
-
case PhabricatorAuditCommitStatusConstants::MODERN_NEEDS_VERIFICATION:
37
+
case DiffusionCommitAuditStatus::NEEDS_VERIFICATION:
38
38
return pht('This commit now requires verification by auditors.');
39
-
case PhabricatorAuditCommitStatusConstants::MODERN_AUDITED:
39
+
case DiffusionCommitAuditStatus::AUDITED:
40
40
return pht('All concerns with this commit have now been addressed.');
41
41
}
42
42
···
47
47
$status = $this->getAuditStatusObject();
48
48
49
49
switch ($status->getKey()) {
50
-
case PhabricatorAuditCommitStatusConstants::MODERN_NONE:
50
+
case DiffusionCommitAuditStatus::NONE:
51
51
return pht(
52
52
'%s no longer requires audit.',
53
53
$this->renderObject());
54
-
case PhabricatorAuditCommitStatusConstants::MODERN_NEEDS_AUDIT:
54
+
case DiffusionCommitAuditStatus::NEEDS_AUDIT:
55
55
return pht(
56
56
'%s now requires audit.',
57
57
$this->renderObject());
58
-
case PhabricatorAuditCommitStatusConstants::MODERN_CONCERN_RAISED:
58
+
case DiffusionCommitAuditStatus::CONCERN_RAISED:
59
59
return pht(
60
60
'%s now has outstanding concerns.',
61
61
$this->renderObject());
62
-
case PhabricatorAuditCommitStatusConstants::MODERN_NEEDS_VERIFICATION:
62
+
case DiffusionCommitAuditStatus::NEEDS_VERIFICATION:
63
63
return pht(
64
64
'%s now requires verification by auditors.',
65
65
$this->renderObject());
66
-
case PhabricatorAuditCommitStatusConstants::MODERN_AUDITED:
66
+
case DiffusionCommitAuditStatus::AUDITED:
67
67
return pht(
68
68
'All concerns with %s have now been addressed.',
69
69
$this->renderObject());
+1
-2
src/applications/diffusion/xaction/DiffusionCommitVerifyTransaction.php
+1
-2
src/applications/diffusion/xaction/DiffusionCommitVerifyTransaction.php
···
36
36
}
37
37
38
38
public function applyInternalEffects($object, $value) {
39
-
$object->setAuditStatus(
40
-
PhabricatorAuditCommitStatusConstants::MODERN_NEEDS_VERIFICATION);
39
+
$object->setAuditStatus(DiffusionCommitAuditStatus::NEEDS_VERIFICATION);
41
40
}
42
41
43
42
protected function validateAction($object, PhabricatorUser $viewer) {
+1
-2
src/applications/owners/controller/PhabricatorOwnersDetailController.php
+1
-2
src/applications/owners/controller/PhabricatorOwnersDetailController.php
···
71
71
'package' => $package->getPHID(),
72
72
));
73
73
74
-
$status_concern =
75
-
PhabricatorAuditCommitStatusConstants::MODERN_CONCERN_RAISED;
74
+
$status_concern = DiffusionCommitAuditStatus::CONCERN_RAISED;
76
75
77
76
$attention_commits = id(new DiffusionCommitQuery())
78
77
->setViewer($request->getUser())
+8
-10
src/applications/repository/storage/PhabricatorRepositoryCommit.php
+8
-10
src/applications/repository/storage/PhabricatorRepositoryCommit.php
···
27
27
protected $epoch;
28
28
protected $mailKey;
29
29
protected $authorPHID;
30
-
protected $auditStatus = PhabricatorAuditCommitStatusConstants::MODERN_NONE;
30
+
protected $auditStatus = DiffusionCommitAuditStatus::NONE;
31
31
protected $summary = '';
32
32
protected $importStatus = 0;
33
33
···
385
385
if ($this->isAuditStatusNeedsVerification()) {
386
386
// If the change is in "Needs Verification", we keep it there as
387
387
// long as any auditors still have concerns.
388
-
$status =
389
-
PhabricatorAuditCommitStatusConstants::MODERN_NEEDS_VERIFICATION;
388
+
$status = DiffusionCommitAuditStatus::NEEDS_VERIFICATION;
390
389
} else {
391
-
$status = PhabricatorAuditCommitStatusConstants::MODERN_CONCERN_RAISED;
390
+
$status = DiffusionCommitAuditStatus::CONCERN_RAISED;
392
391
}
393
392
} else if ($any_accept) {
394
393
if ($any_need) {
395
-
$status =
396
-
PhabricatorAuditCommitStatusConstants::MODERN_PARTIALLY_AUDITED;
394
+
$status = DiffusionCommitAuditStatus::PARTIALLY_AUDITED;
397
395
} else {
398
-
$status = PhabricatorAuditCommitStatusConstants::MODERN_AUDITED;
396
+
$status = DiffusionCommitAuditStatus::AUDITED;
399
397
}
400
398
} else if ($any_need) {
401
-
$status = PhabricatorAuditCommitStatusConstants::MODERN_NEEDS_AUDIT;
399
+
$status = DiffusionCommitAuditStatus::NEEDS_AUDIT;
402
400
} else {
403
-
$status = PhabricatorAuditCommitStatusConstants::MODERN_NONE;
401
+
$status = DiffusionCommitAuditStatus::NONE;
404
402
}
405
403
406
404
return $this->setAuditStatus($status);
···
531
529
532
530
public function getAuditStatusObject() {
533
531
$status = $this->getAuditStatus();
534
-
return PhabricatorAuditCommitStatusConstants::newForStatus($status);
532
+
return DiffusionCommitAuditStatus::newForStatus($status);
535
533
}
536
534
537
535
public function isAuditStatusNoAudit() {