Skip to content

Commit dd9eaf1

Browse files
committed
Remove calls to deprecated CRM_Utils_Array::value
Replaces deprecated function with equivalent null-coalescing operator. Behavior should be the same before/after.
1 parent 8ea832a commit dd9eaf1

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

CRM/Percentagepricesetfield/Form/Settings.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ private function saveSettings() {
178178
public function setDefaultValues() {
179179
$result = civicrm_api3('setting', 'get', array('return' => array_keys($this->_settings)));
180180
$domainID = CRM_Core_Config::domainID();
181-
$ret = CRM_Utils_Array::value($domainID, $result['values']);
181+
$ret = $result['values'][$domainID] ?? NULL;
182182
return $ret;
183183
}
184184

percentagepricesetfield.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ function percentagepricesetfield_civicrm_alterContent(&$content, $context, $tplN
175175
// value because the checkbox element's "id" attribute will be
176176
// "price_[field_id]_[field_value]".
177177
$field_value = _percentagepricesetfield_get_field_value($field_id);
178-
if (!$field_value_id = CRM_Utils_Array::value('id', $field_value)) {
178+
if (!$field_value_id = $field_value['id'] ?? NULL) {
179179
return;
180180
}
181181

@@ -190,7 +190,7 @@ function percentagepricesetfield_civicrm_alterContent(&$content, $context, $tplN
190190
'is_default' => _percentagepricesetfield_get_setting_value($field_id, 'is_default'),
191191
'disable_payment_methods' => _percentagepricesetfield_get_setting_value($field_id, 'disable_payment_methods'),
192192
'apply_to_taxes' => _percentagepricesetfield_get_setting_value($field_id, 'apply_to_taxes'),
193-
'payment_processor_id' => CRM_Utils_Array::value('id', $object->_paymentProcessor),
193+
'payment_processor_id' => $object->_paymentProcessor['id'] ?? NULL,
194194
);
195195
$resource = CRM_Core_Resources::singleton();
196196
$content .= '<script type="text/javascript">';
@@ -246,9 +246,9 @@ function percentagepricesetfield_civicrm_validateForm($formName, &$fields, &$fil
246246
if ($formName == 'CRM_Price_Form_Field') {
247247
// If the field is set as is_percentagepricesetfield,
248248
// make sure there are no (enabled) others already in this fieldset.
249-
if (CRM_Utils_Array::value('is_percentagepricesetfield', $fields)) {
249+
if (!empty($fields['is_percentagepricesetfield'])) {
250250
$field_ids = _percentagepricesetfield_get_percentage_field_ids($fields['sid']);
251-
$fid = CRM_Utils_Array::value('fid', $fields);
251+
$fid = $fields['fid'] ?? NULL;
252252
while (($fid_key = array_search($fid, $field_ids)) !== FALSE) {
253253
unset($field_ids[$fid_key]);
254254
}
@@ -377,11 +377,11 @@ function _percentagepricesetfield_get_setting_value($field_id, $setting_name) {
377377
$value = _percentagepricesetfield_get_setting_value_override($setting_name);
378378
if ($value === NULL) {
379379
$values = _percentagepricesetfield_get_settings($field_id);
380-
$value = CRM_Utils_Array::value($setting_name, $values);
380+
$value = $values[$setting_name] ?? NULL;
381381

382382
if ($value === NULL) {
383383
$field_value = _percentagepricesetfield_get_field_value($field_id);
384-
$value = CRM_Utils_Array::value($setting_name, $field_value);
384+
$value = $field_value[$setting_name] ?? NULL;
385385
}
386386
}
387387
return $value;
@@ -404,7 +404,7 @@ function _percentagepricesetfield_get_setting_value_override($setting_name) {
404404
'return' => array("percentagepricesetfield_hide_and_force_all"),
405405
)
406406
);
407-
$value = CRM_Utils_Array::value('percentagepricesetfield_hide_and_force_all', $result['values'][0]);
407+
$value = $result['values'][0]['percentagepricesetfield_hide_and_force_all'] ?? NULL;
408408
if ((bool) $value) {
409409
return $value;
410410
}
@@ -967,7 +967,7 @@ function _percentagepricesetfield_get_content_pricesetid_function($content, $con
967967
* @return String The price set ID, if any; otherwise NULL.
968968
*/
969969
function _percentagepricesetfield_civicrm_alterContent_get_pricesetid_for_preview($content, $context, $tplName, $object, $_get) {
970-
return CRM_Utils_Array::value('sid', $_get);
970+
return $_get['sid'] ?? NULL;
971971
}
972972

973973
/**
@@ -983,7 +983,7 @@ function _percentagepricesetfield_civicrm_alterContent_get_pricesetid_for_previe
983983
* @return String The price set ID, if any; otherwise NULL.
984984
*/
985985
function _percentagepricesetfield_civicrm_alterContent_get_pricesetid_for_contribution_backoffice($content, $context, $tplName, $object, $_get) {
986-
return CRM_Utils_Array::value('priceSetId', $_get);
986+
return $_get['priceSetId'] ?? NULL;
987987
}
988988

989989
/**

0 commit comments

Comments
 (0)