projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #14899 from eileenmcnaughton/format
[civicrm-core.git]
/
CRM
/
Contact
/
Import
/
Parser.php
diff --git
a/CRM/Contact/Import/Parser.php
b/CRM/Contact/Import/Parser.php
index c9d41c2cb1b101abacf3b7e412d3b8030329c089..ba205617155379d71b906e0156e95b77768d923f 100644
(file)
--- a/
CRM/Contact/Import/Parser.php
+++ b/
CRM/Contact/Import/Parser.php
@@
-37,18
+37,20
@@
abstract class CRM_Contact_Import_Parser extends CRM_Import_Parser {
/**
* Total number of lines in file
*
/**
* Total number of lines in file
*
- * @var int
eger
+ * @var int
*/
protected $_rowCount;
/**
* Running total number of un-matched Contacts.
*/
protected $_rowCount;
/**
* Running total number of un-matched Contacts.
+ *
* @var int
*/
protected $_unMatchCount;
/**
* @var int
*/
protected $_unMatchCount;
/**
- * Array of unmatched lines
+ * Array of unmatched lines.
+ *
* @var array
*/
protected $_unMatch;
* @var array
*/
protected $_unMatch;
@@
-105,7
+107,7
@@
abstract class CRM_Contact_Import_Parser extends CRM_Import_Parser {
*/
public function run(
$tableName,
*/
public function run(
$tableName,
-
&$mapper
,
+
$mapper = []
,
$mode = self::MODE_PREVIEW,
$contactType = self::CONTACT_INDIVIDUAL,
$primaryKeyName = '_id',
$mode = self::MODE_PREVIEW,
$contactType = self::CONTACT_INDIVIDUAL,
$primaryKeyName = '_id',
@@
-817,10
+819,6
@@
abstract class CRM_Contact_Import_Parser extends CRM_Import_Parser {
elseif ($key == 'is_deceased' && $val) {
$params[$key] = CRM_Utils_String::strtoboolstr($val);
}
elseif ($key == 'is_deceased' && $val) {
$params[$key] = CRM_Utils_String::strtoboolstr($val);
}
- elseif ($key == 'gender') {
- //CRM-4360
- $params[$key] = $this->checkGender($val);
- }
}
//now format custom data.
}
//now format custom data.
@@
-1345,7
+1343,9
@@
abstract class CRM_Contact_Import_Parser extends CRM_Import_Parser {
* Input values
* @param string $entity
* - address, email, phone
* Input values
* @param string $entity
* - address, email, phone
- * @param int|NULL $contactID
+ * @param int|null $contactID
+ *
+ * @throws \CiviCRM_API3_Exception
*/
protected function fillPrimary(&$params, $values, $entity, $contactID) {
if ($values['location_type_id'] === 'Primary') {
*/
protected function fillPrimary(&$params, $values, $entity, $contactID) {
if ($values['location_type_id'] === 'Primary') {
@@
-1354,7
+1354,7
@@
abstract class CRM_Contact_Import_Parser extends CRM_Import_Parser {
'return' => 'location_type_id',
'contact_id' => $contactID,
'is_primary' => 1,
'return' => 'location_type_id',
'contact_id' => $contactID,
'is_primary' => 1,
- 'sequential' => 1
+ 'sequential' => 1
,
]);
}
$defaultLocationType = CRM_Core_BAO_LocationType::getDefault();
]);
}
$defaultLocationType = CRM_Core_BAO_LocationType::getDefault();