Merge pull request #32049 from colemanw/actDep2

[REF] CRM/Activity - Refactor out uses of deprecated CRM_Utils_Array::value
civicrm · Feb 11, 2025 · 8c81ad4 · 8c81ad4
2 parents 2fb414e + 7fe6287
commit 8c81ad4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/CRM/Activity/BAO/Query.php b/CRM/Activity/BAO/Query.php
@@ -621,7 +621,7 @@ public static function whereClauseSingleActivityText(&$values, &$query) {
 
     $query->_useDistinct = TRUE;
 
-    $label = ts('Activity Text (%1)', [1 => CRM_Utils_Array::value($activityOption, CRM_Core_SelectValues::activityTextOptions())]);
+    $label = ts('Activity Text (%1)', [1 => CRM_Core_SelectValues::activityTextOptions()[$activityOption] ?? '']);
     $clauses = [];
     if ($activityOption % 2 == 0) {
       $clauses[] = $query->buildClause('civicrm_activity.details', $op, $value, 'String');

diff --git a/CRM/Activity/Selector/Activity.php b/CRM/Activity/Selector/Activity.php
@@ -420,7 +420,7 @@ public function &getRows($action, $offset, $rowCount, $sort, $output = NULL, $ca
 
       $engagementLevel = $row['engagement_level'] ?? NULL;
       if ($engagementLevel) {
-        $row['engagement_level'] = CRM_Utils_Array::value($engagementLevel, $engagementLevels, $engagementLevel);
+        $row['engagement_level'] = $engagementLevels[$engagementLevel] ?? $engagementLevel;
       }
 
       $actionLinks = $this->actionLinks($row['activity_type_id'],

diff --git a/CRM/Activity/Selector/Search.php b/CRM/Activity/Selector/Search.php
@@ -321,9 +321,7 @@ public function &getRows($action, $offset, $rowCount, $sort, $output = NULL) {
 
       $engagementLevel = $row['activity_engagement_level'] ?? NULL;
       if ($engagementLevel) {
-        $row['activity_engagement_level'] = CRM_Utils_Array::value($engagementLevel,
-          $engagementLevels, $engagementLevel
-        );
+        $row['activity_engagement_level'] = $engagementLevels[$engagementLevel] ?? $engagementLevel;
       }
 
       // Check if recurring activity.