Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[REF][PHP8.1] Fix deprecations where by calling trait static function… #23960

Merged
merged 1 commit into from
Jul 7, 2022
Merged

[REF][PHP8.1] Fix deprecations where by calling trait static function… #23960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CRM/Core/Resources.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ public function add($snippet) {
* @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);
Expand Down
2 changes: 1 addition & 1 deletion CRM/Core/Resources/CollectionTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ public function getSettings(): array {
$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;
Expand Down
7 changes: 4 additions & 3 deletions ext/search_kit/Civi/Api4/Action/SearchDisplay/AbstractRunAction.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
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)
Expand Down Expand Up @@ -303,7 +304,7 @@ protected function getCssStyles(array $styleRules, array $data) {
$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;
}
}
Expand All @@ -327,7 +328,7 @@ protected function getColumnIcons(array $icons, array $data) {
}
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'];
Expand Down Expand Up @@ -471,7 +472,7 @@ private function checkLinkCondition(array $item, array $data): bool {
}
return TRUE;
}
return ArrayQueryActionTrait::filterCompare($data, $item['condition']);
return self::filterCompare($data, $item['condition']);
}

/**
Expand Down