CRM-19888 fix import to prefer default country when resolving states.

[eileenmcnaughton]

• CRM-19888: On contact import, State field does not respect default country

[alifrumin]

At the Maryland code spring, I'm gonna QA this

[alifrumin]

Jenkins retest this please

[alifrumin]

I was able to replicate this bug by following the steps in the jira issue https://issues.civicrm.org/jira/browse/CRM-19888 and then tested the fix on a local site with this patch.

Instead of getting the second address as being in Guyana it was in the United States. This code works as expected. It is failing 1 check (could be related to recent buildkit issues). Otherwise seems ready to be merged

[eileenmcnaughton]

test this please

[eileenmcnaughton]

@alifrumin are you going to lean on @colemanw to merge? I believe he is there with you :-)

[colemanw]

@eileenmcnaughton

ContactTest.php:305, IncorrectExact, Priority: High
Line indented incorrectly; expected 2 spaces, found 1

ContactTest.php:312, CommaLastItem, Priority: Normal
A comma should follow the last multiline array item. Found: 'ABC'

[eileenmcnaughton]

I can't even find those lines in the 2 test files I altered

[eileenmcnaughton]

ie line 312 is

$this->runImport($contactValues, CRM_Import_Parser::DUPLICATE_UPDATE, CRM_Import_Parser::VALID, $mapper, $fields);

& it mentions

A comma should follow the last multiline array item. Found: 'ABC'

[alifrumin]

good point @eileenmcnaughton, thank you for the reminder and thank you @colemanw for taking a look at this.

[eileenmcnaughton]

test this please

[eileenmcnaughton]

I've set it running again - I can't find the strings that are failing lint in this file

[eileenmcnaughton]

test this please