From 61194d4569ead97def4f2a91657bf2125d3e8cc5 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Thu, 3 Jun 2021 09:41:57 -0400 Subject: [PATCH] Cleanup references to old dedupe class names --- CRM/Activity/BAO/Activity.php | 2 +- CRM/Activity/Import/Parser/Activity.php | 2 +- CRM/Contact/BAO/Contact/Utils.php | 2 +- CRM/Contact/Form/Contact.php | 2 +- CRM/Contact/Form/DedupeRules.php | 14 +++++++------- CRM/Contact/Form/Merge.php | 2 +- CRM/Contact/Import/Form/MapField.php | 2 +- CRM/Contact/Page/AJAX.php | 4 ++-- CRM/Contact/Page/DedupeFind.php | 2 +- CRM/Contact/Page/DedupeRules.php | 8 ++++---- CRM/Contribute/BAO/Contribution.php | 2 +- CRM/Contribute/Import/Form/MapField.php | 2 +- CRM/Contribute/Import/Parser/Contribution.php | 2 +- CRM/Dedupe/BAO/DedupeException.php | 11 +++++++---- CRM/Dedupe/BAO/DedupeRule.php | 6 +++--- CRM/Dedupe/BAO/DedupeRuleGroup.php | 10 +++++----- CRM/Dedupe/Finder.php | 8 ++++---- CRM/Dedupe/Merger.php | 2 +- CRM/Event/BAO/Participant.php | 2 +- CRM/Event/Form/ManageEvent/Registration.php | 8 ++++---- CRM/Event/Import/Parser/Participant.php | 2 +- CRM/Import/Form/MapField.php | 2 +- CRM/Member/BAO/Membership.php | 2 +- CRM/Member/Import/Form/MapField.php | 2 +- CRM/Member/Import/Parser/Membership.php | 2 +- Civi/Api4/DedupeException.php | 1 + Civi/Api4/DedupeRule.php | 1 + Civi/Api4/DedupeRuleGroup.php | 1 + tests/phpunit/CRM/Core/PseudoConstantTest.php | 2 +- tests/phpunit/CRM/Dedupe/BAO/RuleGroupTest.php | 2 +- tests/phpunit/CRM/Dedupe/MergerTest.php | 4 ++-- 31 files changed, 60 insertions(+), 54 deletions(-) diff --git a/CRM/Activity/BAO/Activity.php b/CRM/Activity/BAO/Activity.php index 287346602c..f07bdba02f 100644 --- a/CRM/Activity/BAO/Activity.php +++ b/CRM/Activity/BAO/Activity.php @@ -1574,7 +1574,7 @@ WHERE entity_id =%1 AND entity_table = %2"; 'contact_type' => 'Individual', 'used' => 'Unsupervised', ]; - $fieldsArray = CRM_Dedupe_BAO_Rule::dedupeRuleFields($ruleParams); + $fieldsArray = CRM_Dedupe_BAO_DedupeRule::dedupeRuleFields($ruleParams); $tmpConatctField = []; if (is_array($fieldsArray)) { diff --git a/CRM/Activity/Import/Parser/Activity.php b/CRM/Activity/Import/Parser/Activity.php index 2b72aefb00..1004eb54b3 100644 --- a/CRM/Activity/Import/Parser/Activity.php +++ b/CRM/Activity/Import/Parser/Activity.php @@ -215,7 +215,7 @@ class CRM_Activity_Import_Parser_Activity extends CRM_Activity_Import_Parser { 'contact_type' => 'Individual', 'used' => 'Unsupervised', ]; - $fieldsArray = CRM_Dedupe_BAO_Rule::dedupeRuleFields($ruleParams); + $fieldsArray = CRM_Dedupe_BAO_DedupeRule::dedupeRuleFields($ruleParams); $disp = NULL; foreach ($fieldsArray as $value) { diff --git a/CRM/Contact/BAO/Contact/Utils.php b/CRM/Contact/BAO/Contact/Utils.php index 05a701ec8a..70655e2ba1 100644 --- a/CRM/Contact/BAO/Contact/Utils.php +++ b/CRM/Contact/BAO/Contact/Utils.php @@ -600,7 +600,7 @@ LEFT JOIN civicrm_email ce ON ( ce.contact_id=c.id AND ce.is_primary = 1 ) } } if (!empty($originalId) && array_key_exists('merge', $hasPermissions)) { - $rgBao = new CRM_Dedupe_BAO_RuleGroup(); + $rgBao = new CRM_Dedupe_BAO_DedupeRuleGroup(); $rgBao->contact_type = $dao->contact_type; $rgBao->used = 'Supervised'; if ($rgBao->find(TRUE)) { diff --git a/CRM/Contact/Form/Contact.php b/CRM/Contact/Form/Contact.php index 798050800c..ef35118d3f 100644 --- a/CRM/Contact/Form/Contact.php +++ b/CRM/Contact/Form/Contact.php @@ -762,7 +762,7 @@ class CRM_Contact_Form_Contact extends CRM_Core_Form { $this->assign('checkSimilar', $checkSimilar); if ($checkSimilar == 1) { $ruleParams = ['used' => 'Supervised', 'contact_type' => $this->_contactType]; - $this->assign('ruleFields', CRM_Dedupe_BAO_Rule::dedupeRuleFields($ruleParams)); + $this->assign('ruleFields', CRM_Dedupe_BAO_DedupeRule::dedupeRuleFields($ruleParams)); } // build Custom data if Custom data present in edit option diff --git a/CRM/Contact/Form/DedupeRules.php b/CRM/Contact/Form/DedupeRules.php index 176214de81..3e8e1e70de 100644 --- a/CRM/Contact/Form/DedupeRules.php +++ b/CRM/Contact/Form/DedupeRules.php @@ -53,7 +53,7 @@ class CRM_Contact_Form_DedupeRules extends CRM_Admin_Form { throw new CRM_Core_Exception('Contact Type is Not valid'); } if ($this->_rgid) { - $rgDao = new CRM_Dedupe_DAO_RuleGroup(); + $rgDao = new CRM_Dedupe_DAO_DedupeRuleGroup(); $rgDao->id = $this->_rgid; $rgDao->find(TRUE); @@ -65,7 +65,7 @@ class CRM_Contact_Form_DedupeRules extends CRM_Admin_Form { $this->_defaults['is_reserved'] = $rgDao->is_reserved; $this->assign('isReserved', $rgDao->is_reserved); $this->assign('ruleName', $rgDao->name); - $ruleDao = new CRM_Dedupe_DAO_Rule(); + $ruleDao = new CRM_Dedupe_DAO_DedupeRule(); $ruleDao->dedupe_rule_group_id = $this->_rgid; $ruleDao->find(); $count = 0; @@ -76,7 +76,7 @@ class CRM_Contact_Form_DedupeRules extends CRM_Admin_Form { $count++; } } - $supported = CRM_Dedupe_BAO_RuleGroup::supportedFields($this->_contactType); + $supported = CRM_Dedupe_BAO_DedupeRuleGroup::supportedFields($this->_contactType); if (is_array($supported)) { foreach ($supported as $table => $fields) { foreach ($fields as $field => $title) { @@ -93,7 +93,7 @@ class CRM_Contact_Form_DedupeRules extends CRM_Admin_Form { public function buildQuickForm() { $this->addField('title', ['label' => ts('Rule Name')], TRUE); $this->addRule('title', ts('A duplicate matching rule with this name already exists. Please select another name.'), - 'objectExists', ['CRM_Dedupe_DAO_RuleGroup', $this->_rgid, 'title'] + 'objectExists', ['CRM_Dedupe_DAO_DedupeRuleGroup', $this->_rgid, 'title'] ); $this->addField('used', ['label' => ts('Usage')], TRUE); @@ -203,7 +203,7 @@ UPDATE civicrm_dedupe_rule_group CRM_Core_DAO::executeQuery($query, $queryParams); } - $rgDao = new CRM_Dedupe_DAO_RuleGroup(); + $rgDao = new CRM_Dedupe_DAO_DedupeRuleGroup(); if ($this->_action & CRM_Core_Action::UPDATE) { $rgDao->id = $this->_rgid; } @@ -228,7 +228,7 @@ UPDATE civicrm_dedupe_rule_group return; } - $ruleDao = new CRM_Dedupe_DAO_Rule(); + $ruleDao = new CRM_Dedupe_DAO_DedupeRule(); $ruleDao->dedupe_rule_group_id = $rgDao->id; $ruleDao->delete(); $substrLenghts = []; @@ -244,7 +244,7 @@ UPDATE civicrm_dedupe_rule_group $length = !empty($values["length_$count"]) ? CRM_Utils_Array::value("length_$count", $values) : NULL; $weight = $values["weight_$count"]; if ($table and $field) { - $ruleDao = new CRM_Dedupe_DAO_Rule(); + $ruleDao = new CRM_Dedupe_DAO_DedupeRule(); $ruleDao->dedupe_rule_group_id = $rgDao->id; $ruleDao->rule_table = $table; $ruleDao->rule_field = $field; diff --git a/CRM/Contact/Form/Merge.php b/CRM/Contact/Form/Merge.php index be4c5894a9..f7854fb154 100644 --- a/CRM/Contact/Form/Merge.php +++ b/CRM/Contact/Form/Merge.php @@ -365,7 +365,7 @@ class CRM_Contact_Form_Merge extends CRM_Core_Form { CRM_Core_Error::statusBounce(ts('Cannot merge a contact with itself.')); } - if (!CRM_Dedupe_BAO_Rule::validateContacts($cid, $oid)) { + if (!CRM_Dedupe_BAO_DedupeRule::validateContacts($cid, $oid)) { CRM_Core_Error::statusBounce(ts('The selected pair of contacts are marked as non duplicates. If these records should be merged, you can remove this exception on the Dedupe Exceptions page.', [1 => CRM_Utils_System::url('civicrm/dedupe/exception', 'reset=1')])); } diff --git a/CRM/Contact/Import/Form/MapField.php b/CRM/Contact/Import/Form/MapField.php index 8475dcd070..ac0a0d65ab 100644 --- a/CRM/Contact/Import/Form/MapField.php +++ b/CRM/Contact/Import/Form/MapField.php @@ -119,7 +119,7 @@ class CRM_Contact_Import_Form_MapField extends CRM_Import_Form_MapField { 'contact_type' => $cType, 'used' => 'Unsupervised', ]; - $this->_dedupeFields[$cType] = CRM_Dedupe_BAO_Rule::dedupeRuleFields($ruleParams); + $this->_dedupeFields[$cType] = CRM_Dedupe_BAO_DedupeRule::dedupeRuleFields($ruleParams); } //Modify mapper fields title if fields are present in dedupe rule diff --git a/CRM/Contact/Page/AJAX.php b/CRM/Contact/Page/AJAX.php index 74aa9b6e2d..a542ef0239 100644 --- a/CRM/Contact/Page/AJAX.php +++ b/CRM/Contact/Page/AJAX.php @@ -494,7 +494,7 @@ LIMIT {$offset}, {$rowCount} break; } - $dedupeRules = CRM_Dedupe_BAO_RuleGroup::getByType($contactType); + $dedupeRules = CRM_Dedupe_BAO_DedupeRuleGroup::getByType($contactType); CRM_Utils_JSON::output($dedupeRules); } @@ -825,7 +825,7 @@ LIMIT {$offset}, {$rowCount} } } - $exception = new CRM_Dedupe_DAO_Exception(); + $exception = new CRM_Dedupe_DAO_DedupeException(); $exception->contact_id1 = $cid; $exception->contact_id2 = $oid; //make sure contact2 > contact1. diff --git a/CRM/Contact/Page/DedupeFind.php b/CRM/Contact/Page/DedupeFind.php index 1d96c2dad5..f89619fed5 100644 --- a/CRM/Contact/Page/DedupeFind.php +++ b/CRM/Contact/Page/DedupeFind.php @@ -45,7 +45,7 @@ class CRM_Contact_Page_DedupeFind extends CRM_Core_Page_Basic { * Classname of BAO. */ public function getBAOName() { - return 'CRM_Dedupe_BAO_RuleGroup'; + return 'CRM_Dedupe_BAO_DedupeRuleGroup'; } /** diff --git a/CRM/Contact/Page/DedupeRules.php b/CRM/Contact/Page/DedupeRules.php index 9f1d2bf66e..8d52be5d25 100644 --- a/CRM/Contact/Page/DedupeRules.php +++ b/CRM/Contact/Page/DedupeRules.php @@ -30,7 +30,7 @@ class CRM_Contact_Page_DedupeRules extends CRM_Core_Page_Basic { * Classname of BAO. */ public function getBAOName() { - return 'CRM_Dedupe_BAO_RuleGroup'; + return 'CRM_Dedupe_BAO_DedupeRuleGroup'; } /** @@ -115,7 +115,7 @@ class CRM_Contact_Page_DedupeRules extends CRM_Core_Page_Basic { public function browse() { // get all rule groups $ruleGroups = []; - $dao = new CRM_Dedupe_DAO_RuleGroup(); + $dao = new CRM_Dedupe_DAO_DedupeRuleGroup(); $dao->orderBy('contact_type ASC, used ASC, title ASC'); $dao->find(); @@ -188,11 +188,11 @@ class CRM_Contact_Page_DedupeRules extends CRM_Core_Page_Basic { * @param int $id */ public function delete($id) { - $ruleDao = new CRM_Dedupe_DAO_Rule(); + $ruleDao = new CRM_Dedupe_DAO_DedupeRule(); $ruleDao->dedupe_rule_group_id = $id; $ruleDao->delete(); - $rgDao = new CRM_Dedupe_DAO_RuleGroup(); + $rgDao = new CRM_Dedupe_DAO_DedupeRuleGroup(); $rgDao->id = $id; if ($rgDao->find(TRUE)) { $rgDao->delete(); diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php index c5f2320e28..88706a6cbe 100644 --- a/CRM/Contribute/BAO/Contribution.php +++ b/CRM/Contribute/BAO/Contribution.php @@ -708,7 +708,7 @@ class CRM_Contribute_BAO_Contribution extends CRM_Contribute_DAO_Contribution { 'contact_type' => $contactType, 'used' => 'Unsupervised', ]; - $fieldsArray = CRM_Dedupe_BAO_Rule::dedupeRuleFields($ruleParams); + $fieldsArray = CRM_Dedupe_BAO_DedupeRule::dedupeRuleFields($ruleParams); $tmpContactField = []; if (is_array($fieldsArray)) { foreach ($fieldsArray as $value) { diff --git a/CRM/Contribute/Import/Form/MapField.php b/CRM/Contribute/Import/Form/MapField.php index 9a354792cb..65a8733440 100644 --- a/CRM/Contribute/Import/Form/MapField.php +++ b/CRM/Contribute/Import/Form/MapField.php @@ -340,7 +340,7 @@ class CRM_Contribute_Import_Form_MapField extends CRM_Import_Form_MapField { 'used' => 'Unsupervised', 'contact_type' => $contactTypes[$contactTypeId] ?? '', ]; - list($ruleFields, $threshold) = CRM_Dedupe_BAO_RuleGroup::dedupeRuleFieldsWeight($params); + list($ruleFields, $threshold) = CRM_Dedupe_BAO_DedupeRuleGroup::dedupeRuleFieldsWeight($params); $weightSum = 0; foreach ($importKeys as $key => $val) { if (array_key_exists($val, $ruleFields)) { diff --git a/CRM/Contribute/Import/Parser/Contribution.php b/CRM/Contribute/Import/Parser/Contribution.php index 26c4c47ef7..2f1e78d81c 100644 --- a/CRM/Contribute/Import/Parser/Contribution.php +++ b/CRM/Contribute/Import/Parser/Contribution.php @@ -395,7 +395,7 @@ class CRM_Contribute_Import_Parser_Contribution extends CRM_Contribute_Import_Pa 'contact_type' => $this->_contactType, 'used' => 'Unsupervised', ]; - $fieldsArray = CRM_Dedupe_BAO_Rule::dedupeRuleFields($ruleParams); + $fieldsArray = CRM_Dedupe_BAO_DedupeRule::dedupeRuleFields($ruleParams); $disp = NULL; foreach ($fieldsArray as $value) { if (array_key_exists(trim($value), $params)) { diff --git a/CRM/Dedupe/BAO/DedupeException.php b/CRM/Dedupe/BAO/DedupeException.php index eeaea3369c..593cd301a8 100644 --- a/CRM/Dedupe/BAO/DedupeException.php +++ b/CRM/Dedupe/BAO/DedupeException.php @@ -25,14 +25,16 @@ class CRM_Dedupe_BAO_DedupeException extends CRM_Dedupe_DAO_DedupeException { * * @param array $params * - * @return \CRM_Dedupe_BAO_Exception + * @return \CRM_Dedupe_DAO_DedupeException */ public static function create($params) { $hook = empty($params['id']) ? 'create' : 'edit'; - CRM_Utils_Hook::pre($hook, 'Exception', CRM_Utils_Array::value('id', $params), $params); + CRM_Utils_Hook::pre($hook, 'DedupeException', $params['id'] ?? NULL, $params); + // Also call hook with deprecated entity name + CRM_Utils_Hook::pre($hook, 'Exception', $params['id'] ?? NULL, $params); $contact1 = $params['contact_id1'] ?? NULL; $contact2 = $params['contact_id2'] ?? NULL; - $dao = new CRM_Dedupe_BAO_Exception(); + $dao = new CRM_Dedupe_BAO_DedupeException(); $dao->copyValues($params); if ($contact1 && $contact2) { CRM_Core_DAO::singleValueQuery(" @@ -48,7 +50,8 @@ class CRM_Dedupe_BAO_DedupeException extends CRM_Dedupe_DAO_DedupeException { } } $dao->save(); - + CRM_Utils_Hook::post($hook, 'DedupeException', $dao->id, $dao); + // Also call hook with deprecated entity name CRM_Utils_Hook::post($hook, 'Exception', $dao->id, $dao); return $dao; } diff --git a/CRM/Dedupe/BAO/DedupeRule.php b/CRM/Dedupe/BAO/DedupeRule.php index af7e794aa3..9d16d3331a 100644 --- a/CRM/Dedupe/BAO/DedupeRule.php +++ b/CRM/Dedupe/BAO/DedupeRule.php @@ -186,12 +186,12 @@ class CRM_Dedupe_BAO_DedupeRule extends CRM_Dedupe_DAO_DedupeRule { * rule fields array associated to rule group */ public static function dedupeRuleFields($params) { - $rgBao = new CRM_Dedupe_BAO_RuleGroup(); + $rgBao = new CRM_Dedupe_BAO_DedupeRuleGroup(); $rgBao->used = $params['used']; $rgBao->contact_type = $params['contact_type']; $rgBao->find(TRUE); - $ruleBao = new CRM_Dedupe_BAO_Rule(); + $ruleBao = new CRM_Dedupe_BAO_DedupeRule(); $ruleBao->dedupe_rule_group_id = $rgBao->id; $ruleBao->find(); $ruleFields = []; @@ -215,7 +215,7 @@ class CRM_Dedupe_BAO_DedupeRule extends CRM_Dedupe_DAO_DedupeRule { if (!$cid || !$oid) { return NULL; } - $exception = new CRM_Dedupe_DAO_Exception(); + $exception = new CRM_Dedupe_DAO_DedupeException(); $exception->contact_id1 = $cid; $exception->contact_id2 = $oid; //make sure contact2 > contact1. diff --git a/CRM/Dedupe/BAO/DedupeRuleGroup.php b/CRM/Dedupe/BAO/DedupeRuleGroup.php index 35a2902fdf..5c95f9fabe 100644 --- a/CRM/Dedupe/BAO/DedupeRuleGroup.php +++ b/CRM/Dedupe/BAO/DedupeRuleGroup.php @@ -154,7 +154,7 @@ class CRM_Dedupe_BAO_DedupeRuleGroup extends CRM_Dedupe_DAO_DedupeRuleGroup { // Find all rules contained by this script sorted by weight so that // their execution can be short circuited on RuleGroup::fillTable() - $bao = new CRM_Dedupe_BAO_Rule(); + $bao = new CRM_Dedupe_BAO_DedupeRule(); $bao->dedupe_rule_group_id = $this->id; $bao->orderBy('rule_weight DESC'); $bao->find(); @@ -413,7 +413,7 @@ class CRM_Dedupe_BAO_DedupeRuleGroup extends CRM_Dedupe_DAO_DedupeRuleGroup { * (rule field => weight) array and threshold associated to rule group */ public static function dedupeRuleFieldsWeight($params) { - $rgBao = new CRM_Dedupe_BAO_RuleGroup(); + $rgBao = new CRM_Dedupe_BAO_DedupeRuleGroup(); $rgBao->contact_type = $params['contact_type']; if (!empty($params['id'])) { // accept an ID if provided @@ -424,7 +424,7 @@ class CRM_Dedupe_BAO_DedupeRuleGroup extends CRM_Dedupe_DAO_DedupeRuleGroup { } $rgBao->find(TRUE); - $ruleBao = new CRM_Dedupe_BAO_Rule(); + $ruleBao = new CRM_Dedupe_BAO_DedupeRule(); $ruleBao->dedupe_rule_group_id = $rgBao->id; $ruleBao->find(); $ruleFields = []; @@ -475,7 +475,7 @@ class CRM_Dedupe_BAO_DedupeRuleGroup extends CRM_Dedupe_DAO_DedupeRuleGroup { * id => "nice name" of rule group */ public static function getByType($contactType = NULL) { - $dao = new CRM_Dedupe_DAO_RuleGroup(); + $dao = new CRM_Dedupe_DAO_DedupeRuleGroup(); if ($contactType) { $dao->contact_type = $contactType; @@ -505,7 +505,7 @@ class CRM_Dedupe_BAO_DedupeRuleGroup extends CRM_Dedupe_DAO_DedupeRuleGroup { } if (empty(\Civi::$statics[__CLASS__]['rule_groups'][$rule_group_id])) { \Civi::$statics[__CLASS__]['rule_groups'][$rule_group_id]['contact_type'] = CRM_Core_DAO::getFieldValue( - 'CRM_Dedupe_DAO_RuleGroup', + 'CRM_Dedupe_DAO_DedupeRuleGroup', $rule_group_id, 'contact_type' ); diff --git a/CRM/Dedupe/Finder.php b/CRM/Dedupe/Finder.php index a6d670e03c..a04648e07c 100644 --- a/CRM/Dedupe/Finder.php +++ b/CRM/Dedupe/Finder.php @@ -39,7 +39,7 @@ class CRM_Dedupe_Finder { * @throws \CRM_Core_Exception */ public static function dupes($rgid, $cids = [], $checkPermissions = TRUE) { - $rgBao = new CRM_Dedupe_BAO_RuleGroup(); + $rgBao = new CRM_Dedupe_BAO_DedupeRuleGroup(); $rgBao->id = $rgid; $rgBao->contactIds = $cids; if (!$rgBao->find(TRUE)) { @@ -99,7 +99,7 @@ class CRM_Dedupe_Finder { $foundByID = FALSE; if ($ruleGroupID) { - $rgBao = new CRM_Dedupe_BAO_RuleGroup(); + $rgBao = new CRM_Dedupe_BAO_DedupeRuleGroup(); $rgBao->id = $ruleGroupID; $rgBao->contact_type = $ctype; if ($rgBao->find(TRUE)) { @@ -108,7 +108,7 @@ class CRM_Dedupe_Finder { } if (!$foundByID) { - $rgBao = new CRM_Dedupe_BAO_RuleGroup(); + $rgBao = new CRM_Dedupe_BAO_DedupeRuleGroup(); $rgBao->contact_type = $ctype; $rgBao->used = $used; if (!$rgBao->find(TRUE)) { @@ -258,7 +258,7 @@ class CRM_Dedupe_Finder { } $params = []; - $supportedFields = CRM_Dedupe_BAO_RuleGroup::supportedFields($ctype); + $supportedFields = CRM_Dedupe_BAO_DedupeRuleGroup::supportedFields($ctype); if (is_array($supportedFields)) { foreach ($supportedFields as $table => $fields) { if ($table === 'civicrm_address') { diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php index 1a48c744b5..f347897568 100644 --- a/CRM/Dedupe/Merger.php +++ b/CRM/Dedupe/Merger.php @@ -1702,7 +1702,7 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m * @return string */ public static function getMergeCacheKeyString($rule_group_id, $group_id, $criteria, $checkPermissions, $searchLimit) { - $contactType = CRM_Dedupe_BAO_RuleGroup::getContactTypeForRuleGroup($rule_group_id); + $contactType = CRM_Dedupe_BAO_DedupeRuleGroup::getContactTypeForRuleGroup($rule_group_id); $cacheKeyString = "merge_{$contactType}"; $cacheKeyString .= $rule_group_id ? "_{$rule_group_id}" : '_0'; $cacheKeyString .= $group_id ? "_{$group_id}" : '_0'; diff --git a/CRM/Event/BAO/Participant.php b/CRM/Event/BAO/Participant.php index d4a44a57a2..90b9a2f6aa 100644 --- a/CRM/Event/BAO/Participant.php +++ b/CRM/Event/BAO/Participant.php @@ -652,7 +652,7 @@ INNER JOIN civicrm_price_field field ON ( value.price_field_id = field.id 'contact_type' => $contactType, 'used' => 'Unsupervised', ]; - $fieldsArray = CRM_Dedupe_BAO_Rule::dedupeRuleFields($ruleParams); + $fieldsArray = CRM_Dedupe_BAO_DedupeRule::dedupeRuleFields($ruleParams); if (is_array($fieldsArray)) { foreach ($fieldsArray as $value) { diff --git a/CRM/Event/Form/ManageEvent/Registration.php b/CRM/Event/Form/ManageEvent/Registration.php index 30cb12c564..16fcd9c3f5 100644 --- a/CRM/Event/Form/ManageEvent/Registration.php +++ b/CRM/Event/Form/ManageEvent/Registration.php @@ -236,7 +236,7 @@ class CRM_Event_Form_ManageEvent_Registration extends CRM_Event_Form_ManageEvent 'used' => 'Supervised', 'contact_type' => 'Individual', ]; - $dedupeRuleFields = CRM_Dedupe_BAO_Rule::dedupeRuleFields($params); + $dedupeRuleFields = CRM_Dedupe_BAO_DedupeRule::dedupeRuleFields($params); foreach ($dedupeRuleFields as $key => $fields) { $ruleFields[$key] = ucwords(str_replace('_', ' ', $fields)); @@ -260,7 +260,7 @@ class CRM_Event_Form_ManageEvent_Registration extends CRM_Event_Form_ManageEvent $dedupeRules = [ '' => '- Unsupervised rule -', ]; - $dedupeRules += CRM_Dedupe_BAO_RuleGroup::getByType('Individual'); + $dedupeRules += CRM_Dedupe_BAO_DedupeRuleGroup::getByType('Individual'); $this->add('select', 'dedupe_rule_group_id', ts('Duplicate matching rule'), $dedupeRules); $participantStatuses = CRM_Event_PseudoConstant::participantStatus(); @@ -688,11 +688,11 @@ class CRM_Event_Form_ManageEvent_Registration extends CRM_Event_Form_ManageEvent if ($rgId > 0) { $rgParams['id'] = $rgId; } - $activeRg = CRM_Dedupe_BAO_RuleGroup::dedupeRuleFieldsWeight($rgParams); + $activeRg = CRM_Dedupe_BAO_DedupeRuleGroup::dedupeRuleFieldsWeight($rgParams); // get the combinations that could be a match for the rule $okCombos = $combos = []; - CRM_Dedupe_BAO_RuleGroup::combos($activeRg[0], $activeRg[1], $combos); + CRM_Dedupe_BAO_DedupeRuleGroup::combos($activeRg[0], $activeRg[1], $combos); // create an index of what combinations involve each field $index = []; diff --git a/CRM/Event/Import/Parser/Participant.php b/CRM/Event/Import/Parser/Participant.php index 423c37adea..8b679deff3 100644 --- a/CRM/Event/Import/Parser/Participant.php +++ b/CRM/Event/Import/Parser/Participant.php @@ -396,7 +396,7 @@ class CRM_Event_Import_Parser_Participant extends CRM_Event_Import_Parser { 'contact_type' => $this->_contactType, 'used' => 'Unsupervised', ]; - $fieldsArray = CRM_Dedupe_BAO_Rule::dedupeRuleFields($ruleParams); + $fieldsArray = CRM_Dedupe_BAO_DedupeRule::dedupeRuleFields($ruleParams); $disp = ''; foreach ($fieldsArray as $value) { diff --git a/CRM/Import/Form/MapField.php b/CRM/Import/Form/MapField.php index 31212c0dee..41fe9a6da5 100644 --- a/CRM/Import/Form/MapField.php +++ b/CRM/Import/Form/MapField.php @@ -180,7 +180,7 @@ abstract class CRM_Import_Form_MapField extends CRM_Core_Form { * Message if insufficient fields are present. Empty string otherwise. */ protected static function validateRequiredContactMatchFields(string $contactType, array $importKeys): string { - [$ruleFields, $threshold] = CRM_Dedupe_BAO_RuleGroup::dedupeRuleFieldsWeight([ + [$ruleFields, $threshold] = CRM_Dedupe_BAO_DedupeRuleGroup::dedupeRuleFieldsWeight([ 'used' => 'Unsupervised', 'contact_type' => $contactType, ]); diff --git a/CRM/Member/BAO/Membership.php b/CRM/Member/BAO/Membership.php index f03cc9af7d..98f2f530e4 100644 --- a/CRM/Member/BAO/Membership.php +++ b/CRM/Member/BAO/Membership.php @@ -925,7 +925,7 @@ INNER JOIN civicrm_membership_type type ON ( type.id = membership.membership_ty 'contact_type' => $contactType, 'used' => 'Unsupervised', ]; - $fieldsArray = CRM_Dedupe_BAO_Rule::dedupeRuleFields($ruleParams); + $fieldsArray = CRM_Dedupe_BAO_DedupeRule::dedupeRuleFields($ruleParams); $tmpContactField = []; if (is_array($fieldsArray)) { diff --git a/CRM/Member/Import/Form/MapField.php b/CRM/Member/Import/Form/MapField.php index 4d341f9837..de1f18b1d7 100644 --- a/CRM/Member/Import/Form/MapField.php +++ b/CRM/Member/Import/Form/MapField.php @@ -315,7 +315,7 @@ class CRM_Member_Import_Form_MapField extends CRM_Import_Form_MapField { 'used' => 'Unsupervised', 'contact_type' => $contactTypes[$contactTypeId], ); - list($ruleFields, $threshold) = CRM_Dedupe_BAO_RuleGroup::dedupeRuleFieldsWeight($params); + list($ruleFields, $threshold) = CRM_Dedupe_BAO_DedupeRuleGroup::dedupeRuleFieldsWeight($params); $weightSum = 0; foreach ($importKeys as $key => $val) { if (array_key_exists($val, $ruleFields)) { diff --git a/CRM/Member/Import/Parser/Membership.php b/CRM/Member/Import/Parser/Membership.php index 0a649a2b23..08b9e6a493 100644 --- a/CRM/Member/Import/Parser/Membership.php +++ b/CRM/Member/Import/Parser/Membership.php @@ -448,7 +448,7 @@ class CRM_Member_Import_Parser_Membership extends CRM_Member_Import_Parser { 'contact_type' => $this->_contactType, 'used' => 'Unsupervised', ]; - $fieldsArray = CRM_Dedupe_BAO_Rule::dedupeRuleFields($ruleParams); + $fieldsArray = CRM_Dedupe_BAO_DedupeRule::dedupeRuleFields($ruleParams); $disp = ''; foreach ($fieldsArray as $value) { diff --git a/Civi/Api4/DedupeException.php b/Civi/Api4/DedupeException.php index 047631df65..1100587b68 100644 --- a/Civi/Api4/DedupeException.php +++ b/Civi/Api4/DedupeException.php @@ -24,6 +24,7 @@ namespace Civi\Api4; * * This api exposes CiviCRM (dedupe) exceptions. * + * @searchable none * @see https://docs.civicrm.org/user/en/latest/organising-your-data/contacts/ * @package Civi\Api4 */ diff --git a/Civi/Api4/DedupeRule.php b/Civi/Api4/DedupeRule.php index 8ef4cc3373..dafcda898e 100644 --- a/Civi/Api4/DedupeRule.php +++ b/Civi/Api4/DedupeRule.php @@ -24,6 +24,7 @@ namespace Civi\Api4; * * This api exposes CiviCRM (dedupe) rules. * + * @searchable none * @see https://docs.civicrm.org/user/en/latest/organising-your-data/contacts/ * @package Civi\Api4 */ diff --git a/Civi/Api4/DedupeRuleGroup.php b/Civi/Api4/DedupeRuleGroup.php index 64bf026a87..70433a1c04 100644 --- a/Civi/Api4/DedupeRuleGroup.php +++ b/Civi/Api4/DedupeRuleGroup.php @@ -24,6 +24,7 @@ namespace Civi\Api4; * * This api exposes CiviCRM (dedupe) groups. * + * @searchable none * @see https://docs.civicrm.org/user/en/latest/organising-your-data/contacts/ * @package Civi\Api4 */ diff --git a/tests/phpunit/CRM/Core/PseudoConstantTest.php b/tests/phpunit/CRM/Core/PseudoConstantTest.php index ff58d66412..edc5f66f50 100644 --- a/tests/phpunit/CRM/Core/PseudoConstantTest.php +++ b/tests/phpunit/CRM/Core/PseudoConstantTest.php @@ -202,7 +202,7 @@ class CRM_Core_PseudoConstantTest extends CiviUnitTestCase { 'sample' => 'Email', ], ], - 'CRM_Dedupe_DAO_RuleGroup' => [ + 'CRM_Dedupe_DAO_DedupeRuleGroup' => [ [ 'fieldName' => 'contact_type', 'sample' => 'Individual', diff --git a/tests/phpunit/CRM/Dedupe/BAO/RuleGroupTest.php b/tests/phpunit/CRM/Dedupe/BAO/RuleGroupTest.php index 7d9925d582..abb949c5b9 100644 --- a/tests/phpunit/CRM/Dedupe/BAO/RuleGroupTest.php +++ b/tests/phpunit/CRM/Dedupe/BAO/RuleGroupTest.php @@ -19,7 +19,7 @@ class CRM_Dedupe_BAO_RuleGroupTest extends CiviUnitTestCase { * importable & exportable fields. */ public function testSupportedFields() { - $fields = CRM_Dedupe_BAO_RuleGroup::supportedFields('Organization'); + $fields = CRM_Dedupe_BAO_DedupeRuleGroup::supportedFields('Organization'); $this->assertEquals([ 'civicrm_address' => diff --git a/tests/phpunit/CRM/Dedupe/MergerTest.php b/tests/phpunit/CRM/Dedupe/MergerTest.php index 525c539d05..80168f2ae2 100644 --- a/tests/phpunit/CRM/Dedupe/MergerTest.php +++ b/tests/phpunit/CRM/Dedupe/MergerTest.php @@ -160,7 +160,7 @@ class CRM_Dedupe_MergerTest extends CiviUnitTestCase { // verify that all contacts have been created separately $this->assertEquals(count($this->_contactIds), 9, 'Check for number of contacts.'); - $dao = new CRM_Dedupe_DAO_RuleGroup(); + $dao = new CRM_Dedupe_DAO_DedupeRuleGroup(); $dao->contact_type = 'Individual'; $dao->name = 'IndividualSupervised'; $dao->is_default = 1; @@ -230,7 +230,7 @@ class CRM_Dedupe_MergerTest extends CiviUnitTestCase { // verify that all contacts have been created separately $this->assertEquals(count($this->_contactIds), 9, 'Check for number of contacts.'); - $dao = new CRM_Dedupe_DAO_RuleGroup(); + $dao = new CRM_Dedupe_DAO_DedupeRuleGroup(); $dao->contact_type = 'Individual'; $dao->name = 'IndividualSupervised'; $dao->is_default = 1; -- 2.25.1