Deprecate handling for removed silly constant

diff --git a/CRM/Contact/Import/Form/MapField.php b/CRM/Contact/Import/Form/MapField.php
index 8f3198da79d8b9aa21a85806afa73f99999900ca..cec46c953a8822c9151e5c233f4ec1728392e523 100644 (file)
--- a/CRM/Contact/Import/Form/MapField.php
+++ b/CRM/Contact/Import/Form/MapField.php
@@ -275,7 +275,7 @@ class CRM_Contact_Import_Form_MapField extends CRM_Import_Form_MapField {
     $processor->setMappingID((int) $this->getSubmittedValue('savedMapping'));
     $processor->setFormName($formName);
     $processor->setMetadata($this->getContactImportMetadata());
-    $processor->setContactTypeByConstant($this->getSubmittedValue('contactType'));
+    $processor->setContactType($this->getSubmittedValue('contactType'));
     $processor->setContactSubType($this->getSubmittedValue('contactSubType'));
     $mapper = $this->getSubmittedValue('mapper');
 

diff --git a/CRM/Import/ImportProcessor.php b/CRM/Import/ImportProcessor.php
index 77c0b3937150601c37d84d8c204010b68d21d948..a9c7cb876f02efdb2755e629ad13cdb733016992 100644 (file)
--- a/CRM/Import/ImportProcessor.php
+++ b/CRM/Import/ImportProcessor.php
@@ -212,9 +212,12 @@ class CRM_Import_ImportProcessor {
   /**
    * Set the contact type  according to the constant.
    *
+   * @deprecated
+   *
    * @param int $contactTypeKey
    */
   public function setContactTypeByConstant($contactTypeKey) {
+    CRM_Core_Error::deprecatedFunctionWarning('no replacement');
     $constantTypeMap = [
       'Individual' => 'Individual',
       'Household' => 'Household',

diff --git a/tests/phpunit/CRM/Contact/Import/Form/MapFieldTest.php b/tests/phpunit/CRM/Contact/Import/Form/MapFieldTest.php
index a19b386d022840d316d7de1c16f7b2af4bee1e8a..c0d8df75cb4226eb29c1e61a9f1a823421bca9f4 100644 (file)
--- a/tests/phpunit/CRM/Contact/Import/Form/MapFieldTest.php
+++ b/tests/phpunit/CRM/Contact/Import/Form/MapFieldTest.php
@@ -226,9 +226,6 @@ class CRM_Contact_Import_Form_MapFieldTest extends CiviUnitTestCase {
     $this->assertEquals('street_address', $processor->getFieldName(3));
     $this->assertEquals($this->getCustomFieldName('text'), $processor->getFieldName(4));
     $this->assertEquals('url', $processor->getFieldName(8));
-
-    $processor->setContactTypeByConstant('Household');
-    $this->assertEquals('Household', $processor->getContactType());
   }
 
   /**
@@ -346,7 +343,7 @@ class CRM_Contact_Import_Form_MapFieldTest extends CiviUnitTestCase {
     $processor->setMappingID($mappingID);
     $processor->setFormName('document.forms.MapField');
     $processor->setMetadata($this->getContactImportMetadata());
-    $processor->setContactTypeByConstant('Individual');
+    $processor->setContactType('Individual');
 
     $defaults = [];
     $defaults["mapper[$columnNumber]"] = $processor->getSavedQuickformDefaultsForColumn($columnNumber);