@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
Modernize Phortune PHID constants
Summary:
Ref T2787. These were still stuck in the stone ages.
(The handles are pretty skeletal but most aren't used anywehre.)
Test Plan: Funded an initiative without anything breaking. Grepped for removed constants.
Reviewers: btrahan
Reviewed By: btrahan
Subscribers: epriestley
Maniphest Tasks: T2787
Differential Revision: https://secure.phabricator.com/D10647
+247
-17
+12
src/__phutil_library_map__.php
+12
src/__phutil_library_map__.php
···
2548
2548
'PholioUploadedImageView' => 'applications/pholio/view/PholioUploadedImageView.php',
2549
2549
'PhortuneAccount' => 'applications/phortune/storage/PhortuneAccount.php',
2550
2550
'PhortuneAccountEditor' => 'applications/phortune/editor/PhortuneAccountEditor.php',
2551
+
'PhortuneAccountPHIDType' => 'applications/phortune/phid/PhortuneAccountPHIDType.php',
2551
2552
'PhortuneAccountQuery' => 'applications/phortune/query/PhortuneAccountQuery.php',
2552
2553
'PhortuneAccountTransaction' => 'applications/phortune/storage/PhortuneAccountTransaction.php',
2553
2554
'PhortuneAccountTransactionQuery' => 'applications/phortune/query/PhortuneAccountTransactionQuery.php',
···
2557
2558
'PhortuneCartCheckoutController' => 'applications/phortune/controller/PhortuneCartCheckoutController.php',
2558
2559
'PhortuneCartController' => 'applications/phortune/controller/PhortuneCartController.php',
2559
2560
'PhortuneCartImplementation' => 'applications/phortune/cart/PhortuneCartImplementation.php',
2561
+
'PhortuneCartPHIDType' => 'applications/phortune/phid/PhortuneCartPHIDType.php',
2560
2562
'PhortuneCartQuery' => 'applications/phortune/query/PhortuneCartQuery.php',
2561
2563
'PhortuneCartViewController' => 'applications/phortune/controller/PhortuneCartViewController.php',
2562
2564
'PhortuneCharge' => 'applications/phortune/storage/PhortuneCharge.php',
2565
+
'PhortuneChargePHIDType' => 'applications/phortune/phid/PhortuneChargePHIDType.php',
2563
2566
'PhortuneChargeQuery' => 'applications/phortune/query/PhortuneChargeQuery.php',
2564
2567
'PhortuneConstants' => 'applications/phortune/constants/PhortuneConstants.php',
2565
2568
'PhortuneController' => 'applications/phortune/controller/PhortuneController.php',
···
2578
2581
'PhortunePaymentMethodCreateController' => 'applications/phortune/controller/PhortunePaymentMethodCreateController.php',
2579
2582
'PhortunePaymentMethodDisableController' => 'applications/phortune/controller/PhortunePaymentMethodDisableController.php',
2580
2583
'PhortunePaymentMethodEditController' => 'applications/phortune/controller/PhortunePaymentMethodEditController.php',
2584
+
'PhortunePaymentMethodPHIDType' => 'applications/phortune/phid/PhortunePaymentMethodPHIDType.php',
2581
2585
'PhortunePaymentMethodQuery' => 'applications/phortune/query/PhortunePaymentMethodQuery.php',
2582
2586
'PhortunePaymentProvider' => 'applications/phortune/provider/PhortunePaymentProvider.php',
2583
2587
'PhortunePaymentProviderTestCase' => 'applications/phortune/provider/__tests__/PhortunePaymentProviderTestCase.php',
···
2585
2589
'PhortuneProduct' => 'applications/phortune/storage/PhortuneProduct.php',
2586
2590
'PhortuneProductImplementation' => 'applications/phortune/product/PhortuneProductImplementation.php',
2587
2591
'PhortuneProductListController' => 'applications/phortune/controller/PhortuneProductListController.php',
2592
+
'PhortuneProductPHIDType' => 'applications/phortune/phid/PhortuneProductPHIDType.php',
2588
2593
'PhortuneProductQuery' => 'applications/phortune/query/PhortuneProductQuery.php',
2589
2594
'PhortuneProductViewController' => 'applications/phortune/controller/PhortuneProductViewController.php',
2590
2595
'PhortuneProviderController' => 'applications/phortune/controller/PhortuneProviderController.php',
2591
2596
'PhortunePurchase' => 'applications/phortune/storage/PhortunePurchase.php',
2597
+
'PhortunePurchasePHIDType' => 'applications/phortune/phid/PhortunePurchasePHIDType.php',
2592
2598
'PhortunePurchaseQuery' => 'applications/phortune/query/PhortunePurchaseQuery.php',
2593
2599
'PhortunePurchaseViewController' => 'applications/phortune/controller/PhortunePurchaseViewController.php',
2594
2600
'PhortuneSchemaSpec' => 'applications/phortune/storage/PhortuneSchemaSpec.php',
···
5574
5580
'PhabricatorPolicyInterface',
5575
5581
),
5576
5582
'PhortuneAccountEditor' => 'PhabricatorApplicationTransactionEditor',
5583
+
'PhortuneAccountPHIDType' => 'PhabricatorPHIDType',
5577
5584
'PhortuneAccountQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
5578
5585
'PhortuneAccountTransaction' => 'PhabricatorApplicationTransaction',
5579
5586
'PhortuneAccountTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
···
5585
5592
),
5586
5593
'PhortuneCartCheckoutController' => 'PhortuneCartController',
5587
5594
'PhortuneCartController' => 'PhortuneController',
5595
+
'PhortuneCartPHIDType' => 'PhabricatorPHIDType',
5588
5596
'PhortuneCartQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
5589
5597
'PhortuneCartViewController' => 'PhortuneCartController',
5590
5598
'PhortuneCharge' => array(
5591
5599
'PhortuneDAO',
5592
5600
'PhabricatorPolicyInterface',
5593
5601
),
5602
+
'PhortuneChargePHIDType' => 'PhabricatorPHIDType',
5594
5603
'PhortuneChargeQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
5595
5604
'PhortuneController' => 'PhabricatorController',
5596
5605
'PhortuneCurrency' => 'Phobject',
···
5610
5619
'PhortunePaymentMethodCreateController' => 'PhortuneController',
5611
5620
'PhortunePaymentMethodDisableController' => 'PhortuneController',
5612
5621
'PhortunePaymentMethodEditController' => 'PhortuneController',
5622
+
'PhortunePaymentMethodPHIDType' => 'PhabricatorPHIDType',
5613
5623
'PhortunePaymentMethodQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
5614
5624
'PhortunePaymentProviderTestCase' => 'PhabricatorTestCase',
5615
5625
'PhortunePaypalPaymentProvider' => 'PhortunePaymentProvider',
···
5618
5628
'PhabricatorPolicyInterface',
5619
5629
),
5620
5630
'PhortuneProductListController' => 'PhabricatorController',
5631
+
'PhortuneProductPHIDType' => 'PhabricatorPHIDType',
5621
5632
'PhortuneProductQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
5622
5633
'PhortuneProductViewController' => 'PhortuneController',
5623
5634
'PhortuneProviderController' => 'PhortuneController',
···
5625
5636
'PhortuneDAO',
5626
5637
'PhabricatorPolicyInterface',
5627
5638
),
5639
+
'PhortunePurchasePHIDType' => 'PhabricatorPHIDType',
5628
5640
'PhortunePurchaseQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
5629
5641
'PhortunePurchaseViewController' => 'PhortuneController',
5630
5642
'PhortuneSchemaSpec' => 'PhabricatorConfigSchemaSpec',
-6
src/applications/phid/PhabricatorPHIDConstants.php
-6
src/applications/phid/PhabricatorPHIDConstants.php
···
7
7
const PHID_TYPE_MAGIC = '!!!!';
8
8
const PHID_TYPE_STRY = 'STRY';
9
9
const PHID_TYPE_TOBJ = 'TOBJ';
10
-
const PHID_TYPE_ACNT = 'ACNT';
11
-
const PHID_TYPE_PDCT = 'PDCT';
12
-
const PHID_TYPE_PRCH = 'PRCH';
13
-
const PHID_TYPE_PAYM = 'PAYM';
14
-
const PHID_TYPE_CHRG = 'CHRG';
15
-
const PHID_TYPE_CART = 'CART';
16
10
const PHID_TYPE_LEGB = 'LEGB';
17
11
18
12
const PHID_TYPE_XCMT = 'XCMT';
+38
src/applications/phortune/phid/PhortuneAccountPHIDType.php
+38
src/applications/phortune/phid/PhortuneAccountPHIDType.php
···
1
+
<?php
2
+
3
+
final class PhortuneAccountPHIDType extends PhabricatorPHIDType {
4
+
5
+
const TYPECONST = 'ACNT';
6
+
7
+
public function getTypeName() {
8
+
return pht('Phortune Account');
9
+
}
10
+
11
+
public function newObject() {
12
+
return new PhortuneAccount();
13
+
}
14
+
15
+
protected function buildQueryForObjects(
16
+
PhabricatorObjectQuery $query,
17
+
array $phids) {
18
+
19
+
return id(new PhortuneAccountQuery())
20
+
->withPHIDs($phids);
21
+
}
22
+
23
+
public function loadHandles(
24
+
PhabricatorHandleQuery $query,
25
+
array $handles,
26
+
array $objects) {
27
+
28
+
foreach ($handles as $phid => $handle) {
29
+
$account = $objects[$phid];
30
+
31
+
$id = $account->getID();
32
+
33
+
$handle->setName(pht('Account %d', $id));
34
+
$handle->setURI("/phortune/{$id}/");
35
+
}
36
+
}
37
+
38
+
}
+38
src/applications/phortune/phid/PhortuneCartPHIDType.php
+38
src/applications/phortune/phid/PhortuneCartPHIDType.php
···
1
+
<?php
2
+
3
+
final class PhortuneCartPHIDType extends PhabricatorPHIDType {
4
+
5
+
const TYPECONST = 'CART';
6
+
7
+
public function getTypeName() {
8
+
return pht('Phortune Cart');
9
+
}
10
+
11
+
public function newObject() {
12
+
return new PhortuneCart();
13
+
}
14
+
15
+
protected function buildQueryForObjects(
16
+
PhabricatorObjectQuery $query,
17
+
array $phids) {
18
+
19
+
return id(new PhortuneCartQuery())
20
+
->withPHIDs($phids);
21
+
}
22
+
23
+
public function loadHandles(
24
+
PhabricatorHandleQuery $query,
25
+
array $handles,
26
+
array $objects) {
27
+
28
+
foreach ($handles as $phid => $handle) {
29
+
$cart = $objects[$phid];
30
+
31
+
$id = $cart->getID();
32
+
33
+
$handle->setName(pht('Cart %d', $id));
34
+
$handle->setURI("/phortune/cart/{$id}/");
35
+
}
36
+
}
37
+
38
+
}
+38
src/applications/phortune/phid/PhortuneChargePHIDType.php
+38
src/applications/phortune/phid/PhortuneChargePHIDType.php
···
1
+
<?php
2
+
3
+
final class PhortuneChargePHIDType extends PhabricatorPHIDType {
4
+
5
+
const TYPECONST = 'CHRG';
6
+
7
+
public function getTypeName() {
8
+
return pht('Phortune Charge');
9
+
}
10
+
11
+
public function newObject() {
12
+
return new PhortuneCharge();
13
+
}
14
+
15
+
protected function buildQueryForObjects(
16
+
PhabricatorObjectQuery $query,
17
+
array $phids) {
18
+
19
+
return id(new PhortuneChargeQuery())
20
+
->withPHIDs($phids);
21
+
}
22
+
23
+
public function loadHandles(
24
+
PhabricatorHandleQuery $query,
25
+
array $handles,
26
+
array $objects) {
27
+
28
+
foreach ($handles as $phid => $handle) {
29
+
$charge = $objects[$phid];
30
+
31
+
$id = $charge->getID();
32
+
33
+
$handle->setName(pht('Charge %d', $id));
34
+
$handle->setURI("/phortune/charge/{$id}/");
35
+
}
36
+
}
37
+
38
+
}
+38
src/applications/phortune/phid/PhortunePaymentMethodPHIDType.php
+38
src/applications/phortune/phid/PhortunePaymentMethodPHIDType.php
···
1
+
<?php
2
+
3
+
final class PhortunePaymentMethodPHIDType extends PhabricatorPHIDType {
4
+
5
+
const TYPECONST = 'PAYM';
6
+
7
+
public function getTypeName() {
8
+
return pht('Phortune Payment Method');
9
+
}
10
+
11
+
public function newObject() {
12
+
return new PhortunePaymentMethod();
13
+
}
14
+
15
+
protected function buildQueryForObjects(
16
+
PhabricatorObjectQuery $query,
17
+
array $phids) {
18
+
19
+
return id(new PhortunePaymentMethodQuery())
20
+
->withPHIDs($phids);
21
+
}
22
+
23
+
public function loadHandles(
24
+
PhabricatorHandleQuery $query,
25
+
array $handles,
26
+
array $objects) {
27
+
28
+
foreach ($handles as $phid => $handle) {
29
+
$method = $objects[$phid];
30
+
31
+
$id = $method->getID();
32
+
33
+
$handle->setName(pht('Method %d', $id));
34
+
$handle->setURI("/phortune/method/{$id}/");
35
+
}
36
+
}
37
+
38
+
}
+38
src/applications/phortune/phid/PhortuneProductPHIDType.php
+38
src/applications/phortune/phid/PhortuneProductPHIDType.php
···
1
+
<?php
2
+
3
+
final class PhortuneProductPHIDType extends PhabricatorPHIDType {
4
+
5
+
const TYPECONST = 'PDCT';
6
+
7
+
public function getTypeName() {
8
+
return pht('Phortune Product');
9
+
}
10
+
11
+
public function newObject() {
12
+
return new PhortuneProduct();
13
+
}
14
+
15
+
protected function buildQueryForObjects(
16
+
PhabricatorObjectQuery $query,
17
+
array $phids) {
18
+
19
+
return id(new PhortuneProductQuery())
20
+
->withPHIDs($phids);
21
+
}
22
+
23
+
public function loadHandles(
24
+
PhabricatorHandleQuery $query,
25
+
array $handles,
26
+
array $objects) {
27
+
28
+
foreach ($handles as $phid => $handle) {
29
+
$product = $objects[$phid];
30
+
31
+
$id = $product->getID();
32
+
33
+
$handle->setName(pht('Product %d', $id));
34
+
$handle->setURI("/phortune/product/{$id}/");
35
+
}
36
+
}
37
+
38
+
}
+38
src/applications/phortune/phid/PhortunePurchasePHIDType.php
+38
src/applications/phortune/phid/PhortunePurchasePHIDType.php
···
1
+
<?php
2
+
3
+
final class PhortunePurchasePHIDType extends PhabricatorPHIDType {
4
+
5
+
const TYPECONST = 'PRCH';
6
+
7
+
public function getTypeName() {
8
+
return pht('Phortune Purchase');
9
+
}
10
+
11
+
public function newObject() {
12
+
return new PhortunePurchase();
13
+
}
14
+
15
+
protected function buildQueryForObjects(
16
+
PhabricatorObjectQuery $query,
17
+
array $phids) {
18
+
19
+
return id(new PhortunePurchaseQuery())
20
+
->withPHIDs($phids);
21
+
}
22
+
23
+
public function loadHandles(
24
+
PhabricatorHandleQuery $query,
25
+
array $handles,
26
+
array $objects) {
27
+
28
+
foreach ($handles as $phid => $handle) {
29
+
$purchase = $objects[$phid];
30
+
31
+
$id = $purchase->getID();
32
+
33
+
$handle->setName(pht('Purchase %d', $id));
34
+
$handle->setURI("/phortune/purchase/{$id}/");
35
+
}
36
+
}
37
+
38
+
}
+1
-1
src/applications/phortune/storage/PhortuneAccount.php
+1
-1
src/applications/phortune/storage/PhortuneAccount.php
+1
-1
src/applications/phortune/storage/PhortuneAccountTransaction.php
+1
-1
src/applications/phortune/storage/PhortuneAccountTransaction.php
+1
-1
src/applications/phortune/storage/PhortuneCart.php
+1
-1
src/applications/phortune/storage/PhortuneCart.php
+1
-1
src/applications/phortune/storage/PhortuneCharge.php
+1
-1
src/applications/phortune/storage/PhortuneCharge.php
+1
-1
src/applications/phortune/storage/PhortunePaymentMethod.php
+1
-1
src/applications/phortune/storage/PhortunePaymentMethod.php
+1
-1
src/applications/phortune/storage/PhortuneProduct.php
+1
-1
src/applications/phortune/storage/PhortuneProduct.php
+1
-2
src/applications/phortune/storage/PhortunePurchase.php
+1
-2
src/applications/phortune/storage/PhortunePurchase.php
···
60
60
}
61
61
62
62
public function generatePHID() {
63
-
return PhabricatorPHID::generateNewPHID(
64
-
PhabricatorPHIDConstants::PHID_TYPE_PRCH);
63
+
return PhabricatorPHID::generateNewPHID(PhortuneChargePHIDType::TYPECONST);
65
64
}
66
65
67
66
public function attachCart(PhortuneCart $cart) {
-3
src/infrastructure/edges/constants/PhabricatorEdgeConfig.php
-3
src/infrastructure/edges/constants/PhabricatorEdgeConfig.php
···
227
227
228
228
static $class_map = array(
229
229
PhabricatorPHIDConstants::PHID_TYPE_TOBJ => 'HarbormasterObject',
230
-
PhabricatorPHIDConstants::PHID_TYPE_ACNT => 'PhortuneAccount',
231
-
PhabricatorPHIDConstants::PHID_TYPE_PRCH => 'PhortunePurchase',
232
-
PhabricatorPHIDConstants::PHID_TYPE_CHRG => 'PhortuneCharge',
233
230
PhabricatorPHIDConstants::PHID_TYPE_XOBJ => 'DoorkeeperExternalObject',
234
231
);
235
232