Skip to content
Snippets Groups Projects
Unverified Commit dca7262e authored by colemanw's avatar colemanw Committed by GitHub
Browse files

Merge pull request #19416 from eileenmcnaughton/dep 

financial#148 fully deprecate loadObjects function
parents 395bbc1b f2c927f5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
CRM/Core/Payment/BaseIPN.php
+ 3
− 0
View file @ dca7262e
......@@ -140,6 +140,8 @@ class CRM_Core_Payment_BaseIPN {
/**
* Load objects related to contribution.
*
* @deprecated
*
* @input array information from Payment processor
*
* @param array $input
......@@ -152,6 +154,7 @@ class CRM_Core_Payment_BaseIPN {
* @throws \CRM_Core_Exception
*/
public function loadObjects($input, &$ids, &$objects, $required, $paymentProcessorID) {
CRM_Core_Error::deprecatedFunctionWarning('use api methods in ipn');
$contribution = &$objects['contribution'];
$ids['paymentProcessor'] = $paymentProcessorID;
$success = $contribution->loadRelatedObjects($input, $ids);
......
CRM/Core/Payment/PayPalProIPN.php
+ 9
− 6
View file @ dca7262e
......@@ -482,9 +482,10 @@ INNER JOIN civicrm_membership_payment mp ON m.id = mp.membership_id AND mp.contr
unset($ids['contributionPage']);
}
if (!$this->loadObjects($input, $ids, $objects, TRUE, $paymentProcessorID)) {
return;
}
$contribution = &$objects['contribution'];
$ids['paymentProcessor'] = $paymentProcessorID;
$contribution->loadRelatedObjects($input, $ids);
$objects = array_merge($objects, $contribution->_relatedObjects);
$input['payment_processor_id'] = $paymentProcessorID;
......@@ -640,9 +641,11 @@ INNER JOIN civicrm_membership_payment mp ON m.id = mp.membership_id AND mp.contr
unset($ids['contributionPage']);
}
if (!$this->loadObjects($input, $ids, $objects, TRUE, $paymentProcessorID)) {
throw new CRM_Core_Exception('Data did not validate');
}
$contribution = &$objects['contribution'];
$ids['paymentProcessor'] = $paymentProcessorID;
$contribution->loadRelatedObjects($input, $ids);
$objects = array_merge($objects, $contribution->_relatedObjects);
$this->recur($input, $ids, $objects['contributionRecur'], $objects['contribution'], $isFirst);
}
......
tests/phpunit/CRM/Core/Payment/BaseIPNTest.php
+ 1
− 115
View file @ dca7262e
......@@ -98,43 +98,6 @@ class CRM_Core_Payment_BaseIPNTest extends CiviUnitTestCase {
CRM_Member_PseudoConstant::membershipStatus(NULL, NULL, 'name', TRUE);
}
/**
* Test the LoadObjects function with recurring membership data.
*/
public function testLoadMembershipObjects() {
$this->_setUpMembershipObjects();
$this->_setUpRecurringContribution();
$this->IPN->loadObjects($this->input, $this->ids, $this->objects, FALSE, $this->_processorId);
$this->assertNotEmpty($this->objects['membership']);
$this->assertArrayHasKey($this->_membershipId . '_' . $this->_membershipTypeID, $this->objects['membership']);
$this->assertTrue(is_a($this->objects['membership'][$this->_membershipId . '_' . $this->_membershipTypeID], 'CRM_Member_BAO_Membership'));
$this->assertTrue(is_a($this->objects['financialType'], 'CRM_Financial_BAO_FinancialType'));
$this->assertNotEmpty($this->objects['contributionRecur']);
$this->assertNotEmpty($this->objects['paymentProcessor']);
}
/**
* Test the LoadObjects function with recurring membership data.
*/
public function testLoadMembershipObjectsNoLeakage() {
$this->_setUpMembershipObjects();
$this->_setUpRecurringContribution();
$this->IPN->loadObjects($this->input, $this->ids, $this->objects, FALSE, $this->_processorId);
$this->assertEquals('Anthony', $this->objects['contact']->first_name);
$this->ids['contact'] = $this->_contactId = $this->individualCreate([
'first_name' => 'Donald',
'last_name' => 'Duck',
'email' => 'the-don@duckville.com',
]);
$contribution = $this->callAPISuccess('contribution', 'create', array_merge($this->_contributionParams, ['invoice_id' => 'abc']));
$this->_contributionId = $contribution['id'];
$this->_setUpMembershipObjects();
$this->input['invoiceID'] = 'abc';
$this->IPN->loadObjects($this->input, $this->ids, $this->objects, FALSE, $this->_processorId);
$this->assertEquals('Donald', $this->objects['contact']->first_name);
}
/**
* Test the LoadObjects function with recurring membership data.
*/
......@@ -189,8 +152,6 @@ class CRM_Core_Payment_BaseIPNTest extends CiviUnitTestCase {
$this->_membershipTypeID = $this->membershipTypeCreate(['name' => 'Fowl']);
$this->_setUpMembershipObjects();
$this->input['invoiceID'] = 'abc';
$this->IPN->loadObjects($this->input, $this->ids, $this->objects, FALSE, $this->_processorId);
$this->assertEquals('Donald', $this->objects['contact']->first_name);
$contribution = new CRM_Contribute_BAO_Contribution();
$contribution->id = $this->_contributionId;
$msg = $contribution->composeMessageArray($this->input, $this->ids, $values);
......@@ -211,31 +172,14 @@ class CRM_Core_Payment_BaseIPNTest extends CiviUnitTestCase {
$this->assertContains('Membership Type: General', $msg['body']);
}
/**
* Test that loadObjects works with participant values.
*/
public function testLoadParticipantObjects() {
$this->_setUpParticipantObjects();
$this->IPN->loadObjects($this->input, $this->ids, $this->objects, FALSE, $this->_processorId);
$this->assertNotEmpty($this->objects['participant']);
$this->assertTrue(is_a($this->objects['participant'], 'CRM_Event_BAO_Participant'));
$this->assertTrue(is_a($this->objects['financialType'], 'CRM_Financial_BAO_FinancialType'));
$this->assertNotEmpty($this->objects['event']);
$this->assertTrue(is_a($this->objects['event'], 'CRM_Event_BAO_Event'));
$this->assertTrue(is_a($this->objects['contribution'], 'CRM_Contribute_BAO_Contribution'));
$this->assertNotEmpty($this->objects['event']->id);
}
/**
* Test the LoadObjects function with a participant.
*/
public function testComposeMailParticipant() {
$this->_setUpParticipantObjects();
$this->IPN->loadObjects($this->input, $this->ids, $this->objects, FALSE, $this->_processorId);
$values = [];
$this->assertNotEmpty($this->objects['event']);
$contribution = new CRM_Contribute_BAO_Contribution();
$contribution->id = $this->_contributionId;
$contribution->loadRelatedObjects($this->input, $this->ids);
$msg = $contribution->composeMessageArray($this->input, $this->ids, $values);
$this->assertContains('registration has been received and your status has been updated to Attended.', $msg['body']);
$this->assertContains('Annual CiviCRM meet', $msg['html']);
......@@ -291,43 +235,6 @@ class CRM_Core_Payment_BaseIPNTest extends CiviUnitTestCase {
$mut->stop();
}
/**
* Test that loadObjects works with participant values.
*/
public function testLoadPledgeObjects() {
$this->_setUpPledgeObjects();
$this->IPN->loadObjects($this->input, $this->ids, $this->objects, FALSE, $this->_processorId);
$this->assertNotEmpty($this->objects['pledge_payment'][0]);
$this->assertTrue(is_a($this->objects['financialType'], 'CRM_Financial_BAO_FinancialType'));
$this->assertTrue(is_a($this->objects['contribution'], 'CRM_Contribute_BAO_Contribution'));
$this->assertTrue(is_a($this->objects['pledge_payment'][0], 'CRM_Pledge_BAO_PledgePayment'));
$this->assertNotEmpty($this->objects['pledge_payment'][0]->id);
$this->assertEquals($this->_financialTypeId, $this->objects['financialType']->id);
$this->assertEquals($this->_processorId, $this->objects['paymentProcessor']['id']);
$this->assertEquals($this->_contributionId, $this->objects['contribution']->id);
$this->assertEquals($this->_contactId, $this->objects['contact']->id);
$this->assertEquals($this->_pledgeId, $this->objects['pledge_payment'][0]->pledge_id);
}
/**
* Test that loadObjects works with participant values.
*/
public function testLoadPledgeObjectsInvalidPledgeID() {
$this->_setUpPledgeObjects();
$this->ids['pledge_payment'][0] = 0;
$this->IPN->loadObjects($this->input, $this->ids, $this->objects, TRUE, NULL);
$this->assertArrayNotHasKey('pledge_payment', $this->objects);
$this->ids['pledge_payment'][0] = 999;
try {
$this->IPN->loadObjects($this->input, $this->ids, $this->objects, TRUE, $this->_processorId);
}
catch (CRM_Core_Exception $e) {
$this->assertEquals('Could not find pledge payment record: 999', $e->getMessage());
}
}
/**
* Test the LoadObjects function with a pledge.
*/
......@@ -339,27 +246,6 @@ class CRM_Core_Payment_BaseIPNTest extends CiviUnitTestCase {
$this->assertContains('Contribution Information', $msg['html']);
}
/**
* Test that an error is returned if required set & no contribution page.
*/
public function testRequiredWithoutProcessorID() {
$this->_setUpPledgeObjects();
// error is only returned if $required set to True
$result = $this->IPN->loadObjects($this->input, $this->ids, $this->objects, FALSE, NULL);
$this->assertEquals(TRUE, $result);
}
/**
* Test that if part of $input the payment processor loads OK.
*
* It's preferable to pass it in as it cannot be correctly calculated.
*/
public function testPaymentProcessorLoadsAsParam() {
$this->_setUpContributionObjects();
$this->input = array_merge($this->input, ['payment_processor_id' => $this->_processorId]);
$this->assertTrue($this->IPN->loadObjects($this->input, $this->ids, $this->objects, TRUE, NULL));
}
public function testThatCancellingEventPaymentWillCancelAllAdditionalPendingParticipantsAndCreateCancellationActivities() {
$this->_setUpParticipantObjects('Pending from incomplete transaction');
$additionalParticipantId = $this->participantCreate([
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment