From ddb5603326cf88c84652e8151701adf7b8dd981f Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Wed, 19 May 2021 21:28:51 +1200
Subject: [PATCH] [REF] Make previously unshared function protected

This clarifies that it is not used outside core - which we
know as it was only just moved here 5187a13c4d0e4278bb9b18f9fb327b2407766dff
---
 CRM/Contribute/Form/Contribution/Confirm.php  | 32 +++++++++++++++++--
 .../Form/Contribution/ConfirmTest.php         |  4 ++-
 .../phpunit/CRM/Member/BAO/MembershipTest.php | 29 +++--------------
 3 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php
index abcef50666..f592e20ffb 100644
--- a/CRM/Contribute/Form/Contribution/Confirm.php
+++ b/CRM/Contribute/Form/Contribution/Confirm.php
@@ -1704,7 +1704,7 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr
           $pending = FALSE;
         }
 
-        [$membership, $renewalMode, $dates] = CRM_Contribute_Form_Contribution_Confirm::legacyProcessMembership(
+        [$membership, $renewalMode, $dates] = self::legacyProcessMembership(
           $contactID, $memType, $isTest,
           date('YmdHis'), $membershipParams['cms_contactID'] ?? NULL,
           $customFieldsFormatted,
@@ -2886,6 +2886,34 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr
     );
   }
 
+  /**
+   * Temporary function to allow unit tests to access function being refactored away.
+   *
+   * @param int $contactID
+   * @param int $membershipTypeID
+   * @param int $membershipID
+   *
+   * @return array
+   * @throws \CRM_Core_Exception
+   * @throws \CiviCRM_API3_Exception
+   */
+  public static function unitTestAccessTolegacyProcessMembership($contactID, $membershipTypeID, $membershipID = NULL) {
+    return self::legacyProcessMembership(
+      $contactID,
+      $membershipTypeID,
+      0,
+      NULL,
+      NULL,
+      NULL,
+      1,
+      $membershipID,
+      NULL,
+      NULL,
+      FALSE,
+      NULL
+    );
+  }
+
   /**
    * Interim function for processing memberships - this is being refactored out of existence.
    *
@@ -2909,7 +2937,7 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr
    * @throws \CRM_Core_Exception
    * @throws \CiviCRM_API3_Exception
    */
-  public static function legacyProcessMembership($contactID, $membershipTypeID, $is_test, $changeToday, $modifiedID, $customFieldsFormatted, $numRenewTerms, $membershipID, $pending, $contributionRecurID, $membershipSource, $isPayLater, $memParams = [], $contribution = NULL, $lineItems = []) {
+  protected static function legacyProcessMembership($contactID, $membershipTypeID, $is_test, $changeToday, $modifiedID, $customFieldsFormatted, $numRenewTerms, $membershipID, $pending, $contributionRecurID, $membershipSource, $isPayLater, $memParams = [], $contribution = NULL, $lineItems = []) {
     $renewalMode = $updateStatusId = FALSE;
     $allStatus = CRM_Member_PseudoConstant::membershipStatus();
     $format = '%Y%m%d';
diff --git a/tests/phpunit/CRM/Contribute/Form/Contribution/ConfirmTest.php b/tests/phpunit/CRM/Contribute/Form/Contribution/ConfirmTest.php
index 34fdb232c5..f57137d687 100644
--- a/tests/phpunit/CRM/Contribute/Form/Contribution/ConfirmTest.php
+++ b/tests/phpunit/CRM/Contribute/Form/Contribution/ConfirmTest.php
@@ -20,6 +20,8 @@ class CRM_Contribute_Form_Contribution_ConfirmTest extends CiviUnitTestCase {
 
   /**
    * Clean up DB.
+   *
+   * @throws \CRM_Core_Exception
    */
   public function tearDown(): void {
     $this->quickCleanUpFinancialEntities();
@@ -27,7 +29,7 @@ class CRM_Contribute_Form_Contribution_ConfirmTest extends CiviUnitTestCase {
 
   /**
    * CRM-21200: Test that making online payment for pending contribution
-   * doesn't overwite the contribution details
+   * doesn't overwrite the contribution details
    *
    * @throws \CiviCRM_API3_Exception
    * @throws \CRM_Core_Exception
diff --git a/tests/phpunit/CRM/Member/BAO/MembershipTest.php b/tests/phpunit/CRM/Member/BAO/MembershipTest.php
index 631338a5a0..ea233d0a13 100644
--- a/tests/phpunit/CRM/Member/BAO/MembershipTest.php
+++ b/tests/phpunit/CRM/Member/BAO/MembershipTest.php
@@ -479,21 +479,9 @@ class CRM_Member_BAO_MembershipTest extends CiviUnitTestCase {
     $config = CRM_Core_Config::singleton();
     $config->keyDisable = TRUE;
 
-    $isTestMembership = 0;
-    [$MembershipRenew] = CRM_Contribute_Form_Contribution_Confirm::legacyProcessMembership(
+    [$MembershipRenew] = CRM_Contribute_Form_Contribution_Confirm::unitTestAccessTolegacyProcessMembership(
       $contactId,
-      $this->_membershipTypeID,
-      $isTestMembership,
-      NULL,
-      NULL,
-      NULL,
-      1,
-      FALSE,
-      NULL,
-      NULL,
-      FALSE,
-      NULL
-    );
+      $this->_membershipTypeID);
     $endDate = date("Y-m-d", strtotime($membership['end_date'] . " +1 year"));
 
     $this->assertDBNotNull('CRM_Member_BAO_MembershipLog',
@@ -549,19 +537,10 @@ class CRM_Member_BAO_MembershipTest extends CiviUnitTestCase {
       'Database checked on membership log record.'
     );
 
-    [$MembershipRenew] = CRM_Contribute_Form_Contribution_Confirm::legacyProcessMembership(
+    [$MembershipRenew] = CRM_Contribute_Form_Contribution_Confirm::unitTestAccessTolegacyProcessMembership(
       $contactId,
       $this->_membershipTypeID,
-      FALSE,
-      FALSE,
-      NULL,
-      NULL,
-      NULL,
-      1,
-      NULL,
-      NULL,
-      NULL,
-      FALSE
+      1
     );
 
     $this->assertDBNotNull('CRM_Member_BAO_MembershipLog',
-- 
2.25.1