From a0cbf9bf7c1b3015622280cd472235752b91b4e3 Mon Sep 17 00:00:00 2001
From: Matthew Wire <mjw@mjwconsult.co.uk>
Date: Mon, 12 Jun 2023 10:28:57 +0100
Subject: [PATCH] Fix some php warnings
---
CRM/Stripe/Api.php | 5 ++++-
managed/stripecustomdata.mgd.php | 7 +++++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/CRM/Stripe/Api.php b/CRM/Stripe/Api.php
index fc179a80..2924972f 100644
--- a/CRM/Stripe/Api.php
+++ b/CRM/Stripe/Api.php
@@ -53,8 +53,11 @@ class CRM_Stripe_Api {
return self::formatDate($stripeObject->created);
case 'invoice_id':
+ if (!isset($stripeObject->invoice)) {
+ return '';
+ }
// Handle both "expanded" and "collapsed" response
- if (is_object($stripeObject->invoice)) {
+ elseif (is_object($stripeObject->invoice)) {
return (string) $stripeObject->invoice->id;
}
else {
diff --git a/managed/stripecustomdata.mgd.php b/managed/stripecustomdata.mgd.php
index 1bf91003..16bcc1e9 100644
--- a/managed/stripecustomdata.mgd.php
+++ b/managed/stripecustomdata.mgd.php
@@ -13,7 +13,10 @@ $customGroup = \Civi\Api4\CustomGroup::get(FALSE)
->addWhere('name', '=', 'Payment_details')
->execute()
->first();
-if (!empty($customGroup)) {
+if (empty($customGroup)) {
+ return [];
+}
+else {
return [
[
'name' => 'CustomGroup_Payment_details_CustomField_available_on',
@@ -184,4 +187,4 @@ if (!empty($customGroup)) {
],
],
];
-}
\ No newline at end of file
+}
--
GitLab