Skip to content

Allow special characters in format, fixes #58 #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allow special characters in format, fixes #58 #60

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43d90f0
Allow special characters in format, fixes #58
imbrish Nov 4, 2016
3f7ca8f
Remove doubled matching of value format string
imbrish Nov 4, 2016
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
16 changes: 8 additions & 8 deletions src/Currency.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,15 @@ public function format($value, $code = null)
$format = $this->getCurrencyProp($code, 'format');

// Value Regex
$valRegex = '/([0-9].*|)[0-9]/';
$valRegex = '/(?:[0-9].*|)[0-9]/';

// Match value format string
preg_match($valRegex, $format, $valFormat);

$valFormat = $valFormat[0];

// Match decimal and thousand separators
preg_match_all('/[\s\',.!]/', $format, $separators);
preg_match_all('/[\s\',.!]/', $valFormat, $separators);

if ($thousand = array_get($separators, '0.0', null)) {
if ($thousand == '!') {
Expand All @@ -130,19 +135,14 @@ public function format($value, $code = null)

$decimal = array_get($separators, '0.1', null);

// Match format for decimals count
preg_match($valRegex, $format, $valFormat);

$valFormat = array_get($valFormat, 0, 0);

// Count decimals length
$decimals = $decimal ? strlen(substr(strrchr($valFormat, $decimal), 1)) : 0;

// Format the value
$value = number_format($value, $decimals, $decimal, $thousand);

// Return the formatted measurement
return preg_replace($valRegex, $value, $format);
return str_replace($valFormat, $value, $format);
}

/**
Expand Down