From 14886f6138a931f6cace24c9ce21436434775910 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Mon, 6 Jun 2022 14:47:11 +1200
Subject: [PATCH] Fix merge resolution mistake

---
 CRM/Contact/Import/Parser/Contact.php                 | 11 +++++------
 .../phpunit/CRM/Contact/Import/Parser/ContactTest.php |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/CRM/Contact/Import/Parser/Contact.php b/CRM/Contact/Import/Parser/Contact.php
index c1ef99603a..d284039b30 100644
--- a/CRM/Contact/Import/Parser/Contact.php
+++ b/CRM/Contact/Import/Parser/Contact.php
@@ -195,6 +195,7 @@ class CRM_Contact_Import_Parser_Contact extends CRM_Import_Parser {
       // CRM-5854, reset the geocode method to null to prevent geocoding
       CRM_Utils_GeocodeProvider::disableForSession();
     }
+    $relatedContacts = [];
 
     try {
       $params = $this->getMappedRow($values);
@@ -230,18 +231,16 @@ class CRM_Contact_Import_Parser_Contact extends CRM_Import_Parser {
 
       //relationship contact insert
       foreach ($this->getRelatedContactsParams($params) as $key => $field) {
-        $formatting = $field;
-        [$formatting, $field] = $this->processContact($field, $formatting, FALSE);
-
+        [$formatting, $field] = $this->processContact($field, $field, FALSE);
         //format common data, CRM-4062
         $this->formatCommonData($field, $formatting);
-
+        $isUpdate = empty($formatting['id']) ? 'new' : 'updated';
         if (empty($formatting['id']) || $this->isUpdateExistingContacts()) {
           $relatedNewContact = $this->createContact($formatting, $formatting['id']);
           $formatting['id'] = $relatedNewContact->id;
         }
         if (empty($relatedContacts[$formatting['id']])) {
-          $relatedContacts[$formatting['id']] = 'new';
+          $relatedContacts[$formatting['id']] = $isUpdate;
         }
 
         $this->createRelationship($key, $formatting['id'], $primaryContactId);
@@ -258,7 +257,7 @@ class CRM_Contact_Import_Parser_Contact extends CRM_Import_Parser {
       return FALSE;
     }
     $extraFields = ['related_contact_created' => 0, 'related_contact_matched' => 0];
-    foreach ($relatedContacts as $key => $outcome) {
+    foreach ($relatedContacts as $outcome) {
       if ($outcome === 'new') {
         $extraFields['related_contact_created']++;
       }
diff --git a/tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php b/tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php
index a918062cb1..00c9077896 100644
--- a/tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php
+++ b/tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php
@@ -2076,7 +2076,7 @@ class CRM_Contact_Import_Parser_ContactTest extends CiviUnitTestCase {
       $form->postProcess();
     }
     catch (CRM_Core_Exception_PrematureExitException $e) {
-      $queue = Civi::queue('user_job_' . $userJobID);
+      $queue = Civi::queue('user_job_' . $this->userJobID);
       $runner = new CRM_Queue_Runner([
         'queue' => $queue,
         'errorMode' => CRM_Queue_Runner::ERROR_ABORT,
-- 
2.25.1