From 770d8a405e6fffd232d45486ef079fe887c6c738 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Thu, 11 Jun 2020 08:39:44 +1000
Subject: [PATCH] [REF] Replace incorrect usages of array_key_exists when the
 variable is not an array with property_exists and also fix the parameter
 order for an implode statement

---
 CRM/Contact/BAO/Contact.php | 2 +-
 CRM/Core/PseudoConstant.php | 2 +-
 api/v3/Membership.php       | 2 +-
 api/v3/utils.php            | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CRM/Contact/BAO/Contact.php b/CRM/Contact/BAO/Contact.php
index d795677303..2bb378d1d3 100644
--- a/CRM/Contact/BAO/Contact.php
+++ b/CRM/Contact/BAO/Contact.php
@@ -175,7 +175,7 @@ class CRM_Contact_BAO_Contact extends CRM_Contact_DAO_Contact {
     // Since hash was required, make sure we have a 0 value for it (CRM-1063).
     // @todo - does this mean we can remove this block?
     // Fixed in 1.5 by making hash optional, only do this in create mode, not update.
-    if ((!array_key_exists('hash', $contact) || !$contact->hash) && !$contact->id) {
+    if ((!isset($contact->hash) || !$contact->hash) && !$contact->id) {
       $allNull = FALSE;
       $contact->hash = md5(uniqid(rand(), TRUE));
     }
diff --git a/CRM/Core/PseudoConstant.php b/CRM/Core/PseudoConstant.php
index e158ee21f0..eb77d5ff33 100644
--- a/CRM/Core/PseudoConstant.php
+++ b/CRM/Core/PseudoConstant.php
@@ -1551,7 +1551,7 @@ WHERE  id = %1
     $output = [];
     $query = "$select $from";
     if ($wheres) {
-      $query .= " WHERE " . implode($wheres, ' AND ');
+      $query .= " WHERE " . implode(' AND ', $wheres);
     }
     $query .= ' ' . $order;
     $dao = CRM_Core_DAO::executeQuery($query, $queryParams);
diff --git a/api/v3/Membership.php b/api/v3/Membership.php
index 8e935373d1..6232fd2028 100644
--- a/api/v3/Membership.php
+++ b/api/v3/Membership.php
@@ -135,7 +135,7 @@ function civicrm_api3_membership_create($params) {
   // @todo stop passing $ids (membership and userId may be set above)
   $membershipBAO = CRM_Member_BAO_Membership::create($params, $ids);
 
-  if (array_key_exists('is_error', $membershipBAO)) {
+  if (property_exists($membershipBAO, 'is_error')) {
     // In case of no valid status for given dates, $membershipBAO
     // is going to contain 'is_error' => "Error Message"
     return civicrm_api3_create_error(ts('The membership can not be saved, no valid membership status for given dates'));
diff --git a/api/v3/utils.php b/api/v3/utils.php
index 40f73f2871..f3dc0988b3 100644
--- a/api/v3/utils.php
+++ b/api/v3/utils.php
@@ -990,7 +990,7 @@ function _civicrm_api3_dao_to_array($dao, $params = NULL, $uniqueFields = TRUE,
   while ($dao->fetch()) {
     $tmp = [];
     foreach ($fields as $key) {
-      if (array_key_exists($key, $dao)) {
+      if (property_exists($dao, $key)) {
         // not sure on that one
         if ($dao->$key !== NULL) {
           $tmp[$key] = $dao->$key;
@@ -1047,8 +1047,8 @@ function _civicrm_api3_object_to_array(&$dao, &$values, $uniqueFields = FALSE) {
 
   $fields = _civicrm_api3_build_fields_array($dao, $uniqueFields);
   foreach ($fields as $key => $value) {
-    if (array_key_exists($key, $dao)) {
-      $values[$key] = $dao->$key;
+    if (property_exists($dao, $key)) {
+      $values[$key] = $dao->$key ?? NULL;
     }
   }
 }
-- 
2.25.1