Skip to content

Commit

Permalink
Remove in-between class
Browse files Browse the repository at this point in the history 
A universe search finds no other references
  • Loading branch information
@eileenmcnaughton
eileenmcnaughton committed Apr 15, 2022
1 parent 2d8aa03 commit 3e6094d
Show file tree
Hide file tree
Showing 10 changed files with 1,099 additions and 1,117 deletions.
8 changes: 4 additions & 4 deletions .toxic.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
"CRM_Contact_BAO_Relationship::relatedMemberships()": "toxicAlert",
"CRM_Contact_Form_Contact::postProcess()": "toxicAlert",
"CRM_Contact_Import_Form_MapField::buildQuickForm()": "toxicAlert",
"CRM_Contact_Import_Parser::formatCommonData()": "toxicAlert",
"CRM_Contact_Import_Parser::formatContactParameters()": "toxicAlert",
"CRM_Contact_Import_Parser::run()": "toxicAlert",
"CRM_Contact_Import_Parser_Contact::formatCommonData()": "toxicAlert",
"CRM_Contact_Import_Parser_Contact::formatContactParameters()": "toxicAlert",
"CRM_Contact_Import_Parser_Contact::run()": "toxicAlert",
"CRM_Contact_Import_Parser_Contact::import()": "toxicAlert",
"CRM_Contribute_BAO_Contribution::recordFinancialAccounts()": "toxicAlert",
"CRM_Contribute_BAO_Contribution::transitionComponents()": "toxicAlert",
Expand Down Expand Up @@ -78,4 +78,4 @@
"api_v3_JobTest::getMergeLocations()": "toxicAlert",
"api_v3_JobTest::getMergeSets()": "toxicAlert"
}
}
}
2 changes: 1 addition & 1 deletion CRM/Contact/Import/Form/DataSource.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ public function postProcess() {
$fieldNames['status'],
CRM_Import_Parser::DUPLICATE_SKIP,
NULL, NULL, FALSE,
CRM_Contact_Import_Parser::DEFAULT_TIMEOUT,
CRM_Contact_Import_Parser_Contact::DEFAULT_TIMEOUT,
$storeParams['contactSubType'],
$storeParams['dedupe']
);
Expand Down
2 changes: 1 addition & 1 deletion CRM/Contact/Import/Form/MapField.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,7 @@ public function submit($params, $mapperKeys) {
$statusFieldName,
$this->_onDuplicate,
NULL, NULL, FALSE,
CRM_Contact_Import_Parser::DEFAULT_TIMEOUT,
CRM_Contact_Import_Parser_Contact::DEFAULT_TIMEOUT,
$this->get('contactSubType'),
$this->get('dedupe')
);
Expand Down
20 changes: 10 additions & 10 deletions CRM/Contact/Import/Form/Preview.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,17 +63,17 @@ public function preProcess() {
}

