From ae75eefb1131d8f2f53925df00f1d3aef53d4063 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Tue, 7 Sep 2021 16:57:26 +1200
Subject: [PATCH] dev/core#2715 move setting the mystery property out of the
 function

The setting on self::_trxnIDs has always been a blocker to making this code
more logical. I took a dive into it & decided it is only operating
as a normal variable and not being used between functions in a
functional way
---
 CRM/Contribute/BAO/Contribution.php | 19 +++++--------------
 CRM/Financial/BAO/FinancialItem.php |  1 -
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index cc44a430a2..c61eef1626 100644
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -39,13 +39,6 @@ class CRM_Contribute_BAO_Contribution extends CRM_Contribute_DAO_Contribution {
    */
   public static $_exportableFields = NULL;
 
-  /**
-   * Static field to hold financial trxn id's.
-   *
-   * @var array
-   */
-  public static $_trxnIDs = NULL;
-
   /**
    * Field for all the objects related to this contribution.
    *
@@ -1048,10 +1041,10 @@ class CRM_Contribute_BAO_Contribution extends CRM_Contribute_DAO_Contribution {
       // This is an update so original currency if none passed in.
       $params['trxnParams']['currency'] = CRM_Utils_Array::value('currency', $params, $params['prevContribution']->currency);
 
-      self::recordAlwaysAccountsReceivable($params['trxnParams'], $params);
+      $transactionIDs[] = self::recordAlwaysAccountsReceivable($params['trxnParams'], $params);
       $trxn = CRM_Core_BAO_FinancialTrxn::create($params['trxnParams']);
       // @todo we should stop passing $params by reference - splitting this out would be a step towards that.
-      $params['entity_id'] = self::$_trxnIDs[] = $trxn->id;
+      $params['entity_id'] = $transactionIDs[] = $trxn->id;
 
       $sql = "SELECT id, amount FROM civicrm_financial_item WHERE entity_id = %1 and entity_table = 'civicrm_line_item'";
 
@@ -1068,7 +1061,7 @@ class CRM_Contribute_BAO_Contribution extends CRM_Contribute_DAO_Contribution {
           while ($financialItem->fetch()) {
             $entityParams['entity_id'] = $financialItem->id;
             $entityParams['amount'] = $financialItem->amount;
-            foreach (self::$_trxnIDs as $tID) {
+            foreach ($transactionIDs as $tID) {
               $entityParams['financial_trxn_id'] = $tID;
               CRM_Financial_BAO_FinancialItem::createEntityTrxn($entityParams);
             }
@@ -3516,7 +3509,6 @@ INNER JOIN civicrm_activity ON civicrm_activity_contact.activity_id = civicrm_ac
         $trxnParams['card_type_id'] = $params['card_type_id'] ?? NULL;
         $return = $financialTxn = CRM_Core_BAO_FinancialTrxn::create($trxnParams);
         $params['entity_id'] = $financialTxn->id;
-        self::$_trxnIDs[] = $financialTxn->id;
       }
     }
     // record line items and financial items
@@ -3548,7 +3540,6 @@ INNER JOIN civicrm_activity ON civicrm_activity_contact.activity_id = civicrm_ac
       CRM_Event_BAO_Participant::createDiscountTrxn($eventID, $params, $feeLevel);
     }
     unset($params['line_item']);
-    self::$_trxnIDs = NULL;
     return $return;
   }
 
@@ -4674,7 +4665,7 @@ LIMIT 1;";
    * @param array $contributionParams
    *   Contribution Params
    *
-   * @return null
+   * @return null|int
    */
   public static function recordAlwaysAccountsReceivable(&$trxnParams, $contributionParams) {
     if (!Civi::settings()->get('always_post_to_accounts_receivable')) {
@@ -4700,8 +4691,8 @@ LIMIT 1;";
     $params['status_id'] = array_search('Pending', $contributionStatuses);
     $params['is_payment'] = FALSE;
     $trxn = CRM_Core_BAO_FinancialTrxn::create($params);
-    self::$_trxnIDs[] = $trxn->id;
     $trxnParams['from_financial_account_id'] = $params['to_financial_account_id'];
+    return $trxn->id;
   }
 
   /**
diff --git a/CRM/Financial/BAO/FinancialItem.php b/CRM/Financial/BAO/FinancialItem.php
index e3cc03c6a9..1deff5bf9c 100644
--- a/CRM/Financial/BAO/FinancialItem.php
+++ b/CRM/Financial/BAO/FinancialItem.php
@@ -102,7 +102,6 @@ class CRM_Financial_BAO_FinancialItem extends CRM_Financial_DAO_FinancialItem {
       );
     }
     if (empty($trxnId)) {
-      $trxnId['id'] = CRM_Contribute_BAO_Contribution::$_trxnIDs;
       if (empty($trxnId['id'])) {
         $trxn = CRM_Core_BAO_FinancialTrxn::getFinancialTrxnId($contribution->id, 'ASC', TRUE);
         $trxnId['id'] = $trxn['financialTrxnId'];
-- 
2.25.1