From 1a3545fa626fbcf03de659be3ff27d8cc897b57d Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 16 Dec 2020 17:03:40 +1300
Subject: [PATCH] Convert previously shared function from static to non-static

This no longer needs to be static as it is no longer shared with other forms
(although it needs to be public to support the test class
---
 CRM/Contribute/Form/Contribution/Confirm.php          | 11 ++++-------
 .../CRM/Contribute/Form/Contribution/ConfirmTest.php  |  4 ++--
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php
index 6cb6a92dcd..585813565f 100644
--- a/CRM/Contribute/Form/Contribution/Confirm.php
+++ b/CRM/Contribute/Form/Contribution/Confirm.php
@@ -1442,8 +1442,7 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr
         CRM_Price_BAO_LineItem::getLineItemArray($membershipParams);
 
       }
-      $paymentResult = self::processConfirm(
-        $form,
+      $paymentResult = $form->processConfirm(
         $membershipParams,
         $contactID,
         $financialTypeID,
@@ -2301,7 +2300,7 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr
         }
       }
 
-      $result = self::processConfirm($this, $paymentParams,
+      $result = $this->processConfirm($paymentParams,
         $contactID,
         $this->wrangleFinancialTypeID($this->_values['financial_type_id']),
         ($this->_mode == 'test') ? 1 : 0,
@@ -2522,8 +2521,6 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr
   /**
    * Process payment after confirmation.
    *
-   * @param CRM_Core_Form $form
-   *   Form object.
    * @param array $paymentParams
    *   Array with payment related key.
    *   value pairs
@@ -2539,14 +2536,14 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr
    * @return array
    *   associated array
    */
-  public static function processConfirm(
-    &$form,
+  public function processConfirm(
     &$paymentParams,
     $contactID,
     $financialTypeID,
     $isTest,
     $isRecur
   ): array {
+    $form = $this;
     CRM_Core_Payment_Form::mapParams($form->_bltID, $form->_params, $paymentParams, TRUE);
     $isPaymentTransaction = self::isPaymentTransaction($form);
 
diff --git a/tests/phpunit/CRM/Contribute/Form/Contribution/ConfirmTest.php b/tests/phpunit/CRM/Contribute/Form/Contribution/ConfirmTest.php
index b802f33d7f..0143f443ef 100644
--- a/tests/phpunit/CRM/Contribute/Form/Contribution/ConfirmTest.php
+++ b/tests/phpunit/CRM/Contribute/Form/Contribution/ConfirmTest.php
@@ -105,7 +105,7 @@ class CRM_Contribute_Form_Contribution_ConfirmTest extends CiviUnitTestCase {
       'skipLineItem' => 0,
     ];
 
-    $processConfirmResult = CRM_Contribute_Form_Contribution_Confirm::processConfirm($form,
+    $processConfirmResult = $form->processConfirm(
       $form->_params,
       $contactID,
       $form->_values['financial_type_id'],
@@ -155,7 +155,7 @@ class CRM_Contribute_Form_Contribution_ConfirmTest extends CiviUnitTestCase {
       'relationship_type_id' => 5,
       'is_current_employer' => 1,
     ]);
-    CRM_Contribute_Form_Contribution_Confirm::processConfirm($form,
+    $form->processConfirm(
       $form->_params,
       $form->_params['onbehalf_contact_id'],
       $form->_values['financial_type_id'],
-- 
2.25.1