Fix IPN tests

tests/phpunit/CRM/Stripe/BaseTest.php

@@ -181,7 +181,7 @@ abstract class CRM_Stripe_BaseTest extends \PHPUnit\Framework\TestCase implement
     if (array_key_exists('trxn_id', $ret)) {
       $this->trxn_id = $ret['trxn_id'];
       $contribution = new CRM_Contribute_BAO_Contribution();
-      $contribution->id = $params['contribution_id'] ?? $params['contributionID'];
+      $contribution->id = $params['contributionID'];
       $contribution->trxn_id = $ret['trxn_id'];
       $contribution->save();
     }

tests/phpunit/CRM/Stripe/IpnTest.php

@@ -831,9 +831,24 @@ class CRM_Stripe_IpnTest extends CRM_Stripe_BaseTest {
         ['status', 'succeeded'],
         ['balance_transaction', 'txn_mock'],
       ]));
+
     $mockChargesCollection = new \Stripe\Collection();
     $mockChargesCollection->data = [$mockCharge];
 
+    $mockCharge = new PropertySpy('Charge', [
+      'id' => 'ch_mock',
+      'object' => 'charge',
+      'captured' => TRUE,
+      'status' => 'succeeded',
+      'balance_transaction' => 'txn_mock',
+      'invoice' => 'in_mock'
+    ]);
+    $stripeClient->charges = $this->createMock('Stripe\\Service\\ChargeService');
+    $stripeClient->charges
+      ->method('retrieve')
+      ->with($this->equalTo('ch_mock'))
+      ->willReturn($mockCharge);
+
     $mockPaymentIntent = $this->createMock('Stripe\\PaymentIntent');
     $mockPaymentIntent
       ->method('__get')
@@ -907,12 +922,6 @@ class CRM_Stripe_IpnTest extends CRM_Stripe_BaseTest {
       ->willReturn(['data' => $mockInvoice]);
      */
 
-    $stripeClient->charges = $this->createMock('Stripe\\Service\\ChargeService');
-    $stripeClient->charges
-      ->method('retrieve')
-      ->with($this->equalTo('ch_mock'))
-      ->willReturn($mockCharge);
-
     // Setup a recurring contribution for $this->total per month.
     $this->setupRecurringTransaction();