Merge pull request #32051 from colemanw/caseDep2

[REF] CRM/Case - Refactor out uses of deprecated CRM_Utils_Array::value
civicrm · Feb 11, 2025 · c563969 · c563969
2 parents 8c81ad4 + 64b4faf
commit c563969
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/CRM/Case/BAO/Case.php b/CRM/Case/BAO/Case.php
@@ -2175,17 +2175,11 @@ public static function mergeCases(
         $mainActivity->copyValues($mainActVals);
         $mainActivity->id = NULL;
         $mainActivity->activity_date_time = $otherActivity->activity_date_time;
-        $mainActivity->source_record_id = CRM_Utils_Array::value($mainActivity->source_record_id,
-          $activityMappingIds
-        );
+        $mainActivity->source_record_id = $activityMappingIds[$mainActivity->source_record_id] ?? NULL;
 
-        $mainActivity->original_id = CRM_Utils_Array::value($mainActivity->original_id,
-          $activityMappingIds
-        );
+        $mainActivity->original_id = $activityMappingIds[$mainActivity->original_id] ?? NULL;
 
-        $mainActivity->parent_id = CRM_Utils_Array::value($mainActivity->parent_id,
-          $activityMappingIds
-        );
+        $mainActivity->parent_id = $activityMappingIds[$mainActivity->parent_id] ?? NULL;
         $mainActivity->save();
         $mainActivityId = $mainActivity->id;
         if (!$mainActivityId) {

diff --git a/CRM/Case/XMLProcessor/Report.php b/CRM/Case/XMLProcessor/Report.php
@@ -854,24 +854,24 @@ public static function printCaseReport() {
     $caseRoles['client'] = CRM_Case_BAO_Case::getContactNames($caseID);
     if ($isRedact) {
       foreach ($caseRoles['client'] as &$client) {
-        if (!array_key_exists(CRM_Utils_Array::value('sort_name', $client), $report->_redactionStringRules)) {
+        if (!array_key_exists($client['sort_name'] ?? NULL, $report->_redactionStringRules)) {
 
           $report->_redactionStringRules = CRM_Utils_Array::crmArrayMerge($report->_redactionStringRules,
             [($client['sort_name'] ?? NULL) => 'name_' . rand(10000, 100000)]
           );
         }
-        if (!array_key_exists(CRM_Utils_Array::value('display_name', $client), $report->_redactionStringRules)) {
+        if (!array_key_exists($client['display_name'] ?? NULL, $report->_redactionStringRules)) {
           $report->_redactionStringRules[$client['display_name'] ?? NULL] = $report->_redactionStringRules[$client['sort_name'] ?? NULL];
         }
-        $client['sort_name'] = $report->redact(CRM_Utils_Array::value('sort_name', $client), TRUE, $report->_redactionStringRules);
+        $client['sort_name'] = $report->redact($client['sort_name'] ?? NULL, TRUE, $report->_redactionStringRules);
         if (!empty($client['email']) &&
           !array_key_exists($client['email'], $report->_redactionStringRules)
         ) {
           $report->_redactionStringRules = CRM_Utils_Array::crmArrayMerge($report->_redactionStringRules,
             [$client['email'] => 'email_' . rand(10000, 100000)]
           );
         }
-        $client['email'] = $report->redact(CRM_Utils_Array::value('email', $client), TRUE, $report->_redactionStringRules);
+        $client['email'] = $report->redact($client['email'] ?? NULL, TRUE, $report->_redactionStringRules);
 
         if (!empty($client['phone']) &&
           !array_key_exists($client['phone'], $report->_redactionStringRules)
@@ -880,7 +880,7 @@ public static function printCaseReport() {
             [$client['phone'] => 'phone_' . rand(10000, 100000)]
           );
         }
-        $client['phone'] = $report->redact(CRM_Utils_Array::value('phone', $client), TRUE, $report->_redactionStringRules);
+        $client['phone'] = $report->redact($client['phone'] ?? NULL, TRUE, $report->_redactionStringRules);
       }
     }
     // Retrieve ALL client relationships