From bf35ac8a15c7465b9f86d8119f40c4139c59dc8c Mon Sep 17 00:00:00 2001 From: colemanw Date: Wed, 29 Nov 2023 11:56:28 -0500 Subject: [PATCH] REF - Cleanup overly-verbose conditionals --- CRM/Activity/BAO/Activity.php | 10 +++------- CRM/Case/BAO/Case.php | 10 +++------- CRM/Contact/BAO/ContactType.php | 6 +----- CRM/Contact/BAO/Relationship.php | 8 +------- CRM/Core/BAO/Address.php | 6 +----- CRM/Core/Config.php | 6 +----- CRM/Core/Payment.php | 8 ++------ CRM/Mailing/Page/View.php | 11 +++-------- CRM/Member/StatusOverrideTypes.php | 24 ++++-------------------- 9 files changed, 19 insertions(+), 70 deletions(-) diff --git a/CRM/Activity/BAO/Activity.php b/CRM/Activity/BAO/Activity.php index d74f4fd2aa..1b9722d5cc 100644 --- a/CRM/Activity/BAO/Activity.php +++ b/CRM/Activity/BAO/Activity.php @@ -2297,13 +2297,9 @@ INNER JOIN civicrm_option_group grp ON (grp.id = option_group_id AND grp.name = * @return bool */ public static function checkEditInboundEmailsPermissions() { - if (CRM_Core_Permission::check('edit inbound email basic information') - || CRM_Core_Permission::check('edit inbound email basic information and content') - ) { - return TRUE; - } - - return FALSE; + return CRM_Core_Permission::check([ + ['edit inbound email basic information', /* OR */ 'edit inbound email basic information and content'], + ]); } /** diff --git a/CRM/Case/BAO/Case.php b/CRM/Case/BAO/Case.php index ddb2f68c4e..c0d1a23dbe 100644 --- a/CRM/Case/BAO/Case.php +++ b/CRM/Case/BAO/Case.php @@ -2704,13 +2704,9 @@ WHERE id IN (' . implode(',', $copiedActivityIds) . ')'; return FALSE; } - if (CRM_Core_Permission::check('access my cases and activities') || - CRM_Core_Permission::check('access all cases and activities') - ) { - return TRUE; - } - - return FALSE; + return CRM_Core_Permission::check([ + ['access my cases and activities', /* OR */ 'access all cases and activities'], + ]); } /** diff --git a/CRM/Contact/BAO/ContactType.php b/CRM/Contact/BAO/ContactType.php index de18235c96..0059f499e4 100644 --- a/CRM/Contact/BAO/ContactType.php +++ b/CRM/Contact/BAO/ContactType.php @@ -693,11 +693,7 @@ LIMIT 1"; $relationshipCount = CRM_Core_DAO::singleValueQuery($relationshipQuery); - if (!empty($relationshipCount)) { - return TRUE; - } - - return FALSE; + return (bool) $relationshipCount; } /** diff --git a/CRM/Contact/BAO/Relationship.php b/CRM/Contact/BAO/Relationship.php index 9d231e0fe4..2afef78d87 100644 --- a/CRM/Contact/BAO/Relationship.php +++ b/CRM/Contact/BAO/Relationship.php @@ -1590,13 +1590,7 @@ contact_id_a IN ( %1 ) OR contact_id_b IN ( %1 ) AND id IN (" . implode(',', $re return TRUE; } - $recordsFound = (int) CRM_Core_DAO::singleValueQuery("SELECT COUNT(*) FROM civicrm_relationship WHERE relationship_type_id IN ( " . implode(',', $membershipTypeRelationshipTypeIDs) . " ) AND contact_id_a IN ( %1, %2 ) AND contact_id_b IN ( %1, %2 ) AND id NOT IN (" . implode(',', $relIds) . ")", $relParamas); - - if ($recordsFound) { - return FALSE; - } - - return TRUE; + return !CRM_Core_DAO::singleValueQuery("SELECT COUNT(*) FROM civicrm_relationship WHERE relationship_type_id IN ( " . implode(',', $membershipTypeRelationshipTypeIDs) . " ) AND contact_id_a IN ( %1, %2 ) AND contact_id_b IN ( %1, %2 ) AND id NOT IN (" . implode(',', $relIds) . ")", $relParamas); } /** diff --git a/CRM/Core/BAO/Address.php b/CRM/Core/BAO/Address.php index aa219d5055..d73e543dc8 100644 --- a/CRM/Core/BAO/Address.php +++ b/CRM/Core/BAO/Address.php @@ -777,11 +777,7 @@ ORDER BY civicrm_address.is_primary DESC, civicrm_address.location_type_id DESC, $parsingSupportedLocales = ['en_US', 'en_CA', 'fr_CA']; - if (in_array($locale, $parsingSupportedLocales)) { - return TRUE; - } - - return FALSE; + return in_array($locale, $parsingSupportedLocales); } /** diff --git a/CRM/Core/Config.php b/CRM/Core/Config.php index 2018a486fb..86353a8a49 100644 --- a/CRM/Core/Config.php +++ b/CRM/Core/Config.php @@ -431,11 +431,7 @@ class CRM_Core_Config extends CRM_Core_Config_MagicMerge { $path = $_GET[$urlVar] ?? NULL; } - if ($path && preg_match('/^civicrm\/upgrade(\/.*)?$/', $path)) { - return TRUE; - } - - return FALSE; + return ($path && preg_match('/^civicrm\/upgrade(\/.*)?$/', $path)); } /** diff --git a/CRM/Core/Payment.php b/CRM/Core/Payment.php index f1e11d30a7..373f8d1c63 100644 --- a/CRM/Core/Payment.php +++ b/CRM/Core/Payment.php @@ -1560,15 +1560,11 @@ abstract class CRM_Core_Payment { return FALSE; } - if (isset($_GET['payment_date']) && + return (isset($_GET['payment_date']) && isset($_GET['merchant_return_link']) && ($_GET['payment_status'] ?? NULL) == 'Completed' && $paymentProcessor['payment_processor_type'] == "PayPal_Standard" - ) { - return TRUE; - } - - return FALSE; + ); } /** diff --git a/CRM/Mailing/Page/View.php b/CRM/Mailing/Page/View.php index 2f77598177..ef39231236 100644 --- a/CRM/Mailing/Page/View.php +++ b/CRM/Mailing/Page/View.php @@ -44,14 +44,9 @@ class CRM_Mailing_Page_View extends CRM_Core_Page { } // if user is an admin, return true - if (CRM_Core_Permission::check('administer CiviCRM') || - CRM_Core_Permission::check('approve mailings') || - CRM_Core_Permission::check('access CiviMail') - ) { - return TRUE; - } - - return FALSE; + return CRM_Core_Permission::check([ + ['administer CiviCRM', /* OR */ 'approve mailings', /* OR */ 'access CiviMail'], + ]); } /** diff --git a/CRM/Member/StatusOverrideTypes.php b/CRM/Member/StatusOverrideTypes.php index 57451fafa1..c75439703a 100644 --- a/CRM/Member/StatusOverrideTypes.php +++ b/CRM/Member/StatusOverrideTypes.php @@ -65,35 +65,19 @@ class CRM_Member_StatusOverrideTypes { * @return bool */ public static function isOverridden($overrideType) { - if ($overrideType == self::NO) { - return FALSE; - } - - return TRUE; + return $overrideType != self::NO; } public static function isNo($overrideType) { - if ($overrideType != self::NO) { - return FALSE; - } - - return TRUE; + return $overrideType == self::NO; } public static function isPermanent($overrideType) { - if ($overrideType != self::PERMANENT) { - return FALSE; - } - - return TRUE; + return $overrideType == self::PERMANENT; } public static function isUntilDate($overrideType) { - if ($overrideType != self::UNTIL_DATE) { - return FALSE; - } - - return TRUE; + return $overrideType == self::UNTIL_DATE; } } -- 2.25.1