Set Address Line 2 and Address Line 3 in getValidatedAddress() #90
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The second and third address lines are received from UPS, but not passed back in the getValidatedAddress() method. CountryCode was being assigned to the consigneeName prop, and Region had a typo in the assignment.
Style changes.
| @@ -59,14 +67,24 @@ public function __construct(\SimpleXMLElement $xmlDoc) | |||
| $this->addressClassification = isset($xmlDoc->AddressClassification) ? new AddressClassification($xmlDoc->AddressClassification) : null; | |||
| $this->consigneeName = isset($xmlDoc->ConsigneeName) ? (string)$xmlDoc->ConsigneeName : ''; | |||
| $this->buildingName = isset($xmlDoc->BuildingName) ? (string)$xmlDoc->BuildingName : ''; | |||
| $this->addressLine = isset($xmlDoc->AddressLine) ? (string)$xmlDoc->AddressLine : ''; | |||
| $this->region = isset($xmlDoc->Region) ? (string)$xmlDoc->Regions : ''; | |||
| if (isset($xmlDoc->AddressLine)) { | |||
There was a problem hiding this comment.
Could we refactor this a bit? It feels a bit double for me.
I would say something like this will also do:
$var = 'addressLine' . ($i > 0 ? $i + 1 : '');
$this->{$var} = isset($xmlDoc->AddressLine[$i]) ? (string) $xmlDoc->AddressLine[$i] : '';
There was a problem hiding this comment.
It's definitely not the sexiest 8 lines of code I've ever written. I appreciate your solution--quite a bit more elegant. I'll swap it out.
|
Thanks! I made one comment in the code. Besides that, we might need some getter functions in there to get the data without accessing properties. Could you insert these too? |
|
Heyo @stefandoorn those changes are in. Should be a little better looking now. Let me know! |
stefandoorn
added a commit
that referenced
this pull request
Mar 1, 2016
Set Address Line 2 and Address Line 3 in getValidatedAddress()
|
Even though it's merged, it would be great to add unit tests for the new functionality. It doesn't break things, but it's mainly for the future. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The second and third address lines are received from UPS, but not passed back in the getValidatedAddress() method. CountryCode was being assigned to the consigneeName prop, and Region had a typo in the assignment.