From ba013eea51a4dab8fc50680d582cb2b98b32d4f8 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <eileen@fuzion.co.nz>
Date: Sun, 10 May 2015 21:48:11 +1200
Subject: [PATCH] CRM-16357 rename processContribution to
 processFormContribution to make it easier to change signature (since name is
 same as other function)

---
 CRM/Contribute/BAO/Contribution/Utils.php    | 6 +++---
 CRM/Contribute/Form/Contribution.php         | 2 +-
 CRM/Contribute/Form/Contribution/Confirm.php | 2 +-
 CRM/Member/BAO/Membership.php                | 2 +-
 CRM/Member/Form/Membership.php               | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CRM/Contribute/BAO/Contribution/Utils.php b/CRM/Contribute/BAO/Contribution/Utils.php
index 0d84798531..39d48b6ab4 100644
--- a/CRM/Contribute/BAO/Contribution/Utils.php
+++ b/CRM/Contribute/BAO/Contribution/Utils.php
@@ -112,7 +112,7 @@ class CRM_Contribute_BAO_Contribution_Utils {
       // when we get a callback from the payment processor
       // also add the contact ID and contribution ID to the params list
       $paymentParams['contactID'] = $form->_params['contactID'] = $contactID;
-      $contribution = CRM_Contribute_Form_Contribution_Confirm::processContribution(
+      $contribution = CRM_Contribute_Form_Contribution_Confirm::processFormContribution(
         $form,
         $paymentParams,
         NULL,
@@ -233,7 +233,7 @@ class CRM_Contribute_BAO_Contribution_Utils {
           unset($paymentParams['is_recur']);
         }
 
-        $contribution = CRM_Contribute_Form_Contribution_Confirm::processContribution(
+        $contribution = CRM_Contribute_Form_Contribution_Confirm::processFormContribution(
           $form,
           $paymentParams,
           NULL,
@@ -317,7 +317,7 @@ class CRM_Contribute_BAO_Contribution_Utils {
         $pending = TRUE;
       }
       if (!(!empty($paymentParams['is_recur']) && $form->_contributeMode == 'direct')) {
-        $contribution = CRM_Contribute_Form_Contribution_Confirm::processContribution($form,
+        $contribution = CRM_Contribute_Form_Contribution_Confirm::processFormContribution($form,
           $form->_params, $result,
           $contactID, $contributionType,
           $pending, TRUE,
diff --git a/CRM/Contribute/Form/Contribution.php b/CRM/Contribute/Form/Contribution.php
index ceaccc3ca2..3ac6267c51 100644
--- a/CRM/Contribute/Form/Contribution.php
+++ b/CRM/Contribute/Form/Contribution.php
@@ -1224,7 +1224,7 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP
       $this->set('is_deductible', TRUE);
     }
 
-    $contribution = CRM_Contribute_Form_Contribution_Confirm::processContribution($this,
+    $contribution = CRM_Contribute_Form_Contribution_Confirm::processFormContribution($this,
       $this->_params,
       NULL,
       $contactID,
diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php
index 8f548a05b8..fb0593b172 100644
--- a/CRM/Contribute/Form/Contribution/Confirm.php
+++ b/CRM/Contribute/Form/Contribution/Confirm.php
@@ -1278,7 +1278,7 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr
    * @return \CRM_Contribute_DAO_Contribution
    * @throws \Exception
    */
-  public static function processContribution(
+  public static function processFormContribution(
     &$form,
     $params,
     $result,
diff --git a/CRM/Member/BAO/Membership.php b/CRM/Member/BAO/Membership.php
index 3a97ded924..05159eeef8 100644
--- a/CRM/Member/BAO/Membership.php
+++ b/CRM/Member/BAO/Membership.php
@@ -2252,7 +2252,7 @@ INNER JOIN  civicrm_contact contact ON ( contact.id = membership.contact_id AND
     //so for differentiating membership contribution from
     //main contribution.
     $form->_params['separate_membership_payment'] = 1;
-    $membershipContribution = CRM_Contribute_Form_Contribution_Confirm::processContribution($form,
+    $membershipContribution = CRM_Contribute_Form_Contribution_Confirm::processFormContribution($form,
       $tempParams,
       $result,
       $contactID,
diff --git a/CRM/Member/Form/Membership.php b/CRM/Member/Form/Membership.php
index c82743847a..b85be85359 100644
--- a/CRM/Member/Form/Membership.php
+++ b/CRM/Member/Form/Membership.php
@@ -1368,7 +1368,7 @@ WHERE   id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
           CRM_Core_Error::fatal('Could not find a system table');
         }
 
-        $contribution = CRM_Contribute_Form_Contribution_Confirm::processContribution($this,
+        $contribution = CRM_Contribute_Form_Contribution_Confirm::processFormContribution($this,
           $paymentParams,
           $result,
           $this->_contributorContactID,
-- 
2.25.1