From 5790a89690cc3059552b6e17abafd30bcab44a28 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Thu, 7 Jul 2022 14:23:31 +1000
Subject: [PATCH] [REF][PHP8.1] Fix deprecations where by calling trait static
 functions when not from a class that implements the trait is deprecated

---
 CRM/Core/Resources.php                                     | 2 +-
 CRM/Core/Resources/CollectionTrait.php                     | 2 +-
 .../Civi/Api4/Action/SearchDisplay/AbstractRunAction.php   | 7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index bd54a0507c..f485d6bc56 100644
--- a/CRM/Core/Resources.php
+++ b/CRM/Core/Resources.php
@@ -167,7 +167,7 @@ class CRM_Core_Resources implements CRM_Core_Resources_CollectionAdderInterface
    * @see CRM_Core_Resources_CollectionTrait::findCreateSettingSnippet()
    */
   public function &findCreateSettingSnippet($options = []): array {
-    $options = CRM_Core_Resources_CollectionAdderTrait::mergeSettingOptions($options, [
+    $options = self::mergeSettingOptions($options, [
       'region' => NULL,
     ]);
     return $this->getSettingRegion($options['region'])->findCreateSettingSnippet($options);
diff --git a/CRM/Core/Resources/CollectionTrait.php b/CRM/Core/Resources/CollectionTrait.php
index 71fe17ece0..dfda8e4518 100644
--- a/CRM/Core/Resources/CollectionTrait.php
+++ b/CRM/Core/Resources/CollectionTrait.php
@@ -386,7 +386,7 @@ trait CRM_Core_Resources_CollectionTrait {
     $s = &$this->findCreateSettingSnippet();
     $result = $s['settings'];
     foreach ($s['settingsFactories'] as $callable) {
-      $result = CRM_Core_Resources_CollectionAdderTrait::mergeSettings($result, $callable());
+      $result = self::mergeSettings($result, $callable());
     }
     CRM_Utils_Hook::alterResourceSettings($result);
     return $result;
diff --git a/ext/search_kit/Civi/Api4/Action/SearchDisplay/AbstractRunAction.php b/ext/search_kit/Civi/Api4/Action/SearchDisplay/AbstractRunAction.php
index ade9286e26..157bd2f900 100644
--- a/ext/search_kit/Civi/Api4/Action/SearchDisplay/AbstractRunAction.php
+++ b/ext/search_kit/Civi/Api4/Action/SearchDisplay/AbstractRunAction.php
@@ -27,6 +27,7 @@ use Civi\Api4\Utils\FormattingUtil;
 abstract class AbstractRunAction extends \Civi\Api4\Generic\AbstractAction {
 
   use SavedSearchInspectorTrait;
+  use ArrayQueryActionTrait;
 
   /**
    * Either the name of the display or an array containing the display definition (for preview mode)
@@ -303,7 +304,7 @@ abstract class AbstractRunAction extends \Civi\Api4\Generic\AbstractAction {
       $cssClass = $clause[0] ?? '';
       if ($cssClass) {
         $condition = $this->getRuleCondition(array_slice($clause, 1));
-        if (is_null($condition[0]) || (ArrayQueryActionTrait::filterCompare($data, $condition))) {
+        if (is_null($condition[0]) || (self::filterCompare($data, $condition))) {
           $classes[] = $cssClass;
         }
       }
@@ -327,7 +328,7 @@ abstract class AbstractRunAction extends \Civi\Api4\Generic\AbstractAction {
       }
       if ($iconClass) {
         $condition = $this->getRuleCondition($icon['if'] ?? []);
-        if (!is_null($condition[0]) && !(ArrayQueryActionTrait::filterCompare($data, $condition))) {
+        if (!is_null($condition[0]) && !(self::filterCompare($data, $condition))) {
           continue;
         }
         $result[] = ['class' => $iconClass, 'side' => $icon['side'] ?? 'left'];
@@ -471,7 +472,7 @@ abstract class AbstractRunAction extends \Civi\Api4\Generic\AbstractAction {
       }
       return TRUE;
     }
-    return ArrayQueryActionTrait::filterCompare($data, $item['condition']);
+    return self::filterCompare($data, $item['condition']);
   }
 
   /**
-- 
2.25.1