[REF] clean up merge array.

[eileenmcnaughton]

Overview

Code cleanup - no actual change

Before

Code build 2 arrays then uses one to prune the other before merging them. The first array gets precedence

After

Code builds one array, as a property, only setting not-already-set values to achieve the same precedence.

Technical Details

This code has been doing my head in because it is just like 'construct complex array & then another
complex array & iterate them together in nasty ways.

However, after another round of misery I'm pretty sure that this cleanup works. Basically the whole removed
section of code amounts to 'the array built in the first pass takes precedence over the one in the
second pass'. By using a property & only setting the array values when not-yet-set we can
allow the second pass to not clobber the first while populating it rather than as follow up wrangling

@monishdeb I think this gets us closer to readable code which I want before adding more logic complexity in as I find the mergeSameAddress stuff really bad.

Comments

Code is currently unreachable due to https://lab.civicrm.org/dev/core/issues/1421

But testMergeSameAddress passes through it with this patch

--- a/CRM/Export/BAO/ExportProcessor.php
+++ b/CRM/Export/BAO/ExportProcessor.php
@@ -1007,8 +1007,8 @@ class CRM_Export_BAO_ExportProcessor {
         elseif ($field == 'provider_id' || $field == 'im_provider') {
           $fieldValue = CRM_Utils_Array::value($fieldValue, $imProviders);
         }
-        elseif (strstr($field, 'master_id')) {
-          // @todo - why not just $field === 'master_id'  - what else would it be?
+        elseif (strstr($field, '-master_id')) {
+          // master_id is likely for wrangling but Home-master_id is tested as being converted.
           $masterAddressId = $iterationDAO->$field ?? NULL;
           // get display name of contact that address is shared.
           $fieldValue = CRM_Contact_BAO_Contact::getMasterDisplayName($masterAddressId);

Note the tests need a couple of minor tweaks to still pass after that is merged. We would also get the change of behaviour described in https://lab.civicrm.org/dev/core/issues/1421 so it's cleanup before fixes here

[civibot]

(Standard links)

• If this is your first pull-request for CiviCRM, please browse CONTRIBUTING.md for information about the development and testing processes.
• If you are reviewing this pull-request, you may wish to consult the test sites and the Review Standards (long template, short template).

[monishdeb]

Tested working fine.