Merge pull request #18998 from eileenmcnaughton/trans2

Remove unused params, return params from processFail

diff --cc CRM/Contribute/BAO/Contribution.php
index 61319a0da48e004b3cb353063305e19831775f0e,2fa203f0fc9f507d271763d1b5974a436758286d..1fc7d212fa9b6a2b9478a57b1acd6b07ba910c24
--- 1/CRM/Contribute/BAO/Contribution.php
--- 2/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@@ -2210,10 -2211,10 +2190,10 @@@ LEFT JOIN  civicrm_contribution contrib
      $processContribution = FALSE;
      if ($contributionStatusId == array_search('Cancelled', $contributionStatuses)) {
        // Call interim cancel function - with a goal to cleaning up the signature on it and switching to a tested api Contribution.cancel function.
 -      list($updateResult, $processContribution) = self::cancel(FALSE, $memberships, $contributionId, $membershipStatuses, $updateResult, $participant, $oldStatus, $pledgePayment, $pledgeID, $pledgePaymentIDs, $contributionStatusId);
 +      self::cancel($memberships, $contributionId, $membershipStatuses, $participant, $oldStatus, $pledgePayment, $pledgeID, $pledgePaymentIDs, $contributionStatusId);
      }
      elseif ($contributionStatusId == array_search('Failed', $contributionStatuses)) {
-       list($updateResult, $processContribution) = self::processFail(FALSE, $memberships, $contributionId, $membershipStatuses, $updateResult, $participant, $pledgePayment, $pledgeID, $pledgePaymentIDs, $contributionStatusId);
+       self::processFail($memberships, $contributionId, $membershipStatuses, $participant, $pledgePayment, $pledgeID, $pledgePaymentIDs, $contributionStatusId);
      }
      elseif ($contributionStatusId == array_search('Completed', $contributionStatuses)) {