Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge pull request zendframework/zendframework#4437 from MarkusM85/de…
Browse files Browse the repository at this point in the history 
…velop

I18n currencyFormat helper: add the currencyPattern attribute and extend the unittest
  • Loading branch information
@weierophinney
weierophinney committed May 7, 2013
142 parents 3f353b0 + d340adb + 1e0e8f4 + 5c4289e + fb94cca + 2a3844c + 906bbcf + 3d9b8bb + 84844ae + 62fc651 + b0a3dd4 + 0dca0ef + 910bbbf + e574b9b + f30ec7d + 1fa84de + 41b8543 + 9e2c9d5 + 913f51c + 39924f3 + c2a11e1 + 61b9322 + 413a38b + e51b2b8 + 20e328b + 6437ec0 + e9b8476 + 95e54a0 + 7ea3aed + df6a706 + a82fc82 + 7c2a059 + 4fefb53 + 599ee3a + ea3fc65 + f6c04c2 + 6591e3d + a4f76e3 + 33c7531 + 2d59782 + 8152327 + e56ce9b + db9b18f + b88635a + a262823 + b79aef6 + c2284e4 + 70193eb + 96acf77 + 9675426 + 5f02411 + 0dafea7 + 15dc674 + 4a2447d + e6eb7f3 + e9499c5 + 272b15f + 11c7758 + 6f0e918 + 5f4980a + ecca95a + 88b5971 + ecb8d13 + 9de1c08 + 44aad17 + 13269e9 + 654cdb6 + dc708db + 380ffba + ff67e7f + fe2e025 + 95f0efa + 68cc4b3 + bf13b96 + 8870381 + 56480f4 + 1fa90d7 + 5c7fe1f + abe9bc1 + a33cacd + cdd7d9f + 6a261b1 + 5e594c4 + 01c1241 + 30d1dd2 + d4af079 + c9aa9b4 + 10f47ca + ef20fa1 + 2187ae2 + e7f3993 + db93d37 + aa57612 + 4af81d8 + 2f90998 + 3013404 + 69d83fe + f383ca9 + 1b26f48 + 054f09d + 0c86829 + f22d81a + e7ebffe + 72a7a54 + cc09223 + ab99f58 + 2c69e37 + b6ccfbc + b92a5da + 773a133 + 9ee28ff + 5865e20 + 63c7303 + 73371d0 + b96f402 + b36e36b + 60fa081 + a1d27a6 + 43e9240 + 9e59ae6 + be1ce44 + 5a6465d + 7e455b4 + 83d837e + 28bc01e + 215be48 + efcc8e0 + 5192ae6 + 7e1ba0f + dec8ccf + 94afc0f + 8c3ea5f + d680762 + 9092473 + 041fc63 + ea6499d + 1f59300 + a75142b + f592cc2 + f523aef + 2d12221 + c5e618b commit ff67d39
Show file tree
Hide file tree
Showing 2 changed files with 87 additions and 31 deletions.
43 changes: 41 additions & 2 deletions src/View/Helper/CurrencyFormat.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,13 @@ class CurrencyFormat extends AbstractHelper
*/
protected $locale;

/**
* Currency pattern
*
* @var string
*/
protected $currencyPattern;

