[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Remove call to class_api in favour of civicrm_api3.

[Eileen (Code Review)]

Eileen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350358 )

Change subject: Remove call to class_api in favour of civicrm_api3.
......................................................................

Remove call to class_api in favour of civicrm_api3.

class_api is causing test failures when the updated mysqli driver tries to free 
memory

Change-Id: Ida8b80ab8590a1b720aab04acb389a62b1622389
---
M sites/all/modules/large_donation/tests/LargeDonationTest.php
M sites/all/modules/wmf_civicrm/recurring.inc
2 files changed, 10 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/58/350358/1

diff --git a/sites/all/modules/large_donation/tests/LargeDonationTest.php 
b/sites/all/modules/large_donation/tests/LargeDonationTest.php
index 9fa7710..7cd9f3f 100644
--- a/sites/all/modules/large_donation/tests/LargeDonationTest.php
+++ b/sites/all/modules/large_donation/tests/LargeDonationTest.php
@@ -24,10 +24,10 @@
             ) )
             ->execute();
 
-        $result = civicrm_api3( 'Contact', 'create', array(
+        $result = $this->callAPISuccess('Contact', 'create', array(
             'contact_type' => 'Individual',
             'first_name' => 'Testes',
-        ) );
+        ));
         $this->contact_id = $result['id'];
     }
 
diff --git a/sites/all/modules/wmf_civicrm/recurring.inc 
b/sites/all/modules/wmf_civicrm/recurring.inc
index 3ef0611..3e99e1f 100644
--- a/sites/all/modules/wmf_civicrm/recurring.inc
+++ b/sites/all/modules/wmf_civicrm/recurring.inc
@@ -79,8 +79,7 @@
     $msg['cycle_day'] = wmf_civicrm_get_cycle_day( $msg['date'] );
 
     $next_sched_contribution = 
wmf_civicrm_get_next_sched_contribution_date_for_month( $msg );
-    
-    $api = civicrm_api_classapi();
+
     $insert_params = array(
         'contact_id' => $contact_id,
         'amount' => $msg[ 'original_gross' ],
@@ -96,14 +95,15 @@
         'cycle_day' => $msg[ 'cycle_day' ],
         'next_sched_contribution_date' => $next_sched_contribution,
         'trxn_id' => $gateway_subscr_id,
-
-        'version' => 3,
     );
-    $success = $api->ContributionRecur->Create( $insert_params );
-    if ( !$success ) {
-        throw new WmfException( 'IMPORT_SUBSCRIPTION', $api->errorMsg() );
+    try {
+      $result = civicrm_api3('ContributionRecur', 'Create', $insert_params);
     }
-    $contribution_recur_id = $api->id;
+    catch (CiviCRM_API3_Exception $e) {
+      throw new WmfException( 'IMPORT_SUBSCRIPTION', $e->getMessage());
+    }
+
+    $contribution_recur_id = $result ['id'];
 
     if ( $contribution_record ) {
         // Link the contribution to the recurring payment

-- 
To view, visit https://gerrit.wikimedia.org/r/350358
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida8b80ab8590a1b720aab04acb389a62b1622389
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen <emcnaugh...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits