Merge pull request #19844 from seamuslee001/php74_membership_api_fix
authorSeamus Lee <seamuslee001@gmail.com>
Fri, 19 Mar 2021 22:47:55 +0000 (09:47 +1100)
committerGitHub <noreply@github.com>
Fri, 19 Mar 2021 22:47:55 +0000 (09:47 +1100)
[REF] Fix APIv3 MembershipJob test failure on php7.4 by only doing ch…

api/v3/Membership.php

index 6232fd202853b464d4a21a4d2dbd308c60ed6db7..c7a3b1d5e478cba39c8a0fc6575f83f75a370d92 100644 (file)
@@ -281,12 +281,14 @@ function _civicrm_api3_membership_relationsship_get_customv2behaviour(&$params,
   $relationships = [];
   foreach ($membershipValues as $membershipId => $values) {
     // populate the membership type name for the membership type id
-    $membershipType = CRM_Member_BAO_MembershipType::getMembershipTypeDetails($values['membership_type_id']);
+    $membershipType = CRM_Member_BAO_MembershipType::getMembershipTypeDetails($values['membership_type_id']) ?? [];
 
-    $membershipValues[$membershipId]['membership_name'] = $membershipType['name'];
+    if (!empty($membershipType)) {
+      $membershipValues[$membershipId]['membership_name'] = $membershipType['name'];
 
-    if (!empty($membershipType['relationship_type_id'])) {
-      $relationships[$membershipType['relationship_type_id']] = $membershipId;
+      if (!empty($membershipType['relationship_type_id'])) {
+        $relationships[$membershipType['relationship_type_id']] = $membershipId;
+      }
     }
 
     // populating relationship type name.