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

Commit

Permalink
Merge branch 'feature/3646' into develop
Browse files Browse the repository at this point in the history 
Close zendframework/zendframework#3646
  • Loading branch information
@weierophinney
weierophinney committed Mar 11, 2013
121 parents 71d113e + 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 + 9420b64 commit 058eeff
Show file tree
Hide file tree
Showing 2 changed files with 70 additions and 5 deletions.
43 changes: 41 additions & 2 deletions src/View/Helper/NumberFormat.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,13 @@ class NumberFormat extends AbstractHelper
*/
protected $formatType;

/**
* number of decimals to use.
*
* @var integer
*/
protected $decimals;

/**
* Formatter instances.
*
Expand Down Expand Up @@ -96,6 +103,28 @@ public function getFormatType()
return $this->formatType;
}

/**
* Set number of decimals to use instead of the default.
*
* @param integer $decimals
* @return NumberFormat
*/
public function setDecimals($decimals)
{
$this->decimals = $decimals;
return $this;
}

/**
* Get number of decimals.
*
* @return integer
*/
public function getDecimals()
{
return $this->decimals;
}

/**
* Set locale to use instead of the default.
*
Expand Down Expand Up @@ -129,13 +158,15 @@ public function getLocale()
* @param integer $formatStyle
* @param integer $formatType
* @param string $locale
* @param integer $decimals
* @return string
*/
public function __invoke(
$number,
$formatStyle = null,
$formatType = null,
$locale = null
$locale = null,
$decimals = null
) {
if (null === $locale) {
$locale = $this->getLocale();
Expand All @@ -146,14 +177,22 @@ public function __invoke(
if (null === $formatType) {
$formatType = $this->getFormatType();
}
if (!is_int($decimals) || $decimals < 0) {
$decimals = $this->getDecimals();
}

$formatterId = md5($formatStyle . "\0" . $locale);
$formatterId = md5($formatStyle . "\0" . $locale . "\0" . $decimals);

if (!isset($this->formatters[$formatterId])) {
$this->formatters[$formatterId] = new NumberFormatter(
$locale,
$formatStyle
);

if ($decimals !== null) {
$this->formatters[$formatterId]->setAttribute(NumberFormatter::MIN_FRACTION_DIGITS, $decimals);
$this->formatters[$formatterId]->setAttribute(NumberFormatter::MAX_FRACTION_DIGITS, $decimals);
}
}

return $this->formatters[$formatterId]->format($number, $formatType);
Expand Down
32 changes: 29 additions & 3 deletions test/View/Helper/NumberFormatTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,62 +59,87 @@ public function currencyTestsDataProvider()
'de_DE',
NumberFormatter::DECIMAL,
NumberFormatter::TYPE_DOUBLE,
null,
1234567.891234567890000,
'1.234.567,891'
),
array(
'de_DE',
NumberFormatter::DECIMAL,
NumberFormatter::TYPE_DOUBLE,
6,
1234567.891234567890000,
'1.234.567,891235',
),
array(
'de_DE',
NumberFormatter::PERCENT,
NumberFormatter::TYPE_DOUBLE,
null,
1234567.891234567890000,
'123.456.789 %'
),
array(
'de_DE',
NumberFormatter::PERCENT,
NumberFormatter::TYPE_DOUBLE,
1,
1234567.891234567890000,
'123.456.789,1 %'
),
array(
'de_DE',
NumberFormatter::SCIENTIFIC,
NumberFormatter::TYPE_DOUBLE,
null,
1234567.891234567890000,
'1,23456789123457E6'
),
array(
'ru_RU',
NumberFormatter::DECIMAL,
NumberFormatter::TYPE_DOUBLE,
null,
1234567.891234567890000,
'1 234 567,891'
),
array(
'ru_RU',
NumberFormatter::PERCENT,
NumberFormatter::TYPE_DOUBLE,
null,
1234567.891234567890000,
'123 456 789 %'
),
array(
'ru_RU',
NumberFormatter::SCIENTIFIC,
NumberFormatter::TYPE_DOUBLE,
null,
1234567.891234567890000,
'1,23456789123457E6'
),
array(
'en_US',
NumberFormatter::DECIMAL,
NumberFormatter::TYPE_DOUBLE,
null,
1234567.891234567890000,
'1,234,567.891'
),
array(
'en_US',
NumberFormatter::PERCENT,
NumberFormatter::TYPE_DOUBLE,
null,
1234567.891234567890000,
'123,456,789%'
),
array(
'en_US',
NumberFormatter::SCIENTIFIC,
NumberFormatter::TYPE_DOUBLE,
null,
1234567.891234567890000,
'1.23456789123457E6'
),
Expand All @@ -124,21 +149,22 @@ public function currencyTestsDataProvider()
/**
* @dataProvider currencyTestsDataProvider
*/
public function testBasic($locale, $formatStyle, $formatType, $number, $expected)
public function testBasic($locale, $formatStyle, $formatType, $decimals, $number, $expected)
{
$this->assertMbStringEquals($expected, $this->helper->__invoke(
$number, $formatStyle, $formatType, $locale
$number, $formatStyle, $formatType, $locale, $decimals
));
}

/**
* @dataProvider currencyTestsDataProvider
*/
public function testSettersProvideDefaults($locale, $formatStyle, $formatType, $number, $expected)
public function testSettersProvideDefaults($locale, $formatStyle, $formatType, $decimals, $number, $expected)
{
$this->helper
->setLocale($locale)
->setFormatStyle($formatStyle)
->setDecimals($decimals)
->setFormatType($formatType);

$this->assertMbStringEquals($expected, $this->helper->__invoke($number));
Expand Down

0 comments on commit 058eeff

Please sign in to comment.