if ($invalidRowCount) {
$urlParams = 'type=' . CRM_Import_Parser::ERROR . '&parser=CRM_Contact_Import_Parser';
$urlParams = 'type=' . CRM_Import_Parser::ERROR . '&parser=CRM_Contact_Import_Parser_Contact';
$this->set('downloadErrorRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
}

if ($conflictRowCount) {
$urlParams = 'type=' . CRM_Import_Parser::CONFLICT . '&parser=CRM_Contact_Import_Parser';
$urlParams = 'type=' . CRM_Import_Parser::CONFLICT . '&parser=CRM_Contact_Import_Parser_Contact';
$this->set('downloadConflictRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
}

if ($mismatchCount) {
$urlParams = 'type=' . CRM_Import_Parser::NO_MATCH . '&parser=CRM_Contact_Import_Parser';
$urlParams = 'type=' . CRM_Import_Parser::NO_MATCH . '&parser=CRM_Contact_Import_Parser_Contact';
$this->set('downloadMismatchRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
}

Expand Down Expand Up @@ -280,13 +280,13 @@ public function postProcess() {

$this->set('errorFile', $errorFile);

$urlParams = 'type=' . CRM_Import_Parser::ERROR . '&parser=CRM_Contact_Import_Parser';
$urlParams = 'type=' . CRM_Import_Parser::ERROR . '&parser=CRM_Contact_Import_Parser_Contact';
$this->set('downloadErrorRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));

$urlParams = 'type=' . CRM_Import_Parser::CONFLICT . '&parser=CRM_Contact_Import_Parser';
$urlParams = 'type=' . CRM_Import_Parser::CONFLICT . '&parser=CRM_Contact_Import_Parser_Contact';
$this->set('downloadConflictRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));

$urlParams = 'type=' . CRM_Import_Parser::NO_MATCH . '&parser=CRM_Contact_Import_Parser';
$urlParams = 'type=' . CRM_Import_Parser::NO_MATCH . '&parser=CRM_Contact_Import_Parser_Contact';
$this->set('downloadMismatchRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
}

Expand Down Expand Up @@ -416,7 +416,7 @@ public function postProcessOld() {
$this->get('statusID'),
$this->get('totalRowCount'),
$doGeocodeAddress,
CRM_Contact_Import_Parser::DEFAULT_TIMEOUT,
CRM_Contact_Import_Parser_Contact::DEFAULT_TIMEOUT,
$this->get('contactSubType'),
$this->get('dedupe')
);
Expand Down Expand Up @@ -544,13 +544,13 @@ public function postProcessOld() {

$this->set('errorFile', $errorFile);

$urlParams = 'type=' . CRM_Import_Parser::ERROR . '&parser=CRM_Contact_Import_Parser';
$urlParams = 'type=' . CRM_Import_Parser::ERROR . '&parser=CRM_Contact_Import_Parser_Contact';
$this->set('downloadErrorRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlparams));

$urlParams = 'type=' . CRM_Import_Parser::CONFLICT . '&parser=CRM_Contact_Import_Parser';
$urlParams = 'type=' . CRM_Import_Parser::CONFLICT . '&parser=CRM_Contact_Import_Parser_Contact';
$this->set('downloadConflictRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));

$urlParams = 'type=' . CRM_Import_Parser::NO_MATCH . '&parser=CRM_Contact_Import_Parser';
$urlParams = 'type=' . CRM_Import_Parser::NO_MATCH . '&parser=CRM_Contact_Import_Parser_Contact';
$this->set('downloadMismatchRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
}
}
Expand Down
6 changes: 3 additions & 3 deletions CRM/Contact/Import/Form/Summary.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,19 @@ public function preProcess() {
$mismatchCount = $this->get('unMatchCount');
$unparsedAddressCount = $this->get('unparsedAddressCount');
if ($duplicateRowCount > 0) {
$urlParams = 'type=' . CRM_Import_Parser::DUPLICATE . '&parser=CRM_Contact_Import_Parser';
$urlParams = 'type=' . CRM_Import_Parser::DUPLICATE . '&parser=CRM_Contact_Import_Parser_Contact';
$this->set('downloadDuplicateRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
}
elseif ($mismatchCount) {
$urlParams = 'type=' . CRM_Import_Parser::NO_MATCH . '&parser=CRM_Contact_Import_Parser';
$urlParams = 'type=' . CRM_Import_Parser::NO_MATCH . '&parser=CRM_Contact_Import_Parser_Contact';
$this->set('downloadMismatchRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
}
else {
$duplicateRowCount = 0;
$this->set('duplicateRowCount', $duplicateRowCount);
}
if ($unparsedAddressCount) {
$urlParams = 'type=' . CRM_Import_Parser::UNPARSED_ADDRESS_WARNING . '&parser=CRM_Contact_Import_Parser';
$urlParams = 'type=' . CRM_Import_Parser::UNPARSED_ADDRESS_WARNING . '&parser=CRM_Contact_Import_Parser_Contact';
$this->assign('downloadAddressRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
$unparsedStreetAddressString = ts('Records imported successfully but unable to parse some of the street addresses');
$this->assign('unparsedStreetAddressString', $unparsedStreetAddressString);
Expand Down
2 changes: 1 addition & 1 deletion CRM/Contact/Import/ImportJob.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ public function runImport(&$form, $timeout = 55) {
$this->_statusID,
$this->_totalRowCount,
$this->_doGeocodeAddress,
CRM_Contact_Import_Parser::DEFAULT_TIMEOUT,
CRM_Contact_Import_Parser_Contact::DEFAULT_TIMEOUT,
$this->_contactSubType,
$this->_dedupe
);
Expand Down
Loading

0 comments on commit 3e6094d

Please sign in to comment.