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

Added an argument to specify the templates path for the formatter #2

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

Added an argument to specify the templates path for the formatter #2

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
37 changes: 22 additions & 15 deletions src/Formatter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,14 @@ class Formatter
'state',
];

public function __construct()
/**
* Specify a custom templates path
*
* @param string $templatesPath
*/
public function __construct($templatesPath = '')
{
$this->loadTemplates();
$this->loadTemplates($templatesPath);
}

/**
Expand Down Expand Up @@ -575,20 +580,22 @@ private function hasMinimumAddressComponents($addressArray)
return ($missing < $minThreshold) ? true : false;
}

public function loadTemplates()
public function loadTemplates($templatesPath = '')
{
/**
* Unfortunately it's not possible to include a git submodule with a composer package, so we load
* the address-formatting templates as a separate package via our composer.json and if the address-formatting
* templates exist at the expected location for a composer loaded package, we use that by default.
*/
$composerTemplatesPath = implode(DIRECTORY_SEPARATOR, array(realpath(dirname(__FILE__)), '..', '..', 'address-formatter-templates', 'conf'));

if (is_dir($composerTemplatesPath)) {
$templatesPath = $composerTemplatesPath;
} else {
//Use the git submodule path
$templatesPath = implode(DIRECTORY_SEPARATOR, array(realpath(dirname(__FILE__)), '..', 'address-formatter-templates', 'conf'));
if ($templatesPath == '') {
/**
* Unfortunately it's not possible to include a git submodule with a composer package, so we load
* the address-formatting templates as a separate package via our composer.json and if the address-formatting
* templates exist at the expected location for a composer loaded package, we use that by default.
*/
$composerTemplatesPath = implode(DIRECTORY_SEPARATOR, array(realpath(dirname(__FILE__)), '..', '..', 'address-formatter-templates', 'conf'));

if (is_dir($composerTemplatesPath)) {
$templatesPath = $composerTemplatesPath;
} else {
//Use the git submodule path
$templatesPath = implode(DIRECTORY_SEPARATOR, array(realpath(dirname(__FILE__)), '..', 'address-formatter-templates', 'conf'));
}
}

if (is_dir($templatesPath)) {
Expand Down