MAE-318: Change OfflinePaymentPlanBuilder to a trait

compucorp · Feb 17, 2021 · 1c3d595 · 1c3d595
1 parent cab148d
commit 1c3d595
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/CRM/MembershipExtras/Queue/Builder/OfflineAutoRenewal/MultipleInstalmentPlan.php b/CRM/MembershipExtras/Queue/Builder/OfflineAutoRenewal/MultipleInstalmentPlan.php
@@ -1,13 +1,15 @@
 <?php
 
-use CRM_MembershipExtras_Queue_Builder_OfflineAutoRenewal_PaymentPlan as OfflineAutoRenewalPaymentPlanQueueBuilder;
+use CRM_MembershipExtras_Queue_Builder_Base as BaseQueueBuilder;
+use CRM_MembershipExtras_Queue_Builder_OfflineAutoRenewal_PaymentPlanTrait as OfflineAutoRenewalPaymentPlanQueueBuilderTrait;
 use CRM_MembershipExtras_Queue_Task_OfflineAutoRenewal_RenewMultipleInstalmentPlans as OfflineRenewMultipleInstalmentPlansTask;
 
 /**
  * Adds payment plans with multiple instalments that are ready to
  * be renewed to the queue.
  */
-class CRM_MembershipExtras_Queue_Builder_OfflineAutoRenewal_MultipleInstalmentPlan extends OfflineAutoRenewalPaymentPlanQueueBuilder {
+class CRM_MembershipExtras_Queue_Builder_OfflineAutoRenewal_MultipleInstalmentPlan extends BaseQueueBuilder {
+  use OfflineAutoRenewalPaymentPlanQueueBuilderTrait;
 
   protected $taskCallback = [OfflineRenewMultipleInstalmentPlansTask::class, 'run'];
 

diff --git a/...uilder/OfflineAutoRenewal/PaymentPlan.php → ...r/OfflineAutoRenewal/PaymentPlanTrait.php b/...uilder/OfflineAutoRenewal/PaymentPlan.php → ...r/OfflineAutoRenewal/PaymentPlanTrait.php
@@ -1,11 +1,9 @@
 <?php
 
-use CRM_MembershipExtras_Queue_Builder_Base as BaseQueueBuilder;
-
 /**
- * Adds payment plans queue.
+ * Trait CRM_MembershipExtras_Queue_Builder_OfflineAutoRenewal_PaymentPlanTrait
  */
-class CRM_MembershipExtras_Queue_Builder_OfflineAutoRenewal_PaymentPlan extends BaseQueueBuilder {
+trait CRM_MembershipExtras_Queue_Builder_OfflineAutoRenewal_PaymentPlanTrait {
 
   /**
    * Maps contribution status names to their corresponding ID's.

diff --git a/CRM/MembershipExtras/Queue/Builder/OfflineAutoRenewal/SingleInstalmentPlan.php b/CRM/MembershipExtras/Queue/Builder/OfflineAutoRenewal/SingleInstalmentPlan.php
@@ -1,13 +1,15 @@
 <?php
 
-use CRM_MembershipExtras_Queue_Builder_OfflineAutoRenewal_PaymentPlan as OfflineAutoRenewalPaymentPlanQueueBuilder;
+use CRM_MembershipExtras_Queue_Builder_Base as BaseQueueBuilder;
+use CRM_MembershipExtras_Queue_Builder_OfflineAutoRenewal_PaymentPlanTrait as OfflineAutoRenewalPaymentPlanQueueBuilderTrait;
 use CRM_MembershipExtras_Queue_Task_OfflineAutoRenewal_RenewSingleInstalmentPlans as OfflineRenewSingleInstalmentPlansTask;
 
 /**
  * Adds payment plans with a single instalment that are ready to
  * be renewed to the queue.
  */
-class CRM_MembershipExtras_Queue_Builder_OfflineAutoRenewal_SingleInstalmentPlan extends OfflineAutoRenewalPaymentPlanQueueBuilder {
+class CRM_MembershipExtras_Queue_Builder_OfflineAutoRenewal_SingleInstalmentPlan extends BaseQueueBuilder {
+  use OfflineAutoRenewalPaymentPlanQueueBuilderTrait;
 
   protected $taskCallback = [OfflineRenewSingleInstalmentPlansTask::class, 'run'];