From 77c21b32e0cfc83e7e9c26262b84a2d6679055bf Mon Sep 17 00:00:00 2001 From: eileen Date: Tue, 17 Mar 2020 19:05:40 +1300 Subject: [PATCH] [REF] Simplify obtuse boolean expressions Partial reviewer commit of https://github.com/civicrm/civicrm-core/pull/16814 --- CRM/Activity/Import/Parser/Activity.php | 2 +- CRM/Badge/BAO/Badge.php | 2 +- CRM/Campaign/Form/Petition/Signature.php | 2 +- CRM/Campaign/Page/AJAX.php | 2 +- CRM/Contribute/BAO/Contribution.php | 2 +- CRM/Contribute/BAO/ContributionPage.php | 2 +- CRM/Contribute/BAO/ContributionSoft.php | 2 +- CRM/Contribute/Form/Contribution.php | 4 ++-- CRM/Contribute/Form/Contribution/Confirm.php | 4 ++-- CRM/Contribute/Form/ContributionBase.php | 2 +- CRM/Contribute/Form/ContributionRecur.php | 2 +- CRM/Contribute/Form/Task/PDF.php | 2 +- CRM/Contribute/Form/Task/PDFLetterCommon.php | 8 ++++---- CRM/Contribute/Form/UpdateSubscription.php | 2 +- CRM/Contribute/Import/Form/MapField.php | 2 +- 15 files changed, 20 insertions(+), 20 deletions(-) diff --git a/CRM/Activity/Import/Parser/Activity.php b/CRM/Activity/Import/Parser/Activity.php index 7ac076ec95..9764b4c670 100644 --- a/CRM/Activity/Import/Parser/Activity.php +++ b/CRM/Activity/Import/Parser/Activity.php @@ -207,7 +207,7 @@ class CRM_Activity_Import_Parser_Activity extends CRM_Activity_Import_Parser { // Date-Format part ends. // Checking error in custom data. - $params['contact_type'] = isset($this->_contactType) ? $this->_contactType : 'Activity'; + $params['contact_type'] = $this->_contactType ?? 'Activity'; CRM_Contact_Import_Parser_Contact::isErrorInCustomData($params, $errorMessage); diff --git a/CRM/Badge/BAO/Badge.php b/CRM/Badge/BAO/Badge.php index 892c719e31..6a38447381 100644 --- a/CRM/Badge/BAO/Badge.php +++ b/CRM/Badge/BAO/Badge.php @@ -484,7 +484,7 @@ class CRM_Badge_BAO_Badge { $query->convertToPseudoNames($dao); $rows[$dao->participant_id] = []; foreach ($returnProperties as $key => $dontCare) { - $value = isset($dao->$key) ? $dao->$key : NULL; + $value = $dao->$key ?? NULL; // Format custom fields if (strstr($key, 'custom_') && isset($value)) { $value = CRM_Core_BAO_CustomField::displayValue($value, substr($key, 7), $dao->contact_id); diff --git a/CRM/Campaign/Form/Petition/Signature.php b/CRM/Campaign/Form/Petition/Signature.php index 4e72b62cf9..3be407acea 100644 --- a/CRM/Campaign/Form/Petition/Signature.php +++ b/CRM/Campaign/Form/Petition/Signature.php @@ -461,7 +461,7 @@ class CRM_Campaign_Form_Petition_Signature extends CRM_Core_Form { // array_values($this->_contactProfileFields)[0] but it's PHP 5.4+ only. $slice = array_slice($this->_contactProfileFields, 0, 1); $firstField = array_shift($slice); - $addToGroupID = isset($firstField['add_to_group_id']) ? $firstField['add_to_group_id'] : NULL; + $addToGroupID = $firstField['add_to_group_id'] ?? NULL; $this->_contactId = CRM_Contact_BAO_Contact::createProfileContact($params, $this->_contactProfileFields, $this->_contactId, $addToGroupID, $this->_contactProfileId, $this->_ctype, diff --git a/CRM/Campaign/Page/AJAX.php b/CRM/Campaign/Page/AJAX.php index 45005703b5..f4db2965bb 100644 --- a/CRM/Campaign/Page/AJAX.php +++ b/CRM/Campaign/Page/AJAX.php @@ -426,7 +426,7 @@ class CRM_Campaign_Page_AJAX { $activityParams['skipRecentView'] = 1; $activityParams['activity_date_time'] = date('YmdHis'); $activityParams['activity_type_id'] = $activityTypeId; - $activityParams['campaign_id'] = isset($surveyValues['campaign_id']) ? $surveyValues['campaign_id'] : NULL; + $activityParams['campaign_id'] = $surveyValues['campaign_id'] ?? NULL; $activity = CRM_Activity_BAO_Activity::create($activityParams); if ($activity->id) { diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php index 845f9c8631..3f26c253b5 100644 --- a/CRM/Contribute/BAO/Contribution.php +++ b/CRM/Contribute/BAO/Contribution.php @@ -4438,7 +4438,7 @@ INNER JOIN civicrm_activity ON civicrm_activity_contact.activity_id = civicrm_ac * @throws \CiviCRM_API3_Exception */ public static function completeOrder($input, &$ids, $objects, $transaction, $contribution, $isPostPaymentCreate = FALSE) { - $primaryContributionID = isset($contribution->id) ? $contribution->id : $objects['first_contribution']->id; + $primaryContributionID = $contribution->id ?? $objects['first_contribution']->id; // The previous details are used when calculating line items so keep it before any code that 'does something' if (!empty($contribution->id)) { $input['prevContribution'] = CRM_Contribute_BAO_Contribution::getValues(['id' => $contribution->id]); diff --git a/CRM/Contribute/BAO/ContributionPage.php b/CRM/Contribute/BAO/ContributionPage.php index 8d575ad2d2..2a3ea83e86 100644 --- a/CRM/Contribute/BAO/ContributionPage.php +++ b/CRM/Contribute/BAO/ContributionPage.php @@ -340,7 +340,7 @@ class CRM_Contribute_BAO_ContributionPage extends CRM_Contribute_DAO_Contributio ); } - $title = isset($values['title']) ? $values['title'] : CRM_Contribute_BAO_Contribution_Utils::getContributionPageTitle($values['contribution_page_id']); + $title = $values['title'] ?? CRM_Contribute_BAO_Contribution_Utils::getContributionPageTitle($values['contribution_page_id']); // Set email variables explicitly to avoid leaky smarty variables. // All of these will be assigned to the template, replacing any that might be assigned elsewhere. diff --git a/CRM/Contribute/BAO/ContributionSoft.php b/CRM/Contribute/BAO/ContributionSoft.php index 45f82ec257..87f72907c2 100644 --- a/CRM/Contribute/BAO/ContributionSoft.php +++ b/CRM/Contribute/BAO/ContributionSoft.php @@ -289,7 +289,7 @@ class CRM_Contribute_BAO_ContributionSoft extends CRM_Contribute_DAO_Contributio */ public static function getSoftContribution($contributionID, $all = FALSE) { $softContributionFields = self::getSoftCreditContributionFields([$contributionID], $all); - return isset($softContributionFields[$contributionID]) ? $softContributionFields[$contributionID] : []; + return $softContributionFields[$contributionID] ?? []; } /** diff --git a/CRM/Contribute/Form/Contribution.php b/CRM/Contribute/Form/Contribution.php index 027c1690cb..f4ea7769b8 100644 --- a/CRM/Contribute/Form/Contribution.php +++ b/CRM/Contribute/Form/Contribution.php @@ -398,7 +398,7 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP // For Premium section. if ($this->_premiumID) { $this->assign('showOption', FALSE); - $options = isset($this->_options[$this->_productDAO->product_id]) ? $this->_options[$this->_productDAO->product_id] : ""; + $options = $this->_options[$this->_productDAO->product_id] ?? ""; if (!$options) { $this->assign('showOption', TRUE); } @@ -430,7 +430,7 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP $defaults['refund_trxn_id'] = CRM_Core_BAO_FinancialTrxn::getRefundTransactionTrxnID($this->_id); } else { - $defaults['refund_trxn_id'] = isset($defaults['trxn_id']) ? $defaults['trxn_id'] : NULL; + $defaults['refund_trxn_id'] = $defaults['trxn_id'] ?? NULL; } if (!$this->_id && empty($defaults['receive_date'])) { diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php index 1f3737da9c..ec7b43446a 100644 --- a/CRM/Contribute/Form/Contribution/Confirm.php +++ b/CRM/Contribute/Form/Contribution/Confirm.php @@ -1513,7 +1513,7 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr } $i++; $numTerms = CRM_Utils_Array::value($memType, $typesTerms, 1); - $contributionRecurID = isset($form->_params['contributionRecurID']) ? $form->_params['contributionRecurID'] : NULL; + $contributionRecurID = $form->_params['contributionRecurID'] ?? NULL; $membershipSource = NULL; if (!empty($form->_params['membership_source'])) { @@ -1945,7 +1945,7 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr $capabilities[] = (ucfirst($form->_mode) . 'Mode'); } $form->_paymentProcessors = CRM_Financial_BAO_PaymentProcessor::getPaymentProcessors($capabilities); - $form->_params['payment_processor_id'] = isset($params['payment_processor_id']) ? $params['payment_processor_id'] : 0; + $form->_params['payment_processor_id'] = $params['payment_processor_id'] ?? 0; if ($form->_params['payment_processor_id'] !== '') { // It can be blank with a $0 transaction - then no processor needs to be selected $form->_paymentProcessor = $form->_paymentProcessors[$form->_params['payment_processor_id']]; diff --git a/CRM/Contribute/Form/ContributionBase.php b/CRM/Contribute/Form/ContributionBase.php index e3acbd7cb3..1c15a76b5f 100644 --- a/CRM/Contribute/Form/ContributionBase.php +++ b/CRM/Contribute/Form/ContributionBase.php @@ -200,7 +200,7 @@ class CRM_Contribute_Form_ContributionBase extends CRM_Core_Form { * @return bool */ public function isQuickConfig() { - return isset(self::$_quickConfig) ? self::$_quickConfig : FALSE; + return self::$_quickConfig ?? FALSE; } /** diff --git a/CRM/Contribute/Form/ContributionRecur.php b/CRM/Contribute/Form/ContributionRecur.php index cae5e1e255..f313d5be22 100644 --- a/CRM/Contribute/Form/ContributionRecur.php +++ b/CRM/Contribute/Form/ContributionRecur.php @@ -192,7 +192,7 @@ class CRM_Contribute_Form_ContributionRecur extends CRM_Core_Form { */ protected function getSubscriptionContactID() { $sub = $this->getSubscriptionDetails(); - return isset($sub->contact_id) ? $sub->contact_id : FALSE; + return $sub->contact_id ?? FALSE; } /** diff --git a/CRM/Contribute/Form/Task/PDF.php b/CRM/Contribute/Form/Task/PDF.php index 9eea32cd4b..beb58971bf 100644 --- a/CRM/Contribute/Form/Task/PDF.php +++ b/CRM/Contribute/Form/Task/PDF.php @@ -170,7 +170,7 @@ AND {$this->_componentClause}"; $input['fee_amount'] = $contribution->fee_amount; $input['net_amount'] = $contribution->net_amount; $input['trxn_id'] = $contribution->trxn_id; - $input['trxn_date'] = isset($contribution->trxn_date) ? $contribution->trxn_date : NULL; + $input['trxn_date'] = $contribution->trxn_date ?? NULL; $input['receipt_update'] = $params['receipt_update']; $input['contribution_status_id'] = $contribution->contribution_status_id; $input['paymentProcessor'] = empty($contribution->trxn_id) ? NULL : diff --git a/CRM/Contribute/Form/Task/PDFLetterCommon.php b/CRM/Contribute/Form/Task/PDFLetterCommon.php index bf30652232..89bea06fbc 100644 --- a/CRM/Contribute/Form/Task/PDFLetterCommon.php +++ b/CRM/Contribute/Form/Task/PDFLetterCommon.php @@ -49,8 +49,8 @@ class CRM_Contribute_Form_Task_PDFLetterCommon extends CRM_Contact_Form_Task_PDF } } // update dates ? - $receipt_update = isset($formValues['receipt_update']) ? $formValues['receipt_update'] : FALSE; - $thankyou_update = isset($formValues['thankyou_update']) ? $formValues['thankyou_update'] : FALSE; + $receipt_update = $formValues['receipt_update'] ?? FALSE; + $thankyou_update = $formValues['thankyou_update'] ?? FALSE; $nowDate = date('YmdHis'); $receipts = $thanks = $emailed = 0; $updateStatus = ''; @@ -75,8 +75,8 @@ class CRM_Contribute_Form_Task_PDFLetterCommon extends CRM_Contact_Form_Task_PDF $groupBy = $formValues['group_by']; // skip some contacts ? - $skipOnHold = isset($form->skipOnHold) ? $form->skipOnHold : FALSE; - $skipDeceased = isset($form->skipDeceased) ? $form->skipDeceased : TRUE; + $skipOnHold = $form->skipOnHold ?? FALSE; + $skipDeceased = $form->skipDeceased ?? TRUE; $contributionIDs = $form->getVar('_contributionIds'); if ($form->_includesSoftCredits) { //@todo - comment on what is stored there diff --git a/CRM/Contribute/Form/UpdateSubscription.php b/CRM/Contribute/Form/UpdateSubscription.php index 308d9dd3a4..be18481f5e 100644 --- a/CRM/Contribute/Form/UpdateSubscription.php +++ b/CRM/Contribute/Form/UpdateSubscription.php @@ -133,7 +133,7 @@ class CRM_Contribute_Form_UpdateSubscription extends CRM_Contribute_Form_Contrib $this->_defaults['financial_type_id'] = $this->_subscriptionDetails->financial_type_id; $this->_defaults['is_notify'] = 1; foreach ($this->editableScheduleFields as $field) { - $this->_defaults[$field] = isset($this->_subscriptionDetails->$field) ? $this->_subscriptionDetails->$field : NULL; + $this->_defaults[$field] = $this->_subscriptionDetails->$field ?? NULL; } return $this->_defaults; diff --git a/CRM/Contribute/Import/Form/MapField.php b/CRM/Contribute/Import/Form/MapField.php index 18fd55e9a4..b12e24a29c 100644 --- a/CRM/Contribute/Import/Form/MapField.php +++ b/CRM/Contribute/Import/Form/MapField.php @@ -81,7 +81,7 @@ class CRM_Contribute_Import_Form_MapField extends CRM_Import_Form_MapField { $this->assign('dataValues', $this->_dataValues); $skipColumnHeader = $this->controller->exportValue('DataSource', 'skipColumnHeader'); - $this->_onDuplicate = $this->get('onDuplicate', isset($onDuplicate) ? $onDuplicate : ""); + $this->_onDuplicate = $this->get('onDuplicate', $onDuplicate ?? ""); if ($skipColumnHeader) { $this->assign('skipColumnHeader', $skipColumnHeader); -- 2.25.1