Skip to content
This repository was archived by the owner on Mar 22, 2020. It is now read-only.

Templatize minimums #6

Open
tphipps wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Templatize minimums #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/Formatter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,11 @@ public function formatArray($addressArray, $options = [])
//Figure out which template to use
$tpl = (isset($this->templates[strtoupper($countryCode)])) ? $this->templates[strtoupper($countryCode)] : $this->templates['default'];
$tplText = (isset($tpl['address_template'])) ? $tpl['address_template'] : '';
$requiredComponents = (isset($this->templates[strtoupper($countryCode)]['required_components'])) ? $this->templates[strtoupper($countryCode)]['required_components'] : $this->templates['default']['required_components'];
$minThreshold = (isset($this->templates[strtoupper($countryCode)]['minimum_threshold'])) ? $this->templates[strtoupper($countryCode)]['minimum_threshold'] : $this->templates['default']['minimum_threshold'];

//Do we have the minimum components for an address, or should we use the fallback template?
if (!$this->hasMinimumAddressComponents($addressArray)) {
if (!$this->hasMinimumAddressComponents($addressArray, $requiredComponents, $minThreshold)) {
if (isset($tpl['fallback_template'])) {
$tplText = $tpl['fallback_template'];
} elseif (isset($this->templates['default']['fallback_template'])) {
Expand Down Expand Up @@ -556,11 +558,9 @@ private function sanityCleanAddress($addressArray)
return $addressArray;
}

private function hasMinimumAddressComponents($addressArray)
private function hasMinimumAddressComponents($addressArray, $requiredComponents = ['road', 'postcode'], $minThreshold = 2)
{
$missing = 0;
$minThreshold = 2;
$requiredComponents = ['road', 'postcode']; //These should probably be provided in the templates or somewhere else other than here!

foreach ($requiredComponents as $requiredComponent) {
if (!isset($addressArray[$requiredComponent])) {
Expand Down