Amended with fix for array().

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index 0e5a92a09e0a286f85c78cfdda112580bd3fbfcc..dcd1db91a5c6079beba605e8ac06255880cd34c7 100644 (file)
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -4578,7 +4578,7 @@ LIMIT 1;";
 
     $contributionParams['id'] = $contribution->id;
 
-    // KG - if you update the contribution here with financial_type_id it can/will mess with $lineItem
+    // CRM-19309 - if you update the contribution here with financial_type_id it can/will mess with $lineItem
     // unsetting it here does NOT cause any other contribution test to fail!
     unset($contributionParams['financial_type_id']);
     $contributionResult = civicrm_api3('Contribution', 'create', $contributionParams);

diff --git a/CRM/Contribute/BAO/ContributionRecur.php b/CRM/Contribute/BAO/ContributionRecur.php
index 25ac8cc43d41ee7b2751210a9f109b68b790e319..ea40fa3d7423845710a185d3443d7e0a397069e8 100644 (file)
--- a/CRM/Contribute/BAO/ContributionRecur.php
+++ b/CRM/Contribute/BAO/ContributionRecur.php
@@ -902,7 +902,7 @@ INNER JOIN civicrm_contribution       con ON ( con.id = mp.contribution_id )
   public static function calculateRecurLineItems($recurId, $total_amount, $financial_type_id) {
     $originalContributionID = CRM_Core_DAO::getFieldValue('CRM_Contribute_DAO_Contribution', $recurId, 'id', 'contribution_recur_id');
     $lineItems = CRM_Price_BAO_LineItem::getLineItemsByContributionID($originalContributionID);
-    $lineSets=[];
+    $lineSets = array();
     if (count($lineItems) == 1) {
       foreach ($lineItems as $index => $lineItem) {
         if ($financial_type_id) {
@@ -921,7 +921,7 @@ INNER JOIN civicrm_contribution       con ON ( con.id = mp.contribution_id )
         $lineSets[$priceField->price_set_id][] = $lineItem;
       }
     }
-    // KG if more than one then just pass them through:
+    // CRM-19309 if more than one then just pass them through:
     elseif (count($lineItems) > 1) {
       foreach ($lineItems as $index => $lineItem) {
         $lineSets[$index][] = $lineItem;

diff --git a/tests/phpunit/api/v3/ContributionTest.php b/tests/phpunit/api/v3/ContributionTest.php
index 79063591d7e88919b0109ae03b5c592427dde523..12bc23a3c005fa41619ce59741f4a1dee4b455d7 100644 (file)
--- a/tests/phpunit/api/v3/ContributionTest.php
+++ b/tests/phpunit/api/v3/ContributionTest.php
@@ -1844,7 +1844,7 @@ class api_v3_ContributionTest extends CiviUnitTestCase {
    * Test repeat contribution successfully creates line items (plural).
    */
   public function testRepeatTransactionLineItems() {
-    // KG
+    // CRM-19309
     $originalContribution = $this->setUpRepeatTransaction($recurParams = array(), 'multiple');
     $this->callAPISuccess('contribution', 'repeattransaction', array(
       'original_contribution_id' => $originalContribution['id'],
@@ -1883,9 +1883,8 @@ class api_v3_ContributionTest extends CiviUnitTestCase {
     unset($lineItem2['values'][1]['id'], $lineItem2['values'][1]['entity_id']);
     $this->assertEquals($lineItem1['values'][1], $lineItem2['values'][1]);
 
-    // KG ok so we want to:
-    // check that financial_line_items have been created for entity_id 3 and 4; - visually they look good
-    // the first set of line items id 1 and 2 will not create financial_items b/c of how I created them
+    // CRM-19309 so in future we also want to:
+    // check that financial_line_items have been created for entity_id 3 and 4;
 
     $this->callAPISuccessGetCount('FinancialItem', array('description' => 'Sales Tax', 'amount' => 0), 0);
     $this->quickCleanUpFinancialEntities();
@@ -2956,9 +2955,9 @@ class api_v3_ContributionTest extends CiviUnitTestCase {
       'payment_processor_id' => $paymentProcessorID,
     ), $recurParams));
 
-    $originalContribution=[];
+    $originalContribution = '';
     if ($flag == 'multiple') {
-      // KG create a contribution + also add in line_items (plural):
+      // CRM-19309 create a contribution + also add in line_items (plural):
       $originalContribution = $this->callAPISuccess('contribution', 'create', array_merge(
           $this->_params,
           array(