Page MenuHomePhabricator
Files F15381396

D17587.diff
No OneTemporary
Actions

D17587.diff
View Options

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -4311,35 +4311,35 @@
'PholioTransactionView' => 'applications/pholio/view/PholioTransactionView.php',
'PholioUploadedImageView' => 'applications/pholio/view/PholioUploadedImageView.php',
'PhortuneAccount' => 'applications/phortune/storage/PhortuneAccount.php',
- 'PhortuneAccountEditController' => 'applications/phortune/controller/PhortuneAccountEditController.php',
+ 'PhortuneAccountChargeListController' => 'applications/phortune/controller/account/PhortuneAccountChargeListController.php',
+ 'PhortuneAccountEditController' => 'applications/phortune/controller/account/PhortuneAccountEditController.php',
'PhortuneAccountEditor' => 'applications/phortune/editor/PhortuneAccountEditor.php',
'PhortuneAccountHasMemberEdgeType' => 'applications/phortune/edge/PhortuneAccountHasMemberEdgeType.php',
- 'PhortuneAccountListController' => 'applications/phortune/controller/PhortuneAccountListController.php',
+ 'PhortuneAccountListController' => 'applications/phortune/controller/account/PhortuneAccountListController.php',
'PhortuneAccountPHIDType' => 'applications/phortune/phid/PhortuneAccountPHIDType.php',
'PhortuneAccountQuery' => 'applications/phortune/query/PhortuneAccountQuery.php',
'PhortuneAccountTransaction' => 'applications/phortune/storage/PhortuneAccountTransaction.php',
'PhortuneAccountTransactionQuery' => 'applications/phortune/query/PhortuneAccountTransactionQuery.php',
- 'PhortuneAccountViewController' => 'applications/phortune/controller/PhortuneAccountViewController.php',
+ 'PhortuneAccountViewController' => 'applications/phortune/controller/account/PhortuneAccountViewController.php',
'PhortuneAdHocCart' => 'applications/phortune/cart/PhortuneAdHocCart.php',
'PhortuneAdHocProduct' => 'applications/phortune/product/PhortuneAdHocProduct.php',
'PhortuneCart' => 'applications/phortune/storage/PhortuneCart.php',
- 'PhortuneCartAcceptController' => 'applications/phortune/controller/PhortuneCartAcceptController.php',
- 'PhortuneCartCancelController' => 'applications/phortune/controller/PhortuneCartCancelController.php',
- 'PhortuneCartCheckoutController' => 'applications/phortune/controller/PhortuneCartCheckoutController.php',
- 'PhortuneCartController' => 'applications/phortune/controller/PhortuneCartController.php',
+ 'PhortuneCartAcceptController' => 'applications/phortune/controller/cart/PhortuneCartAcceptController.php',
+ 'PhortuneCartCancelController' => 'applications/phortune/controller/cart/PhortuneCartCancelController.php',
+ 'PhortuneCartCheckoutController' => 'applications/phortune/controller/cart/PhortuneCartCheckoutController.php',
+ 'PhortuneCartController' => 'applications/phortune/controller/cart/PhortuneCartController.php',
'PhortuneCartEditor' => 'applications/phortune/editor/PhortuneCartEditor.php',
'PhortuneCartImplementation' => 'applications/phortune/cart/PhortuneCartImplementation.php',
- 'PhortuneCartListController' => 'applications/phortune/controller/PhortuneCartListController.php',
+ 'PhortuneCartListController' => 'applications/phortune/controller/cart/PhortuneCartListController.php',
'PhortuneCartPHIDType' => 'applications/phortune/phid/PhortuneCartPHIDType.php',
'PhortuneCartQuery' => 'applications/phortune/query/PhortuneCartQuery.php',
'PhortuneCartReplyHandler' => 'applications/phortune/mail/PhortuneCartReplyHandler.php',
'PhortuneCartSearchEngine' => 'applications/phortune/query/PhortuneCartSearchEngine.php',
'PhortuneCartTransaction' => 'applications/phortune/storage/PhortuneCartTransaction.php',
'PhortuneCartTransactionQuery' => 'applications/phortune/query/PhortuneCartTransactionQuery.php',
- 'PhortuneCartUpdateController' => 'applications/phortune/controller/PhortuneCartUpdateController.php',
- 'PhortuneCartViewController' => 'applications/phortune/controller/PhortuneCartViewController.php',
+ 'PhortuneCartUpdateController' => 'applications/phortune/controller/cart/PhortuneCartUpdateController.php',
+ 'PhortuneCartViewController' => 'applications/phortune/controller/cart/PhortuneCartViewController.php',
'PhortuneCharge' => 'applications/phortune/storage/PhortuneCharge.php',
- 'PhortuneChargeListController' => 'applications/phortune/controller/PhortuneChargeListController.php',
'PhortuneChargePHIDType' => 'applications/phortune/phid/PhortuneChargePHIDType.php',
'PhortuneChargeQuery' => 'applications/phortune/query/PhortuneChargeQuery.php',
'PhortuneChargeSearchEngine' => 'applications/phortune/query/PhortuneChargeSearchEngine.php',
@@ -4358,27 +4358,27 @@
'PhortuneMemberHasMerchantEdgeType' => 'applications/phortune/edge/PhortuneMemberHasMerchantEdgeType.php',
'PhortuneMerchant' => 'applications/phortune/storage/PhortuneMerchant.php',
'PhortuneMerchantCapability' => 'applications/phortune/capability/PhortuneMerchantCapability.php',
- 'PhortuneMerchantController' => 'applications/phortune/controller/PhortuneMerchantController.php',
- 'PhortuneMerchantEditController' => 'applications/phortune/controller/PhortuneMerchantEditController.php',
+ 'PhortuneMerchantController' => 'applications/phortune/controller/merchant/PhortuneMerchantController.php',
+ 'PhortuneMerchantEditController' => 'applications/phortune/controller/merchant/PhortuneMerchantEditController.php',
'PhortuneMerchantEditEngine' => 'applications/phortune/editor/PhortuneMerchantEditEngine.php',
'PhortuneMerchantEditor' => 'applications/phortune/editor/PhortuneMerchantEditor.php',
'PhortuneMerchantHasMemberEdgeType' => 'applications/phortune/edge/PhortuneMerchantHasMemberEdgeType.php',
- 'PhortuneMerchantInvoiceCreateController' => 'applications/phortune/controller/PhortuneMerchantInvoiceCreateController.php',
- 'PhortuneMerchantListController' => 'applications/phortune/controller/PhortuneMerchantListController.php',
+ 'PhortuneMerchantInvoiceCreateController' => 'applications/phortune/controller/merchant/PhortuneMerchantInvoiceCreateController.php',
+ 'PhortuneMerchantListController' => 'applications/phortune/controller/merchant/PhortuneMerchantListController.php',
'PhortuneMerchantPHIDType' => 'applications/phortune/phid/PhortuneMerchantPHIDType.php',
- 'PhortuneMerchantPictureController' => 'applications/phortune/controller/PhortuneMerchantPictureController.php',
+ 'PhortuneMerchantPictureController' => 'applications/phortune/controller/merchant/PhortuneMerchantPictureController.php',
'PhortuneMerchantQuery' => 'applications/phortune/query/PhortuneMerchantQuery.php',
'PhortuneMerchantSearchEngine' => 'applications/phortune/query/PhortuneMerchantSearchEngine.php',
'PhortuneMerchantTransaction' => 'applications/phortune/storage/PhortuneMerchantTransaction.php',
'PhortuneMerchantTransactionQuery' => 'applications/phortune/query/PhortuneMerchantTransactionQuery.php',
- 'PhortuneMerchantViewController' => 'applications/phortune/controller/PhortuneMerchantViewController.php',
+ 'PhortuneMerchantViewController' => 'applications/phortune/controller/merchant/PhortuneMerchantViewController.php',
'PhortuneMonthYearExpiryControl' => 'applications/phortune/control/PhortuneMonthYearExpiryControl.php',
'PhortuneOrderTableView' => 'applications/phortune/view/PhortuneOrderTableView.php',
'PhortunePayPalPaymentProvider' => 'applications/phortune/provider/PhortunePayPalPaymentProvider.php',
'PhortunePaymentMethod' => 'applications/phortune/storage/PhortunePaymentMethod.php',
- 'PhortunePaymentMethodCreateController' => 'applications/phortune/controller/PhortunePaymentMethodCreateController.php',
- 'PhortunePaymentMethodDisableController' => 'applications/phortune/controller/PhortunePaymentMethodDisableController.php',
- 'PhortunePaymentMethodEditController' => 'applications/phortune/controller/PhortunePaymentMethodEditController.php',
+ 'PhortunePaymentMethodCreateController' => 'applications/phortune/controller/payment/PhortunePaymentMethodCreateController.php',
+ 'PhortunePaymentMethodDisableController' => 'applications/phortune/controller/payment/PhortunePaymentMethodDisableController.php',
+ 'PhortunePaymentMethodEditController' => 'applications/phortune/controller/payment/PhortunePaymentMethodEditController.php',
'PhortunePaymentMethodPHIDType' => 'applications/phortune/phid/PhortunePaymentMethodPHIDType.php',
'PhortunePaymentMethodQuery' => 'applications/phortune/query/PhortunePaymentMethodQuery.php',
'PhortunePaymentProvider' => 'applications/phortune/provider/PhortunePaymentProvider.php',
@@ -4391,13 +4391,13 @@
'PhortunePaymentProviderTestCase' => 'applications/phortune/provider/__tests__/PhortunePaymentProviderTestCase.php',
'PhortuneProduct' => 'applications/phortune/storage/PhortuneProduct.php',
'PhortuneProductImplementation' => 'applications/phortune/product/PhortuneProductImplementation.php',
- 'PhortuneProductListController' => 'applications/phortune/controller/PhortuneProductListController.php',
+ 'PhortuneProductListController' => 'applications/phortune/controller/product/PhortuneProductListController.php',
'PhortuneProductPHIDType' => 'applications/phortune/phid/PhortuneProductPHIDType.php',
'PhortuneProductQuery' => 'applications/phortune/query/PhortuneProductQuery.php',
- 'PhortuneProductViewController' => 'applications/phortune/controller/PhortuneProductViewController.php',
- 'PhortuneProviderActionController' => 'applications/phortune/controller/PhortuneProviderActionController.php',
- 'PhortuneProviderDisableController' => 'applications/phortune/controller/PhortuneProviderDisableController.php',
- 'PhortuneProviderEditController' => 'applications/phortune/controller/PhortuneProviderEditController.php',
+ 'PhortuneProductViewController' => 'applications/phortune/controller/product/PhortuneProductViewController.php',
+ 'PhortuneProviderActionController' => 'applications/phortune/controller/provider/PhortuneProviderActionController.php',
+ 'PhortuneProviderDisableController' => 'applications/phortune/controller/provider/PhortuneProviderDisableController.php',
+ 'PhortuneProviderEditController' => 'applications/phortune/controller/provider/PhortuneProviderEditController.php',
'PhortunePurchase' => 'applications/phortune/storage/PhortunePurchase.php',
'PhortunePurchasePHIDType' => 'applications/phortune/phid/PhortunePurchasePHIDType.php',
'PhortunePurchaseQuery' => 'applications/phortune/query/PhortunePurchaseQuery.php',
@@ -4405,15 +4405,15 @@
'PhortuneStripePaymentProvider' => 'applications/phortune/provider/PhortuneStripePaymentProvider.php',
'PhortuneSubscription' => 'applications/phortune/storage/PhortuneSubscription.php',
'PhortuneSubscriptionCart' => 'applications/phortune/cart/PhortuneSubscriptionCart.php',
- 'PhortuneSubscriptionEditController' => 'applications/phortune/controller/PhortuneSubscriptionEditController.php',
+ 'PhortuneSubscriptionEditController' => 'applications/phortune/controller/subscription/PhortuneSubscriptionEditController.php',
'PhortuneSubscriptionImplementation' => 'applications/phortune/subscription/PhortuneSubscriptionImplementation.php',
- 'PhortuneSubscriptionListController' => 'applications/phortune/controller/PhortuneSubscriptionListController.php',
+ 'PhortuneSubscriptionListController' => 'applications/phortune/controller/subscription/PhortuneSubscriptionListController.php',
'PhortuneSubscriptionPHIDType' => 'applications/phortune/phid/PhortuneSubscriptionPHIDType.php',
'PhortuneSubscriptionProduct' => 'applications/phortune/product/PhortuneSubscriptionProduct.php',
'PhortuneSubscriptionQuery' => 'applications/phortune/query/PhortuneSubscriptionQuery.php',
'PhortuneSubscriptionSearchEngine' => 'applications/phortune/query/PhortuneSubscriptionSearchEngine.php',
'PhortuneSubscriptionTableView' => 'applications/phortune/view/PhortuneSubscriptionTableView.php',
- 'PhortuneSubscriptionViewController' => 'applications/phortune/controller/PhortuneSubscriptionViewController.php',
+ 'PhortuneSubscriptionViewController' => 'applications/phortune/controller/subscription/PhortuneSubscriptionViewController.php',
'PhortuneSubscriptionWorker' => 'applications/phortune/worker/PhortuneSubscriptionWorker.php',
'PhortuneTestPaymentProvider' => 'applications/phortune/provider/PhortuneTestPaymentProvider.php',
'PhortuneWePayPaymentProvider' => 'applications/phortune/provider/PhortuneWePayPaymentProvider.php',
@@ -9742,6 +9742,7 @@
'PhabricatorApplicationTransactionInterface',
'PhabricatorPolicyInterface',
),
+ 'PhortuneAccountChargeListController' => 'PhortuneController',
'PhortuneAccountEditController' => 'PhortuneController',
'PhortuneAccountEditor' => 'PhabricatorApplicationTransactionEditor',
'PhortuneAccountHasMemberEdgeType' => 'PhabricatorEdgeType',
@@ -9777,7 +9778,6 @@
'PhortuneDAO',
'PhabricatorPolicyInterface',
),
- 'PhortuneChargeListController' => 'PhortuneController',
'PhortuneChargePHIDType' => 'PhabricatorPHIDType',
'PhortuneChargeQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
'PhortuneChargeSearchEngine' => 'PhabricatorApplicationSearchEngine',
diff --git a/src/applications/phortune/application/PhabricatorPhortuneApplication.php b/src/applications/phortune/application/PhabricatorPhortuneApplication.php
--- a/src/applications/phortune/application/PhabricatorPhortuneApplication.php
+++ b/src/applications/phortune/application/PhabricatorPhortuneApplication.php
@@ -52,7 +52,7 @@
=> 'PhortuneCartListController',
),
'charge/(?:query/(?P<queryKey>[^/]+)/)?'
- => 'PhortuneChargeListController',
+ => 'PhortuneAccountChargeListController',
),
'card/(?P<id>\d+)/' => array(
'edit/' => 'PhortunePaymentMethodEditController',
diff --git a/src/applications/phortune/controller/PhortuneChargeListController.php b/src/applications/phortune/controller/account/PhortuneAccountChargeListController.php
rename from src/applications/phortune/controller/PhortuneChargeListController.php
rename to src/applications/phortune/controller/account/PhortuneAccountChargeListController.php
--- a/src/applications/phortune/controller/PhortuneChargeListController.php
+++ b/src/applications/phortune/controller/account/PhortuneAccountChargeListController.php
@@ -1,6 +1,6 @@
<?php
-final class PhortuneChargeListController
+final class PhortuneAccountChargeListController
extends PhortuneController {
private $account;
diff --git a/src/applications/phortune/controller/PhortuneAccountEditController.php b/src/applications/phortune/controller/account/PhortuneAccountEditController.php
rename from src/applications/phortune/controller/PhortuneAccountEditController.php
rename to src/applications/phortune/controller/account/PhortuneAccountEditController.php
diff --git a/src/applications/phortune/controller/PhortuneAccountListController.php b/src/applications/phortune/controller/account/PhortuneAccountListController.php
rename from src/applications/phortune/controller/PhortuneAccountListController.php
rename to src/applications/phortune/controller/account/PhortuneAccountListController.php
diff --git a/src/applications/phortune/controller/PhortuneAccountViewController.php b/src/applications/phortune/controller/account/PhortuneAccountViewController.php
rename from src/applications/phortune/controller/PhortuneAccountViewController.php
rename to src/applications/phortune/controller/account/PhortuneAccountViewController.php
diff --git a/src/applications/phortune/controller/PhortuneCartAcceptController.php b/src/applications/phortune/controller/cart/PhortuneCartAcceptController.php
rename from src/applications/phortune/controller/PhortuneCartAcceptController.php
rename to src/applications/phortune/controller/cart/PhortuneCartAcceptController.php
diff --git a/src/applications/phortune/controller/PhortuneCartCancelController.php b/src/applications/phortune/controller/cart/PhortuneCartCancelController.php
rename from src/applications/phortune/controller/PhortuneCartCancelController.php
rename to src/applications/phortune/controller/cart/PhortuneCartCancelController.php
diff --git a/src/applications/phortune/controller/PhortuneCartCheckoutController.php b/src/applications/phortune/controller/cart/PhortuneCartCheckoutController.php
rename from src/applications/phortune/controller/PhortuneCartCheckoutController.php
rename to src/applications/phortune/controller/cart/PhortuneCartCheckoutController.php
diff --git a/src/applications/phortune/controller/PhortuneCartController.php b/src/applications/phortune/controller/cart/PhortuneCartController.php
rename from src/applications/phortune/controller/PhortuneCartController.php
rename to src/applications/phortune/controller/cart/PhortuneCartController.php
diff --git a/src/applications/phortune/controller/PhortuneCartListController.php b/src/applications/phortune/controller/cart/PhortuneCartListController.php
rename from src/applications/phortune/controller/PhortuneCartListController.php
rename to src/applications/phortune/controller/cart/PhortuneCartListController.php
diff --git a/src/applications/phortune/controller/PhortuneCartUpdateController.php b/src/applications/phortune/controller/cart/PhortuneCartUpdateController.php
rename from src/applications/phortune/controller/PhortuneCartUpdateController.php
rename to src/applications/phortune/controller/cart/PhortuneCartUpdateController.php
diff --git a/src/applications/phortune/controller/PhortuneCartViewController.php b/src/applications/phortune/controller/cart/PhortuneCartViewController.php
rename from src/applications/phortune/controller/PhortuneCartViewController.php
rename to src/applications/phortune/controller/cart/PhortuneCartViewController.php
diff --git a/src/applications/phortune/controller/PhortuneMerchantController.php b/src/applications/phortune/controller/merchant/PhortuneMerchantController.php
rename from src/applications/phortune/controller/PhortuneMerchantController.php
rename to src/applications/phortune/controller/merchant/PhortuneMerchantController.php
diff --git a/src/applications/phortune/controller/PhortuneMerchantEditController.php b/src/applications/phortune/controller/merchant/PhortuneMerchantEditController.php
rename from src/applications/phortune/controller/PhortuneMerchantEditController.php
rename to src/applications/phortune/controller/merchant/PhortuneMerchantEditController.php
diff --git a/src/applications/phortune/controller/PhortuneMerchantInvoiceCreateController.php b/src/applications/phortune/controller/merchant/PhortuneMerchantInvoiceCreateController.php
rename from src/applications/phortune/controller/PhortuneMerchantInvoiceCreateController.php
rename to src/applications/phortune/controller/merchant/PhortuneMerchantInvoiceCreateController.php
diff --git a/src/applications/phortune/controller/PhortuneMerchantListController.php b/src/applications/phortune/controller/merchant/PhortuneMerchantListController.php
rename from src/applications/phortune/controller/PhortuneMerchantListController.php
rename to src/applications/phortune/controller/merchant/PhortuneMerchantListController.php
diff --git a/src/applications/phortune/controller/PhortuneMerchantPictureController.php b/src/applications/phortune/controller/merchant/PhortuneMerchantPictureController.php
rename from src/applications/phortune/controller/PhortuneMerchantPictureController.php
rename to src/applications/phortune/controller/merchant/PhortuneMerchantPictureController.php
diff --git a/src/applications/phortune/controller/PhortuneMerchantViewController.php b/src/applications/phortune/controller/merchant/PhortuneMerchantViewController.php
rename from src/applications/phortune/controller/PhortuneMerchantViewController.php
rename to src/applications/phortune/controller/merchant/PhortuneMerchantViewController.php
diff --git a/src/applications/phortune/controller/PhortunePaymentMethodCreateController.php b/src/applications/phortune/controller/payment/PhortunePaymentMethodCreateController.php
rename from src/applications/phortune/controller/PhortunePaymentMethodCreateController.php
rename to src/applications/phortune/controller/payment/PhortunePaymentMethodCreateController.php
diff --git a/src/applications/phortune/controller/PhortunePaymentMethodDisableController.php b/src/applications/phortune/controller/payment/PhortunePaymentMethodDisableController.php
rename from src/applications/phortune/controller/PhortunePaymentMethodDisableController.php
rename to src/applications/phortune/controller/payment/PhortunePaymentMethodDisableController.php
diff --git a/src/applications/phortune/controller/PhortunePaymentMethodEditController.php b/src/applications/phortune/controller/payment/PhortunePaymentMethodEditController.php
rename from src/applications/phortune/controller/PhortunePaymentMethodEditController.php
rename to src/applications/phortune/controller/payment/PhortunePaymentMethodEditController.php
diff --git a/src/applications/phortune/controller/PhortuneProductListController.php b/src/applications/phortune/controller/product/PhortuneProductListController.php
rename from src/applications/phortune/controller/PhortuneProductListController.php
rename to src/applications/phortune/controller/product/PhortuneProductListController.php
diff --git a/src/applications/phortune/controller/PhortuneProductViewController.php b/src/applications/phortune/controller/product/PhortuneProductViewController.php
rename from src/applications/phortune/controller/PhortuneProductViewController.php
rename to src/applications/phortune/controller/product/PhortuneProductViewController.php
diff --git a/src/applications/phortune/controller/PhortuneProviderActionController.php b/src/applications/phortune/controller/provider/PhortuneProviderActionController.php
rename from src/applications/phortune/controller/PhortuneProviderActionController.php
rename to src/applications/phortune/controller/provider/PhortuneProviderActionController.php
diff --git a/src/applications/phortune/controller/PhortuneProviderDisableController.php b/src/applications/phortune/controller/provider/PhortuneProviderDisableController.php
rename from src/applications/phortune/controller/PhortuneProviderDisableController.php
rename to src/applications/phortune/controller/provider/PhortuneProviderDisableController.php
diff --git a/src/applications/phortune/controller/PhortuneProviderEditController.php b/src/applications/phortune/controller/provider/PhortuneProviderEditController.php
rename from src/applications/phortune/controller/PhortuneProviderEditController.php
rename to src/applications/phortune/controller/provider/PhortuneProviderEditController.php
diff --git a/src/applications/phortune/controller/PhortuneSubscriptionEditController.php b/src/applications/phortune/controller/subscription/PhortuneSubscriptionEditController.php
rename from src/applications/phortune/controller/PhortuneSubscriptionEditController.php
rename to src/applications/phortune/controller/subscription/PhortuneSubscriptionEditController.php
diff --git a/src/applications/phortune/controller/PhortuneSubscriptionListController.php b/src/applications/phortune/controller/subscription/PhortuneSubscriptionListController.php
rename from src/applications/phortune/controller/PhortuneSubscriptionListController.php
rename to src/applications/phortune/controller/subscription/PhortuneSubscriptionListController.php
diff --git a/src/applications/phortune/controller/PhortuneSubscriptionViewController.php b/src/applications/phortune/controller/subscription/PhortuneSubscriptionViewController.php
rename from src/applications/phortune/controller/PhortuneSubscriptionViewController.php
rename to src/applications/phortune/controller/subscription/PhortuneSubscriptionViewController.php

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 15, 7:25 AM (1 w, 2 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7686536
Default Alt Text
D17587.diff (23 KB)

Event Timeline

Phabricator · Built by Phacility