From f3e5bb875ec5b676e96f133dbe5cbac553d7d793 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Tue, 6 Sep 2022 12:29:19 +1200 Subject: [PATCH] Remove silly constants for Contact Types (import) --- CRM/Contact/Import/Form/DataSource.php | 14 +++++++------- CRM/Custom/Import/Form/DataSource.php | 2 +- CRM/Import/Form/DataSource.php | 8 ++++---- CRM/Import/Forms.php | 6 +++--- CRM/Import/ImportProcessor.php | 6 +++--- CRM/Import/Parser.php | 10 ++++++---- ext/civiimport/tests/phpunit/CiviApiImportTest.php | 2 +- .../CRM/Activity/Import/Parser/ActivityTest.php | 2 +- .../CRM/Contact/Import/Form/DataSourceTest.php | 4 ++-- .../CRM/Contact/Import/Form/MapFieldTest.php | 8 ++++---- .../CRM/Contact/Import/Parser/ContactTest.php | 12 ++++++------ .../Contribute/Import/Parser/ContributionTest.php | 6 +++--- .../CRM/Event/Import/Parser/ParticipantTest.php | 4 ++-- tests/phpunit/CRM/Import/DataSource/CsvTest.php | 2 +- .../CRM/Member/Import/Parser/MembershipTest.php | 4 ++-- tests/phpunit/CRMTraits/Import/ParserTrait.php | 4 ++-- 16 files changed, 48 insertions(+), 46 deletions(-) diff --git a/CRM/Contact/Import/Form/DataSource.php b/CRM/Contact/Import/Form/DataSource.php index 362fd60de5..068450aba5 100644 --- a/CRM/Contact/Import/Form/DataSource.php +++ b/CRM/Contact/Import/Form/DataSource.php @@ -106,16 +106,16 @@ class CRM_Contact_Import_Form_DataSource extends CRM_Import_Form_DataSource { // contact types option $contactTypeOptions = $contactTypeAttributes = []; if (CRM_Contact_BAO_ContactType::isActive('Individual')) { - $contactTypeOptions[CRM_Import_Parser::CONTACT_INDIVIDUAL] = ts('Individual'); - $contactTypeAttributes[CRM_Import_Parser::CONTACT_INDIVIDUAL] = $js; + $contactTypeOptions['Individual'] = ts('Individual'); + $contactTypeAttributes['Individual'] = $js; } if (CRM_Contact_BAO_ContactType::isActive('Household')) { - $contactTypeOptions[CRM_Import_Parser::CONTACT_HOUSEHOLD] = ts('Household'); - $contactTypeAttributes[CRM_Import_Parser::CONTACT_HOUSEHOLD] = $js; + $contactTypeOptions['Household'] = ts('Household'); + $contactTypeAttributes['Household'] = $js; } if (CRM_Contact_BAO_ContactType::isActive('Organization')) { - $contactTypeOptions[CRM_Import_Parser::CONTACT_ORGANIZATION] = ts('Organization'); - $contactTypeAttributes[CRM_Import_Parser::CONTACT_ORGANIZATION] = $js; + $contactTypeOptions['Organization'] = ts('Organization'); + $contactTypeAttributes['Organization'] = $js; } $this->addRadio('contactType', ts('Contact Type'), $contactTypeOptions, [], NULL, FALSE, $contactTypeAttributes); @@ -162,7 +162,7 @@ class CRM_Contact_Import_Form_DataSource extends CRM_Import_Form_DataSource { $defaults = [ 'dataSource' => $this->getDefaultDataSource(), 'onDuplicate' => CRM_Import_Parser::DUPLICATE_SKIP, - 'contactType' => CRM_Import_Parser::CONTACT_INDIVIDUAL, + 'contactType' => 'Individual', 'fieldSeparator' => CRM_Core_Config::singleton()->fieldSeparator, 'disableUSPS' => TRUE, ]; diff --git a/CRM/Custom/Import/Form/DataSource.php b/CRM/Custom/Import/Form/DataSource.php index 394df3b2e6..326a759a1c 100644 --- a/CRM/Custom/Import/Form/DataSource.php +++ b/CRM/Custom/Import/Form/DataSource.php @@ -101,7 +101,7 @@ class CRM_Custom_Import_Form_DataSource extends CRM_Import_Form_DataSource { public function setDefaultValues(): array { $config = CRM_Core_Config::singleton(); $defaults = [ - 'contactType' => CRM_Import_Parser::CONTACT_INDIVIDUAL, + 'contactType' => 'Individual', 'fieldSeparator' => $config->fieldSeparator, // Perhaps never used, but permits url passing of the group. 'multipleCustomData' => CRM_Utils_Request::retrieve('id', 'Positive', $this), diff --git a/CRM/Import/Form/DataSource.php b/CRM/Import/Form/DataSource.php index a91c459fbb..7376d96340 100644 --- a/CRM/Import/Form/DataSource.php +++ b/CRM/Import/Form/DataSource.php @@ -126,18 +126,18 @@ abstract class CRM_Import_Form_DataSource extends CRM_Import_Forms { //contact types option $contactTypeOptions = []; if (CRM_Contact_BAO_ContactType::isActive('Individual')) { - $contactTypeOptions[CRM_Import_Parser::CONTACT_INDIVIDUAL] = ts('Individual'); + $contactTypeOptions['Individual'] = ts('Individual'); } if (CRM_Contact_BAO_ContactType::isActive('Household')) { - $contactTypeOptions[CRM_Import_Parser::CONTACT_HOUSEHOLD] = ts('Household'); + $contactTypeOptions['Household'] = ts('Household'); } if (CRM_Contact_BAO_ContactType::isActive('Organization')) { - $contactTypeOptions[CRM_Import_Parser::CONTACT_ORGANIZATION] = ts('Organization'); + $contactTypeOptions['Organization'] = ts('Organization'); } $this->addRadio('contactType', ts('Contact Type'), $contactTypeOptions); $this->setDefaults([ - 'contactType' => CRM_Import_Parser::CONTACT_INDIVIDUAL, + 'contactType' => 'Individual', ]); } diff --git a/CRM/Import/Forms.php b/CRM/Import/Forms.php index d876356f0f..da50cf3f69 100644 --- a/CRM/Import/Forms.php +++ b/CRM/Import/Forms.php @@ -343,9 +343,9 @@ class CRM_Import_Forms extends CRM_Core_Form { */ protected function getContactType(): string { $contactTypeMapping = [ - CRM_Import_Parser::CONTACT_INDIVIDUAL => 'Individual', - CRM_Import_Parser::CONTACT_HOUSEHOLD => 'Household', - CRM_Import_Parser::CONTACT_ORGANIZATION => 'Organization', + 'Individual' => 'Individual', + 'Household' => 'Household', + 'Organization' => 'Organization', ]; return $contactTypeMapping[$this->getSubmittedValue('contactType')]; } diff --git a/CRM/Import/ImportProcessor.php b/CRM/Import/ImportProcessor.php index bc72dd2c9e..77c0b39371 100644 --- a/CRM/Import/ImportProcessor.php +++ b/CRM/Import/ImportProcessor.php @@ -216,9 +216,9 @@ class CRM_Import_ImportProcessor { */ public function setContactTypeByConstant($contactTypeKey) { $constantTypeMap = [ - CRM_Import_Parser::CONTACT_INDIVIDUAL => 'Individual', - CRM_Import_Parser::CONTACT_HOUSEHOLD => 'Household', - CRM_Import_Parser::CONTACT_ORGANIZATION => 'Organization', + 'Individual' => 'Individual', + 'Household' => 'Household', + 'Organization' => 'Organization', ]; $this->contactType = $constantTypeMap[$contactTypeKey]; } diff --git a/CRM/Import/Parser.php b/CRM/Import/Parser.php index 40aaee0530..4a6176bd98 100644 --- a/CRM/Import/Parser.php +++ b/CRM/Import/Parser.php @@ -52,8 +52,10 @@ abstract class CRM_Import_Parser implements UserJobInterface { /** * Contact types + * + * @deprecated */ - const CONTACT_INDIVIDUAL = 1, CONTACT_HOUSEHOLD = 2, CONTACT_ORGANIZATION = 4; + const CONTACT_INDIVIDUAL = 'Individual', CONTACT_HOUSEHOLD = 'Household', CONTACT_ORGANIZATION = 'Organization'; /** * User job id. @@ -205,9 +207,9 @@ abstract class CRM_Import_Parser implements UserJobInterface { protected function getContactType(): string { if (!$this->_contactType) { $contactTypeMapping = [ - CRM_Import_Parser::CONTACT_INDIVIDUAL => 'Individual', - CRM_Import_Parser::CONTACT_HOUSEHOLD => 'Household', - CRM_Import_Parser::CONTACT_ORGANIZATION => 'Organization', + 'Individual' => 'Individual', + 'Household' => 'Household', + 'Organization' => 'Organization', ]; $this->_contactType = $contactTypeMapping[$this->getSubmittedValue('contactType')]; } diff --git a/ext/civiimport/tests/phpunit/CiviApiImportTest.php b/ext/civiimport/tests/phpunit/CiviApiImportTest.php index 4fe33bfae3..ecf19f164b 100644 --- a/ext/civiimport/tests/phpunit/CiviApiImportTest.php +++ b/ext/civiimport/tests/phpunit/CiviApiImportTest.php @@ -56,7 +56,7 @@ class CiviApiImportTest extends TestCase implements HeadlessInterface, HookInter 'metadata' => [ 'DataSource' => ['table_name' => 'abc', 'column_headers' => ['External Identifier', 'Amount Given', 'Date Received', 'Financial Type', 'In honor']], 'submitted_values' => [ - 'contactType' => CRM_Import_Parser::CONTACT_INDIVIDUAL, + 'contactType' => 'Individual', 'contactSubType' => '', 'dataSource' => 'CRM_Import_DataSource_SQL', 'onDuplicate' => CRM_Import_Parser::DUPLICATE_SKIP, diff --git a/tests/phpunit/CRM/Activity/Import/Parser/ActivityTest.php b/tests/phpunit/CRM/Activity/Import/Parser/ActivityTest.php index 92fa74a7ca..afc06a9c96 100644 --- a/tests/phpunit/CRM/Activity/Import/Parser/ActivityTest.php +++ b/tests/phpunit/CRM/Activity/Import/Parser/ActivityTest.php @@ -359,7 +359,7 @@ class CRM_Activity_Import_Parser_ActivityTest extends CiviUnitTestCase { $userJobID = UserJob::create()->setValues([ 'metadata' => [ 'submitted_values' => array_merge([ - 'contactType' => CRM_Import_Parser::CONTACT_INDIVIDUAL, + 'contactType' => 'Individual', 'contactSubType' => '', 'dataSource' => 'CRM_Import_DataSource_SQL', 'sqlQuery' => 'SELECT first_name FROM civicrm_contact', diff --git a/tests/phpunit/CRM/Contact/Import/Form/DataSourceTest.php b/tests/phpunit/CRM/Contact/Import/Form/DataSourceTest.php index 0be4ff52b4..a8ed3cc31f 100644 --- a/tests/phpunit/CRM/Contact/Import/Form/DataSourceTest.php +++ b/tests/phpunit/CRM/Contact/Import/Form/DataSourceTest.php @@ -62,7 +62,7 @@ class CRM_Contact_Import_Form_DataSourceTest extends CiviUnitTestCase { $sqlFormValues = [ 'dataSource' => 'CRM_Import_DataSource_SQL', 'sqlQuery' => 'SELECT "bob" as first_name FROM civicrm_option_value LIMIT 5', - 'contactType' => CRM_Import_Parser::CONTACT_INDIVIDUAL, + 'contactType' => 'Individual', ]; $form = $this->submitDataSourceForm($sqlFormValues); $userJobID = $form->getUserJobID(); @@ -89,7 +89,7 @@ class CRM_Contact_Import_Form_DataSourceTest extends CiviUnitTestCase { $csvFormValues = [ 'dataSource' => 'CRM_Import_DataSource_CSV', 'skipColumnHeader' => 1, - 'contactType' => CRM_Import_Parser::CONTACT_INDIVIDUAL, + 'contactType' => 'Individual', 'uploadFile' => [ 'name' => __DIR__ . '/data/yogi.csv', 'type' => 'text/csv', diff --git a/tests/phpunit/CRM/Contact/Import/Form/MapFieldTest.php b/tests/phpunit/CRM/Contact/Import/Form/MapFieldTest.php index e5b332e8e2..b60dc80bba 100644 --- a/tests/phpunit/CRM/Contact/Import/Form/MapFieldTest.php +++ b/tests/phpunit/CRM/Contact/Import/Form/MapFieldTest.php @@ -146,7 +146,7 @@ class CRM_Contact_Import_Form_MapFieldTest extends CiviUnitTestCase { public function getMapFieldFormObject(array $submittedValues = []): CRM_Contact_Import_Form_MapField { CRM_Core_DAO::executeQuery('CREATE TABLE IF NOT EXISTS civicrm_tmp_d_import_job_xxx (`nada` text, `first_name` text, `last_name` text, `address` text) ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci'); $submittedValues = array_merge([ - 'contactType' => CRM_Import_Parser::CONTACT_INDIVIDUAL, + 'contactType' => 'Individual', 'contactSubType' => '', 'dataSource' => 'CRM_Import_DataSource_SQL', 'sqlQuery' => 'SELECT * FROM civicrm_tmp_d_import_job_xxx', @@ -227,7 +227,7 @@ class CRM_Contact_Import_Form_MapFieldTest extends CiviUnitTestCase { $this->assertEquals($this->getCustomFieldName('text'), $processor->getFieldName(4)); $this->assertEquals('url', $processor->getFieldName(8)); - $processor->setContactTypeByConstant(CRM_Import_Parser::CONTACT_HOUSEHOLD); + $processor->setContactTypeByConstant('Household'); $this->assertEquals('Household', $processor->getContactType()); } @@ -346,7 +346,7 @@ class CRM_Contact_Import_Form_MapFieldTest extends CiviUnitTestCase { $processor->setMappingID($mappingID); $processor->setFormName('document.forms.MapField'); $processor->setMetadata($this->getContactImportMetadata()); - $processor->setContactTypeByConstant(CRM_Import_Parser::CONTACT_INDIVIDUAL); + $processor->setContactTypeByConstant('Individual'); $defaults = []; $defaults["mapper[$columnNumber]"] = $processor->getSavedQuickformDefaultsForColumn($columnNumber); @@ -362,7 +362,7 @@ class CRM_Contact_Import_Form_MapFieldTest extends CiviUnitTestCase { */ private function setUpMapFieldForm(): void { $this->form = $this->getMapFieldFormObject(); - $this->form->set('contactType', CRM_Import_Parser::CONTACT_INDIVIDUAL); + $this->form->set('contactType', 'Individual'); } /** diff --git a/tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php b/tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php index ba35fc26fc..82de4d30bb 100644 --- a/tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php +++ b/tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php @@ -1110,14 +1110,14 @@ class CRM_Contact_Import_Parser_ContactTest extends CiviUnitTestCase { 'csv' => 'organization_email_no_organization_name.csv', 'mapper' => [['email'], ['phone', 1, 1]], 'expected_error' => 'Missing required fields: Organization Name', - 'submitted_values' => ['onDuplicate' => CRM_Import_Parser::DUPLICATE_SKIP, 'contactType' => CRM_Import_Parser::CONTACT_ORGANIZATION], + 'submitted_values' => ['onDuplicate' => CRM_Import_Parser::DUPLICATE_SKIP, 'contactType' => 'Organization'], ], 'organization_email_no_organization_name_update_mode' => [ // Email is enough in upgrade mode (at least to pass validate). 'csv' => 'organization_email_no_organization_name.csv', 'mapper' => [['email'], ['phone', 1, 1]], 'expected_error' => '', - 'submitted_values' => ['onDuplicate' => CRM_Import_Parser::DUPLICATE_UPDATE, 'contactType' => CRM_Import_Parser::CONTACT_ORGANIZATION], + 'submitted_values' => ['onDuplicate' => CRM_Import_Parser::DUPLICATE_UPDATE, 'contactType' => 'Organization'], ], ]; } @@ -1209,7 +1209,7 @@ class CRM_Contact_Import_Parser_ContactTest extends CiviUnitTestCase { CRM_Import_Parser::ERROR => 1, ], 'submitted_values' => [ - 'contactType' => CRM_Import_Parser::CONTACT_ORGANIZATION, + 'contactType' => 'Organization', ], ], //Matching this contact based on the de-dupe rule would cause an external ID conflict @@ -1788,7 +1788,7 @@ class CRM_Contact_Import_Parser_ContactTest extends CiviUnitTestCase { 'skipColumnHeader' => TRUE, 'fieldSeparator' => ',', 'onDuplicate' => CRM_Import_Parser::DUPLICATE_SKIP, - 'contactType' => CRM_Import_Parser::CONTACT_INDIVIDUAL, + 'contactType' => 'Individual', 'mapper' => $mapper, 'dataSource' => 'CRM_Import_DataSource_CSV', ], $submittedValues)); @@ -2046,7 +2046,7 @@ class CRM_Contact_Import_Parser_ContactTest extends CiviUnitTestCase { $userJobID = UserJob::create()->setValues([ 'metadata' => [ 'submitted_values' => array_merge([ - 'contactType' => CRM_Import_Parser::CONTACT_INDIVIDUAL, + 'contactType' => 'Individual', 'contactSubType' => '', 'doGeocodeAddress' => 0, 'disableUSPS' => 0, @@ -2120,7 +2120,7 @@ class CRM_Contact_Import_Parser_ContactTest extends CiviUnitTestCase { 'uploadFile' => ['name' => __DIR__ . '/../Form/data/' . $csv], 'skipColumnHeader' => TRUE, 'fieldSeparator' => ',', - 'contactType' => CRM_Import_Parser::CONTACT_INDIVIDUAL, + 'contactType' => 'Individual', 'mapper' => $mapper, 'dataSource' => 'CRM_Import_DataSource_CSV', 'file' => ['name' => $csv], diff --git a/tests/phpunit/CRM/Contribute/Import/Parser/ContributionTest.php b/tests/phpunit/CRM/Contribute/Import/Parser/ContributionTest.php index 85dc689dfc..6c36e0cad7 100644 --- a/tests/phpunit/CRM/Contribute/Import/Parser/ContributionTest.php +++ b/tests/phpunit/CRM/Contribute/Import/Parser/ContributionTest.php @@ -355,7 +355,7 @@ class CRM_Contribute_Import_Parser_ContributionTest extends CiviUnitTestCase { $form = $this->getMapFieldForm([ 'onDuplicate' => CRM_Import_Parser::DUPLICATE_SKIP, 'mapper' => $this->getMapperFromFieldMappings($mappings), - 'contactType' => CRM_Import_Parser::CONTACT_INDIVIDUAL, + 'contactType' => 'Individual', ]); $form->setUserJobID($this->userJobID); $form->buildForm(); @@ -407,7 +407,7 @@ class CRM_Contribute_Import_Parser_ContributionTest extends CiviUnitTestCase { $form = $this->getMapFieldForm([ 'onDuplicate' => CRM_Import_Parser::DUPLICATE_SKIP, 'mapper' => $this->getMapperFromFieldMappings($fieldMappings), - 'contactType' => CRM_Import_Parser::CONTACT_INDIVIDUAL, + 'contactType' => 'Individual', ]); $form->setUserJobID($this->userJobID); $form->buildForm(); @@ -535,7 +535,7 @@ class CRM_Contribute_Import_Parser_ContributionTest extends CiviUnitTestCase { $userJobID = UserJob::create()->setValues([ 'metadata' => [ 'submitted_values' => array_merge([ - 'contactType' => CRM_Import_Parser::CONTACT_INDIVIDUAL, + 'contactType' => 'Individual', 'contactSubType' => '', 'dataSource' => 'CRM_Import_DataSource_SQL', 'sqlQuery' => 'SELECT first_name FROM civicrm_contact', diff --git a/tests/phpunit/CRM/Event/Import/Parser/ParticipantTest.php b/tests/phpunit/CRM/Event/Import/Parser/ParticipantTest.php index dd7bcee745..70dfa82294 100644 --- a/tests/phpunit/CRM/Event/Import/Parser/ParticipantTest.php +++ b/tests/phpunit/CRM/Event/Import/Parser/ParticipantTest.php @@ -71,7 +71,7 @@ class CRM_Participant_Import_Parser_ParticipantTest extends CiviUnitTestCase { 'uploadFile' => ['name' => __DIR__ . '/data/' . $csv], 'skipColumnHeader' => TRUE, 'fieldSeparator' => ',', - 'contactType' => CRM_Import_Parser::CONTACT_INDIVIDUAL, + 'contactType' => 'Individual', 'mapper' => $this->getMapperFromFieldMappings($fieldMappings), 'dataSource' => 'CRM_Import_DataSource_CSV', 'file' => ['name' => $csv], @@ -207,7 +207,7 @@ class CRM_Participant_Import_Parser_ParticipantTest extends CiviUnitTestCase { $userJobID = UserJob::create()->setValues([ 'metadata' => [ 'submitted_values' => array_merge([ - 'contactType' => CRM_Import_Parser::CONTACT_INDIVIDUAL, + 'contactType' => 'Individual', 'contactSubType' => '', 'dataSource' => 'CRM_Import_DataSource_SQL', 'sqlQuery' => 'SELECT first_name FROM civicrm_contact', diff --git a/tests/phpunit/CRM/Import/DataSource/CsvTest.php b/tests/phpunit/CRM/Import/DataSource/CsvTest.php index b087f5cdf0..b9c080167b 100644 --- a/tests/phpunit/CRM/Import/DataSource/CsvTest.php +++ b/tests/phpunit/CRM/Import/DataSource/CsvTest.php @@ -164,7 +164,7 @@ class CRM_Import_DataSource_CsvTest extends CiviUnitTestCase { 'name' => __DIR__ . '/' . $csvFileName, ], 'skipColumnHeader' => TRUE, - 'contactType' => CRM_Import_Parser::CONTACT_INDIVIDUAL, + 'contactType' => 'Individual', 'dataSource' => 'CRM_Import_DataSource_CSV', ]); $form->buildForm(); diff --git a/tests/phpunit/CRM/Member/Import/Parser/MembershipTest.php b/tests/phpunit/CRM/Member/Import/Parser/MembershipTest.php index cfb6de25ce..8aead2db36 100644 --- a/tests/phpunit/CRM/Member/Import/Parser/MembershipTest.php +++ b/tests/phpunit/CRM/Member/Import/Parser/MembershipTest.php @@ -342,7 +342,7 @@ class CRM_Member_Import_Parser_MembershipTest extends CiviUnitTestCase { $userJobID = UserJob::create()->setValues([ 'metadata' => [ 'submitted_values' => array_merge([ - 'contactType' => CRM_Import_Parser::CONTACT_INDIVIDUAL, + 'contactType' => 'Individual', 'contactSubType' => '', 'dataSource' => 'CRM_Import_DataSource_SQL', 'sqlQuery' => 'SELECT first_name FROM civicrm_contact', @@ -468,7 +468,7 @@ class CRM_Member_Import_Parser_MembershipTest extends CiviUnitTestCase { 'uploadFile' => ['name' => __DIR__ . '/data/' . $csv], 'skipColumnHeader' => TRUE, 'fieldSeparator' => ',', - 'contactType' => CRM_Import_Parser::CONTACT_INDIVIDUAL, + 'contactType' => 'Individual', 'mapper' => $this->getMapperFromFieldMappings($fieldMappings), 'dataSource' => 'CRM_Import_DataSource_CSV', 'file' => ['name' => $csv], diff --git a/tests/phpunit/CRMTraits/Import/ParserTrait.php b/tests/phpunit/CRMTraits/Import/ParserTrait.php index c895bf26d7..a842e7757d 100644 --- a/tests/phpunit/CRMTraits/Import/ParserTrait.php +++ b/tests/phpunit/CRMTraits/Import/ParserTrait.php @@ -34,7 +34,7 @@ trait CRMTraits_Import_ParserTrait { $submittedValues = array_merge([ 'skipColumnHeader' => TRUE, 'fieldSeparator' => ',', - 'contactType' => CRM_Import_Parser::CONTACT_INDIVIDUAL, + 'contactType' => 'Individual', 'mapper' => $this->getMapperFromFieldMappings($fieldMappings), 'dataSource' => 'CRM_Import_DataSource_CSV', 'file' => ['name' => $csv], @@ -107,7 +107,7 @@ trait CRMTraits_Import_ParserTrait { 'uploadFile' => ['name' => $directory . '/data/' . $csv], 'skipColumnHeader' => TRUE, 'fieldSeparator' => ',', - 'contactType' => CRM_Import_Parser::CONTACT_INDIVIDUAL, + 'contactType' => 'Individual', 'dataSource' => 'CRM_Import_DataSource_CSV', 'file' => ['name' => $csv], 'dateFormats' => CRM_Core_Form_Date::DATE_yyyy_mm_dd, -- 2.25.1