/**
* If set to true, the currency will be returned with two decimals
*
Expand All @@ -65,15 +72,17 @@ public function __construct()
*
* @param float $number
* @param string $currencyCode
* @param bool $showDecimals
* @param bool $showDecimals
* @param string $locale
* @param string $pattern
* @return string
*/
public function __invoke(
$number,
$currencyCode = null,
$showDecimals = null,
$locale = null
$locale = null,
$pattern = null
) {
if (null === $locale) {
$locale = $this->getLocale();
Expand All @@ -84,6 +93,9 @@ public function __invoke(
if (null !== $showDecimals) {
$this->setShouldShowDecimals($showDecimals);
}
if (null === $pattern) {
$pattern = $this->getCurrencyPattern();
}

$formatterId = md5($locale);

Expand All @@ -94,6 +106,10 @@ public function __invoke(
);
}

if ($pattern !== null) {
$this->formatters[$formatterId]->setPattern($pattern);
}

if ($this->shouldShowDecimals()) {
$this->formatters[$formatterId]->setAttribute(NumberFormatter::FRACTION_DIGITS, 2);
} else {
Expand Down Expand Up @@ -127,6 +143,29 @@ public function getCurrencyCode()
return $this->currencyCode;
}


/**
* Set the currency pattern
*
* @param string $currencyPattern
* @return CurrencyFormat
*/
public function setCurrencyPattern($currencyPattern)
{
$this->currencyPattern = $currencyPattern;
return $this;
}

/**
* Get the currency pattern
*
* @return string
*/
public function getCurrencyPattern()
{
return $this->currencyPattern;
}

/**
* Set locale to use instead of the default
*
Expand Down
75 changes: 46 additions & 29 deletions test/View/Helper/CurrencyFormatTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,47 +41,64 @@ public function setUp()
public function currencyProvider()
{
return array(
// locale currency show decimals number expected
array('de_AT', 'EUR', true, 1234.56, '€ 1.234,56'),
array('de_AT', 'EUR', true, 0.123, '€ 0,12'),
array('de_DE', 'EUR', true, 1234567.891234567890000, '1.234.567,89 €'),
array('de_DE', 'RUR', true, 1234567.891234567890000, '1.234.567,89 RUR'),
array('ru_RU', 'EUR', true, 1234567.891234567890000, '1 234 567,89 €'),
array('ru_RU', 'RUR', true, 1234567.891234567890000, '1 234 567,89 р.'),
array('en_US', 'EUR', true, 1234567.891234567890000, '€1,234,567.89'),
array('en_US', 'RUR', true, 1234567.891234567890000, 'RUR1,234,567.89'),
array('en_US', 'USD', true, 1234567.891234567890000, '$1,234,567.89'),
array('de_AT', 'EUR', false, 1234.56, '€ 1.235'),
array('de_AT', 'EUR', false, 0.123, '€ 0'),
array('de_DE', 'EUR', false, 1234567.891234567890000, '1.234.568 €'),
//array('de_DE', 'RUB', false, 1234567.891234567890000, '1.234.567,89 RUB'),
//array('ru_RU', 'EUR', false, 1234567.891234567890000, '1 234 568 €'),
//array('ru_RU', 'RUR', false, 1234567.891234567890000, '1 234 567 р.'),
//array('en_US', 'EUR', false, 1234567.891234567890000, '€1,234,568'),
//array('en_US', 'EUR', false, 1234567.891234567890000, '€1,234,568'),
array('en_US', 'USD', false, 1234567.891234567890000, '$1,234,568'),
// locale currency show decimals number currencyPattern expected
array('de_AT', 'EUR', true, 1234.56, null, '€ 1.234,56'),
array('de_AT', 'EUR', true, 0.123, null, '€ 0,12'),
array('de_AT', 'EUR', true, 0.123, '#,##0.00 ¤', '0,12 €'),
array('de_AT', 'EUR', true, -0.123, '#,##0.00 ¤; ¤ - #,##0.00', ' € - 0,12'),
array('de_AT', 'EUR', true, -0.123, '¤ #,##0.00; - ¤ #,##0.00', '- € 0,12'),
array('de_DE', 'EUR', true, 1234567.891234567890000, null, '1.234.567,89 €'),
array('de_DE', 'RUR', true, 1234567.891234567890000, null, '1.234.567,89 RUR'),
array('ru_RU', 'EUR', true, 1234567.891234567890000, null, '1 234 567,89 €'),
array('ru_RU', 'RUR', true, 1234567.891234567890000, null, '1 234 567,89 р.'),
array('en_US', 'EUR', true, 1234567.891234567890000, null, '€1,234,567.89'),
array('en_US', 'RUR', true, 1234567.891234567890000, null, 'RUR1,234,567.89'),
array('en_US', 'USD', true, 1234567.891234567890000, null, '$1,234,567.89'),
array('de_AT', 'EUR', false, 1234.56, null, '€ 1.235'),
array('de_AT', 'EUR', false, 0.123, null, '€ 0'),
array('de_DE', 'EUR', false, 1234567.891234567890000, null, '1.234.568 €'),
array('de_DE', 'RUB', false, 1234567.891234567890000, null, '1.234.567,89 RUB'),
//array('ru_RU', 'EUR', false, 1234567.891234567890000, null, '1 234 568 €'),
//array('ru_RU', 'RUR', false, 1234567.891234567890000, null, '1 234 567 р.'),
//array('en_US', 'EUR', false, 1234567.891234567890000, null, '€1,234,568'),
//array('en_US', 'EUR', false, 1234567.891234567890000, null, '€1,234,568'),
array('en_US', 'USD', false, 1234567.891234567890000, null, '$1,234,568'),
);
}

/**
* @dataProvider currencyProvider
*/
public function testBasic($locale, $currencyCode, $showDecimals, $number, $expected)
public function testBasic($locale, $currencyCode, $showDecimals, $number, $currencyPattern, $expected)
{
$this->assertMbStringEquals($expected, $this->helper->__invoke(
$number, $currencyCode, $showDecimals, $locale
));
$this->assertMbStringEquals(
$expected,
$this->helper->__invoke(
$number,
$currencyCode,
$showDecimals,
$locale,
$currencyPattern
)
);
}

/**
* @dataProvider currencyProvider
*/
public function testSettersProvideDefaults($locale, $currencyCode, $showDecimals, $number, $expected)
{
public function testSettersProvideDefaults(
$locale,
$currencyCode,
$showDecimals,
$number,
$currencyPattern,
$expected
) {
$this->helper
->setLocale($locale)
->setShouldShowDecimals($showDecimals)
->setCurrencyCode($currencyCode);
->setLocale($locale)
->setShouldShowDecimals($showDecimals)
->setCurrencyCode($currencyCode)
->setCurrencyPattern($currencyPattern);

$this->assertMbStringEquals($expected, $this->helper->__invoke($number));
}
Expand All @@ -94,7 +111,7 @@ public function testDefaultLocale()
public function assertMbStringEquals($expected, $test, $message = '')
{
$expected = str_replace(array("\xC2\xA0", ' '), '', $expected);
$test = str_replace(array("\xC2\xA0", ' '), '', $test);
$test = str_replace(array("\xC2\xA0", ' '), '', $test);
$this->assertEquals($expected, $test, $message);
}
}

0 comments on commit ff67d39

Please sign in to comment.