@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 ManiphestTransactionPro -> ManiphestTransaction
Summary: Ref T2217. Pro is the new standard.
Test Plan: Lots of `grep`, made a pile of Maniphest views/edits.
Reviewers: btrahan
Reviewed By: btrahan
CC: aran
Maniphest Tasks: T2217
Differential Revision: https://secure.phabricator.com/D7093
+76
-70
+6
-5
resources/sql/patches/20130921.xmigratemaniphest.php
+6
-5
resources/sql/patches/20130921.xmigratemaniphest.php
···
6
6
$rows = new LiskRawMigrationIterator($conn_w, 'maniphest_transaction');
7
7
$conn_w->openTransaction();
8
8
9
-
$xaction_table = new ManiphestTransactionPro();
10
-
$comment_table = new ManiphestTransactionComment();
9
+
// NOTE: These were the correct table names at the time of this patch.
10
+
$xaction_table_name = 'maniphest_transaction_pro';
11
+
$comment_table_name = 'maniphest_transaction_comment';
11
12
12
13
foreach ($rows as $row) {
13
14
$row_id = $row['id'];
···
70
71
commentPHID, commentVersion, transactionType, oldValue, newValue,
71
72
contentSource, metadata, dateCreated, dateModified)
72
73
VALUES (%s, %s, %s, %s, %s, %s, %d, %s, %ns, %ns, %s, %s, %d, %d)',
73
-
$xaction_table->getTableName(),
74
+
$xaction_table_name,
74
75
$xaction_phid,
75
76
$row['authorPHID'],
76
77
$task_phid,
···
106
107
editPolicy, commentVersion, content, contentSource, isDeleted,
107
108
dateCreated, dateModified)
108
109
VALUES (%s, %s, %s, %s, %s, %d, %s, %s, %d, %d, %d)',
109
-
$comment_table->getTableName(),
110
+
$comment_table_name,
110
111
$comment_phid,
111
112
$comment_xaction_phid,
112
113
$row['authorPHID'],
···
125
126
commentPHID, commentVersion, transactionType, oldValue, newValue,
126
127
contentSource, metadata, dateCreated, dateModified)
127
128
VALUES (%s, %s, %s, %s, %s, %s, %d, %s, %ns, %ns, %s, %s, %d, %d)',
128
-
$xaction_table->getTableName(),
129
+
$xaction_table_name,
129
130
$comment_xaction_phid,
130
131
$row['authorPHID'],
131
132
$task_phid,
+2
-2
src/__phutil_library_map__.php
+2
-2
src/__phutil_library_map__.php
···
731
731
'ManiphestTaskSearchEngine' => 'applications/maniphest/query/ManiphestTaskSearchEngine.php',
732
732
'ManiphestTaskStatus' => 'applications/maniphest/constants/ManiphestTaskStatus.php',
733
733
'ManiphestTaskSubscriber' => 'applications/maniphest/storage/ManiphestTaskSubscriber.php',
734
+
'ManiphestTransaction' => 'applications/maniphest/storage/ManiphestTransaction.php',
734
735
'ManiphestTransactionComment' => 'applications/maniphest/storage/ManiphestTransactionComment.php',
735
736
'ManiphestTransactionEditor' => 'applications/maniphest/editor/ManiphestTransactionEditor.php',
736
737
'ManiphestTransactionEditorPro' => 'applications/maniphest/editor/ManiphestTransactionEditorPro.php',
737
738
'ManiphestTransactionPreviewController' => 'applications/maniphest/controller/ManiphestTransactionPreviewController.php',
738
-
'ManiphestTransactionPro' => 'applications/maniphest/storage/ManiphestTransactionPro.php',
739
739
'ManiphestTransactionQuery' => 'applications/maniphest/query/ManiphestTransactionQuery.php',
740
740
'ManiphestTransactionSaveController' => 'applications/maniphest/controller/ManiphestTransactionSaveController.php',
741
741
'ManiphestTransactionType' => 'applications/maniphest/constants/ManiphestTransactionType.php',
···
2822
2822
'ManiphestTaskSearchEngine' => 'PhabricatorApplicationSearchEngine',
2823
2823
'ManiphestTaskStatus' => 'ManiphestConstants',
2824
2824
'ManiphestTaskSubscriber' => 'ManiphestDAO',
2825
+
'ManiphestTransaction' => 'PhabricatorApplicationTransaction',
2825
2826
'ManiphestTransactionComment' => 'PhabricatorApplicationTransactionComment',
2826
2827
'ManiphestTransactionEditor' => 'PhabricatorEditor',
2827
2828
'ManiphestTransactionEditorPro' => 'PhabricatorApplicationTransactionEditor',
2828
2829
'ManiphestTransactionPreviewController' => 'ManiphestController',
2829
-
'ManiphestTransactionPro' => 'PhabricatorApplicationTransaction',
2830
2830
'ManiphestTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
2831
2831
'ManiphestTransactionSaveController' => 'ManiphestController',
2832
2832
'ManiphestTransactionType' => 'ManiphestConstants',
+1
-1
src/applications/maniphest/conduit/ConduitAPI_maniphest_Method.php
+1
-1
src/applications/maniphest/conduit/ConduitAPI_maniphest_Method.php
+1
-1
src/applications/maniphest/controller/ManiphestBatchEditController.php
+1
-1
src/applications/maniphest/controller/ManiphestBatchEditController.php
+2
-2
src/applications/maniphest/controller/ManiphestReportController.php
+2
-2
src/applications/maniphest/controller/ManiphestReportController.php
···
79
79
$handle = $handles[$project_phid];
80
80
}
81
81
82
-
$table = new ManiphestTransactionPro();
82
+
$table = new ManiphestTransaction();
83
83
$conn = $table->establishConnection('r');
84
84
85
85
$joins = '';
···
652
652
list($ignored, $window_epoch) = $this->getWindow();
653
653
654
654
$table = new ManiphestTask();
655
-
$xtable = new ManiphestTransactionPro();
655
+
$xtable = new ManiphestTransaction();
656
656
$conn_r = $table->establishConnection('r');
657
657
658
658
$tasks = queryfx_all(
+2
-2
src/applications/maniphest/controller/ManiphestSubpriorityController.php
+2
-2
src/applications/maniphest/controller/ManiphestSubpriorityController.php
···
38
38
39
39
if ($after_pri != $task->getPriority()) {
40
40
$xactions = array();
41
-
$xactions[] = id(new ManiphestTransactionPro())
42
-
->setTransactionType(ManiphestTransactionPro::TYPE_PRIORITY)
41
+
$xactions[] = id(new ManiphestTransaction())
42
+
->setTransactionType(ManiphestTransaction::TYPE_PRIORITY)
43
43
->setNewValue($after_pri);
44
44
45
45
$editor = id(new ManiphestTransactionEditorPro())
+2
-2
src/applications/maniphest/controller/ManiphestSubscribeController.php
+2
-2
src/applications/maniphest/controller/ManiphestSubscribeController.php
···
32
32
return new Aphront400Response();
33
33
}
34
34
35
-
$xaction = id(new ManiphestTransactionPro())
36
-
->setTransactionType(ManiphestTransactionPro::TYPE_CCS)
35
+
$xaction = id(new ManiphestTransaction())
36
+
->setTransactionType(ManiphestTransaction::TYPE_CCS)
37
37
->setNewValue($ccs);
38
38
39
39
$editor = id(new ManiphestTransactionEditorPro())
+2
-2
src/applications/maniphest/controller/ManiphestTaskEditController.php
+2
-2
src/applications/maniphest/controller/ManiphestTaskEditController.php
···
153
153
$placeholder_editor,
154
154
PhabricatorTransactions::TYPE_CUSTOMFIELD,
155
155
array(
156
-
id(new ManiphestTransactionPro())
156
+
id(new ManiphestTransaction())
157
157
->setOldValue($aux_old_value)
158
158
->setNewValue($aux_new_value),
159
159
));
···
210
210
'ip' => $request->getRemoteAddr(),
211
211
));
212
212
213
-
$template = new ManiphestTransactionPro();
213
+
$template = new ManiphestTransaction();
214
214
$transactions = array();
215
215
216
216
foreach ($changes as $type => $value) {
+1
-1
src/applications/maniphest/controller/ManiphestTransactionPreviewController.php
+1
-1
src/applications/maniphest/controller/ManiphestTransactionPreviewController.php
+5
-5
src/applications/maniphest/controller/ManiphestTransactionSaveController.php
+5
-5
src/applications/maniphest/controller/ManiphestTransactionSaveController.php
···
59
59
}
60
60
$new[PhabricatorFilePHIDTypeFile::TYPECONST][$phid] = array();
61
61
}
62
-
$transaction = new ManiphestTransactionPro();
62
+
$transaction = new ManiphestTransaction();
63
63
$transaction
64
64
->setTransactionType(ManiphestTransactionType::TYPE_ATTACH);
65
65
$transaction->setNewValue($new);
···
76
76
$request->getStr('comments'),
77
77
));
78
78
79
-
$cc_transaction = new ManiphestTransactionPro();
79
+
$cc_transaction = new ManiphestTransaction();
80
80
$cc_transaction
81
81
->setTransactionType(ManiphestTransactionType::TYPE_CCS);
82
82
$force_cc_transaction = false;
83
83
84
-
$transaction = new ManiphestTransactionPro();
84
+
$transaction = new ManiphestTransaction();
85
85
$transaction
86
86
->setTransactionType($action);
87
87
···
136
136
}
137
137
138
138
if ($request->getStr('comments')) {
139
-
$transactions[] = id(new ManiphestTransactionPro())
139
+
$transactions[] = id(new ManiphestTransaction())
140
140
->setTransactionType(PhabricatorTransactions::TYPE_COMMENT)
141
141
->attachComment(
142
142
id(new ManiphestTransactionComment())
···
165
165
ManiphestTaskStatus::STATUS_OPEN) {
166
166
// Closing an unassigned task. Assign the user as the owner of
167
167
// this task.
168
-
$assign = new ManiphestTransactionPro();
168
+
$assign = new ManiphestTransaction();
169
169
$assign->setTransactionType(ManiphestTransactionType::TYPE_OWNER);
170
170
$assign->setNewValue($user->getPHID());
171
171
$transactions[] = $assign;
+36
-36
src/applications/maniphest/editor/ManiphestTransactionEditorPro.php
+36
-36
src/applications/maniphest/editor/ManiphestTransactionEditorPro.php
···
7
7
$types = parent::getTransactionTypes();
8
8
9
9
$types[] = PhabricatorTransactions::TYPE_COMMENT;
10
-
$types[] = ManiphestTransactionPro::TYPE_PRIORITY;
11
-
$types[] = ManiphestTransactionPro::TYPE_STATUS;
12
-
$types[] = ManiphestTransactionPro::TYPE_TITLE;
13
-
$types[] = ManiphestTransactionPro::TYPE_DESCRIPTION;
14
-
$types[] = ManiphestTransactionPro::TYPE_OWNER;
15
-
$types[] = ManiphestTransactionPro::TYPE_CCS;
16
-
$types[] = ManiphestTransactionPro::TYPE_PROJECTS;
17
-
$types[] = ManiphestTransactionPro::TYPE_ATTACH;
18
-
$types[] = ManiphestTransactionPro::TYPE_EDGE;
10
+
$types[] = ManiphestTransaction::TYPE_PRIORITY;
11
+
$types[] = ManiphestTransaction::TYPE_STATUS;
12
+
$types[] = ManiphestTransaction::TYPE_TITLE;
13
+
$types[] = ManiphestTransaction::TYPE_DESCRIPTION;
14
+
$types[] = ManiphestTransaction::TYPE_OWNER;
15
+
$types[] = ManiphestTransaction::TYPE_CCS;
16
+
$types[] = ManiphestTransaction::TYPE_PROJECTS;
17
+
$types[] = ManiphestTransaction::TYPE_ATTACH;
18
+
$types[] = ManiphestTransaction::TYPE_EDGE;
19
19
20
20
return $types;
21
21
}
···
25
25
PhabricatorApplicationTransaction $xaction) {
26
26
27
27
switch ($xaction->getTransactionType()) {
28
-
case ManiphestTransactionPro::TYPE_PRIORITY:
28
+
case ManiphestTransaction::TYPE_PRIORITY:
29
29
return (int)$object->getPriority();
30
-
case ManiphestTransactionPro::TYPE_STATUS:
30
+
case ManiphestTransaction::TYPE_STATUS:
31
31
return (int)$object->getStatus();
32
-
case ManiphestTransactionPro::TYPE_TITLE:
32
+
case ManiphestTransaction::TYPE_TITLE:
33
33
return $object->getTitle();
34
-
case ManiphestTransactionPro::TYPE_DESCRIPTION:
34
+
case ManiphestTransaction::TYPE_DESCRIPTION:
35
35
return $object->getDescription();
36
-
case ManiphestTransactionPro::TYPE_OWNER:
36
+
case ManiphestTransaction::TYPE_OWNER:
37
37
return $object->getOwnerPHID();
38
-
case ManiphestTransactionPro::TYPE_CCS:
38
+
case ManiphestTransaction::TYPE_CCS:
39
39
return array_values(array_unique($object->getCCPHIDs()));
40
-
case ManiphestTransactionPro::TYPE_PROJECTS:
40
+
case ManiphestTransaction::TYPE_PROJECTS:
41
41
return $object->getProjectPHIDs();
42
-
case ManiphestTransactionPro::TYPE_ATTACH:
42
+
case ManiphestTransaction::TYPE_ATTACH:
43
43
return $object->getAttached();
44
-
case ManiphestTransactionPro::TYPE_EDGE:
44
+
case ManiphestTransaction::TYPE_EDGE:
45
45
// These are pre-populated.
46
46
return $xaction->getOldValue();
47
47
}
···
53
53
PhabricatorApplicationTransaction $xaction) {
54
54
55
55
switch ($xaction->getTransactionType()) {
56
-
case ManiphestTransactionPro::TYPE_PRIORITY:
57
-
case ManiphestTransactionPro::TYPE_STATUS:
56
+
case ManiphestTransaction::TYPE_PRIORITY:
57
+
case ManiphestTransaction::TYPE_STATUS:
58
58
return (int)$xaction->getNewValue();
59
-
case ManiphestTransactionPro::TYPE_CCS:
59
+
case ManiphestTransaction::TYPE_CCS:
60
60
return array_values(array_unique($xaction->getNewValue()));
61
-
case ManiphestTransactionPro::TYPE_TITLE:
62
-
case ManiphestTransactionPro::TYPE_DESCRIPTION:
63
-
case ManiphestTransactionPro::TYPE_OWNER:
64
-
case ManiphestTransactionPro::TYPE_PROJECTS:
65
-
case ManiphestTransactionPro::TYPE_ATTACH:
66
-
case ManiphestTransactionPro::TYPE_EDGE:
61
+
case ManiphestTransaction::TYPE_TITLE:
62
+
case ManiphestTransaction::TYPE_DESCRIPTION:
63
+
case ManiphestTransaction::TYPE_OWNER:
64
+
case ManiphestTransaction::TYPE_PROJECTS:
65
+
case ManiphestTransaction::TYPE_ATTACH:
66
+
case ManiphestTransaction::TYPE_EDGE:
67
67
return $xaction->getNewValue();
68
68
}
69
69
···
74
74
PhabricatorApplicationTransaction $xaction) {
75
75
76
76
switch ($xaction->getTransactionType()) {
77
-
case ManiphestTransactionPro::TYPE_PRIORITY:
77
+
case ManiphestTransaction::TYPE_PRIORITY:
78
78
return $object->setPriority($xaction->getNewValue());
79
-
case ManiphestTransactionPro::TYPE_STATUS:
79
+
case ManiphestTransaction::TYPE_STATUS:
80
80
return $object->setStatus($xaction->getNewValue());
81
-
case ManiphestTransactionPro::TYPE_TITLE:
81
+
case ManiphestTransaction::TYPE_TITLE:
82
82
return $object->setTitle($xaction->getNewValue());
83
-
case ManiphestTransactionPro::TYPE_DESCRIPTION:
83
+
case ManiphestTransaction::TYPE_DESCRIPTION:
84
84
return $object->setDescription($xaction->getNewValue());
85
-
case ManiphestTransactionPro::TYPE_OWNER:
85
+
case ManiphestTransaction::TYPE_OWNER:
86
86
return $object->setOwnerPHID($xaction->getNewValue());
87
-
case ManiphestTransactionPro::TYPE_CCS:
87
+
case ManiphestTransaction::TYPE_CCS:
88
88
return $object->setCCPHIDs($xaction->getNewValue());
89
-
case ManiphestTransactionPro::TYPE_PROJECTS:
89
+
case ManiphestTransaction::TYPE_PROJECTS:
90
90
return $object->setProjectPHIDs($xaction->getNewValue());
91
-
case ManiphestTransactionPro::TYPE_ATTACH:
91
+
case ManiphestTransaction::TYPE_ATTACH:
92
92
return $object->setAttached($xaction->getNewValue());
93
-
case ManiphestTransactionPro::TYPE_EDGE:
93
+
case ManiphestTransaction::TYPE_EDGE:
94
94
// These are a weird, funky mess and are already being applied by the
95
95
// time we reach this.
96
96
return;
+1
-1
src/applications/maniphest/event/ManiphestEdgeEventListener.php
+1
-1
src/applications/maniphest/event/ManiphestEdgeEventListener.php
+1
-1
src/applications/maniphest/lipsum/PhabricatorManiphestTaskTestDataGenerator.php
+1
-1
src/applications/maniphest/lipsum/PhabricatorManiphestTaskTestDataGenerator.php
+1
-1
src/applications/maniphest/mail/ManiphestReplyHandler.php
+1
-1
src/applications/maniphest/mail/ManiphestReplyHandler.php
+1
-1
src/applications/maniphest/query/ManiphestTransactionQuery.php
+1
-1
src/applications/maniphest/query/ManiphestTransactionQuery.php
+1
-1
src/applications/maniphest/storage/ManiphestTransactionComment.php
+1
-1
src/applications/maniphest/storage/ManiphestTransactionComment.php
+6
-1
src/applications/maniphest/storage/ManiphestTransactionPro.php
src/applications/maniphest/storage/ManiphestTransaction.php
+6
-1
src/applications/maniphest/storage/ManiphestTransactionPro.php
src/applications/maniphest/storage/ManiphestTransaction.php
···
1
1
<?php
2
2
3
-
final class ManiphestTransactionPro
3
+
final class ManiphestTransaction
4
4
extends PhabricatorApplicationTransaction {
5
5
6
6
const TYPE_TITLE = 'title';
···
15
15
16
16
public function getApplicationName() {
17
17
return 'maniphest';
18
+
}
19
+
20
+
public function getTableName() {
21
+
// TODO: Remove once the "pro" table gets renamed.
22
+
return 'maniphest_transactionpro';
18
23
}
19
24
20
25
public function getApplicationTransactionType() {
+4
-4
src/applications/search/controller/PhabricatorSearchAttachController.php
+4
-4
src/applications/search/controller/PhabricatorSearchAttachController.php
···
175
175
$target->getAuthorPHID(),
176
176
$target->getOwnerPHID());
177
177
178
-
$close_task = id(new ManiphestTransactionPro())
178
+
$close_task = id(new ManiphestTransaction())
179
179
->setTransactionType(ManiphestTransactionType::TYPE_STATUS)
180
180
->setNewValue(ManiphestTaskStatus::STATUS_CLOSED_DUPLICATE);
181
181
182
-
$merge_comment = id(new ManiphestTransactionPro())
182
+
$merge_comment = id(new ManiphestTransaction())
183
183
->setTransactionType(PhabricatorTransactions::TYPE_COMMENT)
184
184
->attachComment(
185
185
id(new ManiphestTransactionComment())
···
200
200
201
201
$task_names = implode(', ', $task_names);
202
202
203
-
$add_ccs = id(new ManiphestTransactionPro())
203
+
$add_ccs = id(new ManiphestTransaction())
204
204
->setTransactionType(ManiphestTransactionType::TYPE_CCS)
205
205
->setNewValue($all_ccs);
206
206
207
-
$merged_comment = id(new ManiphestTransactionPro())
207
+
$merged_comment = id(new ManiphestTransaction())
208
208
->setTransactionType(PhabricatorTransactions::TYPE_COMMENT)
209
209
->attachComment(
210
210
id(new ManiphestTransactionComment())
+1
-1
src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+1
-1
src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php