From f7dbf5d9af84e2884900395282d098c0c37432da Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Tue, 17 Mar 2020 19:34:12 -0400 Subject: [PATCH] CRM - Cleanup boolean expressions --- CRM/Campaign/Form/Search/Campaign.php | 2 +- CRM/Campaign/Form/Search/Petition.php | 2 +- CRM/Campaign/Form/Search/Survey.php | 2 +- CRM/Case/BAO/Case.php | 8 ++++---- CRM/Dedupe/Merger.php | 2 +- CRM/Event/Form/Registration/Confirm.php | 4 ++-- CRM/Event/Form/Registration/ThankYou.php | 2 +- CRM/Event/Selector/Search.php | 2 +- CRM/Financial/BAO/PaymentProcessor.php | 2 +- CRM/Financial/Page/AJAX.php | 2 +- CRM/Import/ImportProcessor.php | 2 +- CRM/Mailing/BAO/Mailing.php | 8 ++++---- CRM/Mailing/Info.php | 4 +--- CRM/Member/Form/MembershipView.php | 2 +- CRM/Report/BAO/ReportInstance.php | 2 +- CRM/Report/Form/Contribute/Summary.php | 6 +++--- CRM/UF/Page/ProfileEditor.php | 2 +- CRM/Upgrade/Form.php | 2 +- CRM/Upgrade/Incremental/php/FourFour.php | 2 +- 19 files changed, 28 insertions(+), 30 deletions(-) diff --git a/CRM/Campaign/Form/Search/Campaign.php b/CRM/Campaign/Form/Search/Campaign.php index 3b9928a634..a6cc366820 100644 --- a/CRM/Campaign/Form/Search/Campaign.php +++ b/CRM/Campaign/Form/Search/Campaign.php @@ -45,7 +45,7 @@ class CRM_Campaign_Form_Search_Campaign extends CRM_Core_Form { $this->_searchTab = CRM_Utils_Request::retrieve('type', 'String', $this, FALSE, 'campaign'); //when we do load tab, lets load the default objects. - $this->assign('force', ($this->_force || $this->_searchTab) ? TRUE : FALSE); + $this->assign('force', $this->_force || $this->_searchTab); $this->assign('searchParams', json_encode($this->get('searchParams'))); $this->assign('buildSelector', $this->_search); $this->assign('searchFor', $this->_searchTab); diff --git a/CRM/Campaign/Form/Search/Petition.php b/CRM/Campaign/Form/Search/Petition.php index bf26cc626b..438b885dbf 100644 --- a/CRM/Campaign/Form/Search/Petition.php +++ b/CRM/Campaign/Form/Search/Petition.php @@ -36,7 +36,7 @@ class CRM_Campaign_Form_Search_Petition extends CRM_Core_Form { $this->_searchTab = CRM_Utils_Request::retrieve('type', 'String', $this, FALSE, 'petition'); //when we do load tab, lets load the default objects. - $this->assign('force', ($this->_force || $this->_searchTab) ? TRUE : FALSE); + $this->assign('force', $this->_force || $this->_searchTab); $this->assign('searchParams', json_encode($this->get('searchParams'))); $this->assign('buildSelector', $this->_search); $this->assign('searchFor', $this->_searchTab); diff --git a/CRM/Campaign/Form/Search/Survey.php b/CRM/Campaign/Form/Search/Survey.php index cdc54144da..968b99eafa 100644 --- a/CRM/Campaign/Form/Search/Survey.php +++ b/CRM/Campaign/Form/Search/Survey.php @@ -36,7 +36,7 @@ class CRM_Campaign_Form_Search_Survey extends CRM_Core_Form { $this->_searchTab = CRM_Utils_Request::retrieve('type', 'String', $this, FALSE, 'survey'); //when we do load tab, lets load the default objects. - $this->assign('force', ($this->_force || $this->_searchTab) ? TRUE : FALSE); + $this->assign('force', $this->_force || $this->_searchTab); $this->assign('searchParams', json_encode($this->get('searchParams'))); $this->assign('buildSelector', $this->_search); $this->assign('searchFor', $this->_searchTab); diff --git a/CRM/Case/BAO/Case.php b/CRM/Case/BAO/Case.php index 0d12748dfe..7df858bf6c 100644 --- a/CRM/Case/BAO/Case.php +++ b/CRM/Case/BAO/Case.php @@ -2550,15 +2550,15 @@ WHERE id IN (' . implode(',', $copiedActivityIds) . ')'; if (in_array($actTypeName, $singletonNames)) { $allow = FALSE; if ($operation == 'File On Case') { - $allow = (in_array($actTypeName, $doNotFileNames)) ? FALSE : TRUE; + $allow = !in_array($actTypeName, $doNotFileNames); } if (in_array($operation, $actionOperations)) { $allow = TRUE; if ($operation == 'edit') { - $allow = (in_array($actTypeName, $allowEditNames)) ? TRUE : FALSE; + $allow = in_array($actTypeName, $allowEditNames); } elseif ($operation == 'delete') { - $allow = (in_array($actTypeName, $doNotDeleteNames)) ? FALSE : TRUE; + $allow = !in_array($actTypeName, $doNotDeleteNames); } } } @@ -2740,7 +2740,7 @@ WHERE id IN (' . implode(',', $copiedActivityIds) . ')'; //lets check for case configured. $allCasesCount = CRM_Case_BAO_Case::caseCount(NULL, FALSE); - $configured['configured'] = ($allCasesCount) ? TRUE : FALSE; + $configured['configured'] = (bool) $allCasesCount; if (!$configured['configured']) { //do check for case type and case status. $caseTypes = CRM_Case_PseudoConstant::caseType('title', FALSE); diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php index d5d1c5a132..7e2354a01a 100644 --- a/CRM/Dedupe/Merger.php +++ b/CRM/Dedupe/Merger.php @@ -687,7 +687,7 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m * @throws \CiviCRM_API3_Exception */ public static function batchMerge($rgid, $gid = NULL, $mode = 'safe', $batchLimit = 1, $isSelected = 2, $criteria = [], $checkPermissions = TRUE, $reloadCacheIfEmpty = NULL, $searchLimit = 0) { - $redirectForPerformance = ($batchLimit > 1) ? TRUE : FALSE; + $redirectForPerformance = $batchLimit > 1; if ($mode === 'aggressive' && $checkPermissions && !CRM_Core_Permission::check('force merge duplicate contacts')) { throw new CRM_Core_Exception(ts('Insufficient permissions for aggressive mode batch merge')); } diff --git a/CRM/Event/Form/Registration/Confirm.php b/CRM/Event/Form/Registration/Confirm.php index de6fbdda90..4d2888b253 100644 --- a/CRM/Event/Form/Registration/Confirm.php +++ b/CRM/Event/Form/Registration/Confirm.php @@ -274,7 +274,7 @@ class CRM_Event_Form_Registration_Confirm extends CRM_Event_Form_Registration { self::assignProfiles($this); //consider total amount. - $this->assign('isAmountzero', ($this->_totalAmount <= 0) ? TRUE : FALSE); + $this->assign('isAmountzero', $this->_totalAmount <= 0); $contribButton = ts('Continue'); $this->addButtons([ @@ -562,7 +562,7 @@ class CRM_Event_Form_Registration_Confirm extends CRM_Event_Form_Registration { $value['participant_register_date'] = $this->_values['participant']['register_date']; } - $createContrib = ($value['amount'] != 0) ? TRUE : FALSE; + $createContrib = $value['amount'] != 0; // force to create zero amount contribution, CRM-5095 if (!$createContrib && ($value['amount'] == 0) && $this->_priceSetId && $this->_lineItem diff --git a/CRM/Event/Form/Registration/ThankYou.php b/CRM/Event/Form/Registration/ThankYou.php index 01b19c5b25..d186528e18 100644 --- a/CRM/Event/Form/Registration/ThankYou.php +++ b/CRM/Event/Form/Registration/ThankYou.php @@ -120,7 +120,7 @@ class CRM_Event_Form_Registration_ThankYou extends CRM_Event_Form_Registration { $this->assign('trxn_id', $this->_trxnId); //cosider total amount. - $this->assign('isAmountzero', ($this->_totalAmount <= 0) ? TRUE : FALSE); + $this->assign('isAmountzero', $this->_totalAmount <= 0); $this->assign('defaultRole', FALSE); if (CRM_Utils_Array::value('defaultRole', $this->_params[0]) == 1) { diff --git a/CRM/Event/Selector/Search.php b/CRM/Event/Selector/Search.php index 46dcfeb2e2..adbc83513f 100644 --- a/CRM/Event/Selector/Search.php +++ b/CRM/Event/Selector/Search.php @@ -344,7 +344,7 @@ class CRM_Event_Selector_Search extends CRM_Core_Selector_Base implements CRM_Co $statusClass = $statusClasses[$statusId]; } - $row['showConfirmUrl'] = ($statusClass == 'Pending') ? TRUE : FALSE; + $row['showConfirmUrl'] = $statusClass == 'Pending'; if (!empty($row['participant_is_test'])) { $row['participant_status'] = CRM_Core_TestEntity::appendTestText($row['participant_status']); diff --git a/CRM/Financial/BAO/PaymentProcessor.php b/CRM/Financial/BAO/PaymentProcessor.php index 21d26259ac..363828f31a 100644 --- a/CRM/Financial/BAO/PaymentProcessor.php +++ b/CRM/Financial/BAO/PaymentProcessor.php @@ -448,7 +448,7 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces $capabilitiesString = implode('', $capabilities); if (!isset(\Civi::$statics[__CLASS__]['supported_capabilities'][$capabilitiesString])) { $result = self::getPaymentProcessors($capabilities); - \Civi::$statics[__CLASS__]['supported_capabilities'][$capabilitiesString] = (!empty($result) && array_keys($result) !== [0]) ? TRUE : FALSE; + \Civi::$statics[__CLASS__]['supported_capabilities'][$capabilitiesString] = (!empty($result) && array_keys($result) !== [0]); } return \Civi::$statics[__CLASS__]['supported_capabilities'][$capabilitiesString]; } diff --git a/CRM/Financial/Page/AJAX.php b/CRM/Financial/Page/AJAX.php index 5eaae27c1c..bc2e2f7b53 100644 --- a/CRM/Financial/Page/AJAX.php +++ b/CRM/Financial/Page/AJAX.php @@ -255,7 +255,7 @@ class CRM_Financial_Page_AJAX { $entityID = isset($_REQUEST['entityID']) ? CRM_Utils_Type::escape($_REQUEST['entityID'], 'String') : NULL; $notPresent = isset($_REQUEST['notPresent']) ? CRM_Utils_Type::escape($_REQUEST['notPresent'], 'String') : NULL; $statusID = isset($_REQUEST['statusID']) ? CRM_Utils_Type::escape($_REQUEST['statusID'], 'String') : NULL; - $search = isset($_REQUEST['search']) ? TRUE : FALSE; + $search = isset($_REQUEST['search']); $params = $_POST; if ($sort && $sortOrder) { diff --git a/CRM/Import/ImportProcessor.php b/CRM/Import/ImportProcessor.php index 79ddc3b640..514c4c6bbc 100644 --- a/CRM/Import/ImportProcessor.php +++ b/CRM/Import/ImportProcessor.php @@ -499,7 +499,7 @@ class CRM_Import_ImportProcessor { * @return bool */ protected function isValidRelationshipKey($key) { - return !empty($this->getValidRelationships()[$key]) ? TRUE : FALSE; + return !empty($this->getValidRelationships()[$key]); } /** diff --git a/CRM/Mailing/BAO/Mailing.php b/CRM/Mailing/BAO/Mailing.php index 436588ed3b..4951fe4bea 100644 --- a/CRM/Mailing/BAO/Mailing.php +++ b/CRM/Mailing/BAO/Mailing.php @@ -1107,7 +1107,7 @@ ORDER BY civicrm_email.is_bulkmail DESC $pEmails = []; foreach ($pTemplates as $type => $pTemplate) { - $html = ($type == 'html') ? TRUE : FALSE; + $html = $type == 'html'; $pEmails[$type] = []; $pEmail = &$pEmails[$type]; $template = &$pTemplates[$type]['template']; @@ -1148,7 +1148,7 @@ ORDER BY civicrm_email.is_bulkmail DESC $message = new Mail_mime("\n"); - $useSmarty = defined('CIVICRM_MAIL_SMARTY') && CIVICRM_MAIL_SMARTY ? TRUE : FALSE; + $useSmarty = defined('CIVICRM_MAIL_SMARTY') && CIVICRM_MAIL_SMARTY; if ($useSmarty) { $smarty = CRM_Core_Smarty::singleton(); // also add the contact tokens to the template @@ -1300,7 +1300,7 @@ ORDER BY civicrm_email.is_bulkmail DESC $mailing->templates[$type] = CRM_Utils_Token::replaceDomainTokens( $mailing->templates[$type], $domain, - $type == 'html' ? TRUE : FALSE, + $type == 'html', $tokens[$type] ); $mailing->templates[$type] = CRM_Utils_Token::replaceMailingTokens($mailing->templates[$type], $mailing, NULL, $tokens[$type]); @@ -1329,7 +1329,7 @@ ORDER BY civicrm_email.is_bulkmail DESC $token = $token_a['token']; $data = $token; - $useSmarty = defined('CIVICRM_MAIL_SMARTY') && CIVICRM_MAIL_SMARTY ? TRUE : FALSE; + $useSmarty = defined('CIVICRM_MAIL_SMARTY') && CIVICRM_MAIL_SMARTY; if ($type == 'embedded_url') { $embed_data = []; diff --git a/CRM/Mailing/Info.php b/CRM/Mailing/Info.php index 7a37da69d9..cfba5ccde0 100644 --- a/CRM/Mailing/Info.php +++ b/CRM/Mailing/Info.php @@ -178,9 +178,7 @@ class CRM_Mailing_Info extends CRM_Core_Component_Info { $enableWorkflow = Civi::settings()->get('civimail_workflow'); - return ($enableWorkflow && - $config->userSystem->is_drupal - ) ? TRUE : FALSE; + return $enableWorkflow && $config->userSystem->is_drupal; } /** diff --git a/CRM/Member/Form/MembershipView.php b/CRM/Member/Form/MembershipView.php index db184562e9..85d207281f 100644 --- a/CRM/Member/Form/MembershipView.php +++ b/CRM/Member/Form/MembershipView.php @@ -379,7 +379,7 @@ SELECT r.id, c.id as cid, c.display_name as name, c.job_title as comment, $isRecur = CRM_Core_DAO::getFieldValue('CRM_Member_DAO_Membership', $this->membershipID, 'contribution_recur_id'); - $autoRenew = $isRecur ? TRUE : FALSE; + $autoRenew = (bool) $isRecur; } if (!empty($values['is_test'])) { diff --git a/CRM/Report/BAO/ReportInstance.php b/CRM/Report/BAO/ReportInstance.php index e42a566ee9..daeff31df1 100644 --- a/CRM/Report/BAO/ReportInstance.php +++ b/CRM/Report/BAO/ReportInstance.php @@ -144,7 +144,7 @@ class CRM_Report_BAO_ReportInstance extends CRM_Report_DAO_ReportInstance { unset($params['is_navigation']); } - $viewMode = !empty($params['view_mode']) ? $params['view_mode'] : FALSE; + $viewMode = !empty($params['view_mode']); if ($viewMode) { // Do not save to the DB - it's saved in the url. unset($params['view_mode']); diff --git a/CRM/Report/Form/Contribute/Summary.php b/CRM/Report/Form/Contribute/Summary.php index 35df841774..724efc03a1 100644 --- a/CRM/Report/Form/Contribute/Summary.php +++ b/CRM/Report/Form/Contribute/Summary.php @@ -760,8 +760,8 @@ ROUND(AVG({$this->_aliases['civicrm_contribution_soft']}.amount), 2) as civicrm_ if (!empty($this->_params['charts'])) { if (!empty($this->_params['group_bys']['receive_date'])) { - $contrib = !empty($this->_params['fields']['total_amount']) ? TRUE : FALSE; - $softContrib = !empty($this->_params['fields']['soft_amount']) ? TRUE : FALSE; + $contrib = !empty($this->_params['fields']['total_amount']); + $softContrib = !empty($this->_params['fields']['soft_amount']); foreach ($rows as $key => $row) { if ($row['civicrm_contribution_receive_date_subtotal']) { @@ -817,7 +817,7 @@ ROUND(AVG({$this->_aliases['civicrm_contribution_soft']}.amount), 2) as civicrm_ $contributionPages = CRM_Contribute_PseudoConstant::contributionPage(); //CRM-16338 if both soft-credit and contribution are enabled then process the contribution's //total amount's average, count and sum separately and add it to the respective result list - $softCredit = (!empty($this->_params['fields']['soft_amount']) && !empty($this->_params['fields']['total_amount'])) ? TRUE : FALSE; + $softCredit = (!empty($this->_params['fields']['soft_amount']) && !empty($this->_params['fields']['total_amount'])); if ($softCredit) { $this->from('contribution'); $this->customDataFrom(); diff --git a/CRM/UF/Page/ProfileEditor.php b/CRM/UF/Page/ProfileEditor.php index bbd6c1f49b..c665c46aa7 100644 --- a/CRM/UF/Page/ProfileEditor.php +++ b/CRM/UF/Page/ProfileEditor.php @@ -299,7 +299,7 @@ class CRM_UF_Page_ProfileEditor extends CRM_Core_Page { 'custom_group_id' => $customGroup->id, 'extends_entity_column_id' => $customGroup->extends_entity_column_id, 'extends_entity_column_value' => CRM_Utils_Array::explodePadded($customGroup->extends_entity_column_value), - 'is_reserved' => $customGroup->is_reserved ? TRUE : FALSE, + 'is_reserved' => (bool) $customGroup->is_reserved, ]; $result['sections'][$sectionName] = $section; } diff --git a/CRM/Upgrade/Form.php b/CRM/Upgrade/Form.php index 176b0db558..85dbe34413 100644 --- a/CRM/Upgrade/Form.php +++ b/CRM/Upgrade/Form.php @@ -310,7 +310,7 @@ SET version = '$version' $version, 'id', 'version' ); - return $domainID ? TRUE : FALSE; + return (bool) $domainID; } /** diff --git a/CRM/Upgrade/Incremental/php/FourFour.php b/CRM/Upgrade/Incremental/php/FourFour.php index 055ab62d8b..d4d83ee49d 100644 --- a/CRM/Upgrade/Incremental/php/FourFour.php +++ b/CRM/Upgrade/Incremental/php/FourFour.php @@ -719,7 +719,7 @@ CREATE TABLE IF NOT EXISTS `civicrm_word_replacement` ( foreach ($localeCustomArray as $localCustomData) { // Traverse status array "enabled" "disabled" foreach ($localCustomData as $status => $matchTypes) { - $params["is_active"] = ($status == "enabled") ? TRUE : FALSE; + $params["is_active"] = $status == "enabled"; // Traverse Match Type array "wildcardMatch" "exactMatch" foreach ($matchTypes as $matchType => $words) { $params["match_type"] = $matchType; -- 2.25.1