Towards fixing household merge export, extract function, add test, fix prev

[eileenmcnaughton]

Overview

Follow up on #12212 - extend testing, further function extraction, fix mistake in that PR

Before

functions

After

City & State province field tested, function extracted

Technical Details

@monishdeb I think I found an error in the previous commit see

|| empty($value[4]))) {

civicrm-core/CRM/Export/BAO/Export.php

Line 357 in b0eb1d7

if (array_key_exists($relationshipTypes, $contactRelationshipTypes) && (!empty($value[2]) || empty($value[4]))) {

but reading the code it should be !empty

Comments

This needs to be merged for the 5.3 rc which will be cut tomorrow. Let's see if it can be reviewed in time or we need an rc pr

[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]

Oops, my bad. Let me test it on UI.

[eileenmcnaughton]

@monishdeb I just merged this to master - #12274 - you should grab it as you may hit the notices

[eileenmcnaughton]

@monishdeb 5.3 is branched - the one part of this that fixes a mistake should go against the rc - will wait on your review & we can organise

[monishdeb]

I have tested the City & State province field for 'Merge All Contacts with the Same Address' and 'Merge Household Members into their Households' scenarios and it produce expected result w/o notices + the UT ensure the fix.