Merge pull request #32053 from colemanw/miscDep

[REF] CRM/Misc - Refactor out uses of deprecated CRM_Utils_Array::value
civicrm · Feb 11, 2025 · 0b4bf58 · 0b4bf58
2 parents 8a42c09 + 9acf629
commit 0b4bf58
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 21 deletions.
diff --git a/CRM/Contact/Selector.php b/CRM/Contact/Selector.php
@@ -705,10 +705,7 @@ public function &getRows($action, $offset, $rowCount, $sort, $output = NULL) {
           $row[$property] = $result->$greeting;
         }
         elseif (isset($pseudoconstants[$property])) {
-          $row[$property] = CRM_Utils_Array::value(
-            $result->{$pseudoconstants[$property]['dbName']},
-            $pseudoconstants[$property]['values']
-          );
+          $row[$property] = $pseudoconstants[$property]['values'][$result->{$pseudoconstants[$property]['dbName']}] ?? NULL;
         }
         elseif (strpos($property, '-url') !== FALSE) {
           $websiteUrl = '';

diff --git a/CRM/Core/BAO/WordReplacement.php b/CRM/Core/BAO/WordReplacement.php
@@ -45,7 +45,7 @@ public static function edit(&$params, &$id) {
     $wordReplacement->id = $id;
     $wordReplacement->copyValues($params);
     $wordReplacement->save();
-    if (!isset($params['options']) || CRM_Utils_Array::value('wp-rebuild', $params['options'], TRUE)) {
+    if (!isset($params['options']) || ($params['options']['wp-rebuild'] ?? TRUE)) {
       self::rebuild();
     }
     return $wordReplacement;
@@ -66,7 +66,7 @@ public static function create($params) {
     $wordReplacement = new CRM_Core_DAO_WordReplacement();
     $wordReplacement->copyValues($params);
     $wordReplacement->save();
-    if (!isset($params['options']) || CRM_Utils_Array::value('wp-rebuild', $params['options'], TRUE)) {
+    if (!isset($params['options']) || ($params['options']['wp-rebuild'] ?? TRUE)) {
       self::rebuild();
     }
     return $wordReplacement;

diff --git a/CRM/Core/Invoke.php b/CRM/Core/Invoke.php
@@ -262,11 +262,7 @@ public static function runItem($item) {
 
       if (isset($item['return_url'])) {
         $session = CRM_Core_Session::singleton();
-        $args = CRM_Utils_Array::value(
-          'return_url_args',
-          $item,
-          'reset=1'
-        );
+        $args = $item['return_url_args'] ?? 'reset=1';
         $session->pushUserContext(CRM_Utils_System::url($item['return_url'], $args));
       }
 

diff --git a/CRM/Core/Page/AJAX/Location.php b/CRM/Core/Page/AJAX/Location.php
@@ -131,8 +131,7 @@ public static function getPermissionedLocation() {
         }
         $elements["onbehalf_{$field}-{$locTypeId}"] = [
           'type' => $type,
-          'value' => isset($location['address'][1]) ? CRM_Utils_Array::value($addField,
-            $location['address'][1]) : NULL,
+          'value' => $location['address'][1][$addField] ?? NULL,
         ];
         unset($profileFields["{$field}-{$locTypeId}"]);
       }

diff --git a/CRM/Import/Parser.php b/CRM/Import/Parser.php
@@ -1140,7 +1140,7 @@ private function _civicrm_api3_deprecated_add_formatted_param(&$values, &$params
     // Check for custom field values
 
     if (empty($fields['custom'])) {
-      $fields['custom'] = &CRM_Core_BAO_CustomField::getFields(CRM_Utils_Array::value('contact_type', $values),
+      $fields['custom'] = &CRM_Core_BAO_CustomField::getFields($values['contact_type'] ?? NULL,
         FALSE, FALSE, NULL, NULL, FALSE, FALSE, FALSE
       );
     }

diff --git a/CRM/UF/Form/Field.php b/CRM/UF/Form/Field.php
@@ -207,7 +207,7 @@ public function buildQuickForm() {
         $defaults['field_type'],
         ($defaults['field_type'] == "Formatting" ? "" : $defaults['field_name']),
         ($defaults['field_name'] == "url") ? $defaults['website_type_id'] : $defaults['location_type_id'],
-        CRM_Utils_Array::value('phone_type_id', $defaults),
+        $defaults['phone_type_id'] ?? NULL,
       ];
       $this->_gid = $defaults['uf_group_id'];
     }
@@ -548,7 +548,7 @@ public function postProcess() {
         CRM_Core_BAO_UFField::resetInSelectorANDSearchable($this->_gid);
       }
 
-      $this->setMessageIfCountryNotAboveState($fieldName, CRM_Utils_Array::value('location_type_id', $apiFormattedParams), $apiFormattedParams['weight'], $apiFormattedParams['uf_group_id']);
+      $this->setMessageIfCountryNotAboveState($fieldName, $apiFormattedParams['location_type_id'] ?? NULL, $apiFormattedParams['weight'], $apiFormattedParams['uf_group_id']);
 
     }
     $buttonName = $this->controller->getButtonName();
@@ -804,7 +804,7 @@ public static function formRule($fields, $files, $self) {
     $fieldType = $fields['field_name'][0];
 
     //get the group type.
-    $groupType = CRM_Core_BAO_UFGroup::calculateGroupType($self->_gid, FALSE, CRM_Utils_Array::value('field_id', $fields));
+    $groupType = CRM_Core_BAO_UFGroup::calculateGroupType($self->_gid, FALSE, $fields['field_id'] ?? NULL);
 
     switch ($fieldType) {
       case 'Contact':

diff --git a/CRM/Utils/Migrate/ImportJSON.php b/CRM/Utils/Migrate/ImportJSON.php
@@ -215,10 +215,7 @@ public function restore(&$chunk, $daoName, $lookUpMapping = NULL, $dateFields =
         foreach ($columns as $k => $column) {
           if ($column == 'id') {
             $childID = $value[$k];
-            $masterID = CRM_Utils_Array::value($value[$k],
-              $this->_lookupCache[$tableName],
-              NULL
-            );
+            $masterID = $this->_lookupCache[$tableName][$value[$k]] ?? NULL;
             if ($masterID) {
               $object->id = $masterID;
             }