diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Intl] Update tests and the number formatter to match behaviour of the intl extension

Browse Source
This commit is contained in:
Jakub Zalas 2016-03-04 16:56:29 +00:00
parent 37a9d8ca24
commit 6822147464
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/Intl/Intl.php
View File

@ -234,7 +234,7 @@ final class Intl
*/ */
public static function getIcuStubVersion() public static function getIcuStubVersion()
{ {
return '51.2'; return '55.1';
} }
/** /**

4
src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
View File

@ -239,7 +239,7 @@ class NumberFormatter
private static $enTextAttributes = array( private static $enTextAttributes = array(
self::DECIMAL => array('', '', '-', '', '*', '', ''), self::DECIMAL => array('', '', '-', '', '*', '', ''),
self::CURRENCY => array('¤', '', '(¤', ')', '*', ''), self::CURRENCY => array('¤', '', '-¤', '', '*', ''),
); );
/** /**
@ -337,7 +337,7 @@ class NumberFormatter
$ret = $symbol.$value; $ret = $symbol.$value;
return $negative ? '('.$ret.')' : $ret; return $negative ? '-'.$ret : $ret;
} }
/** /**

16
src/Symfony/Component/Intl/Tests/NumberFormatter/AbstractNumberFormatterTest.php
View File

@ -64,15 +64,15 @@ abstract class AbstractNumberFormatterTest extends \PHPUnit_Framework_TestCase
{ {
return array( return array(
array(100, 'ALL', 'ALL100'), array(100, 'ALL', 'ALL100'),
array(-100, 'ALL', '(ALL100)'), array(-100, 'ALL', '-ALL100'),
array(1000.12, 'ALL', 'ALL1,000'), array(1000.12, 'ALL', 'ALL1,000'),
array(100, 'JPY', '¥100'), array(100, 'JPY', '¥100'),
array(-100, 'JPY', '(¥100)'), array(-100, 'JPY', '-¥100'),
array(1000.12, 'JPY', '¥1,000'), array(1000.12, 'JPY', '¥1,000'),
array(100, 'EUR', '€100.00'), array(100, 'EUR', '€100.00'),
array(-100, 'EUR', '(€100.00)'), array(-100, 'EUR', '-€100.00'),
array(1000.12, 'EUR', '€1,000.12'), array(1000.12, 'EUR', '€1,000.12'),
); );
} }
@ -90,7 +90,7 @@ abstract class AbstractNumberFormatterTest extends \PHPUnit_Framework_TestCase
{ {
return array( return array(
array(100, 'CRC', 'CRC', '%s100'), array(100, 'CRC', 'CRC', '%s100'),
array(-100, 'CRC', 'CRC', '(%s100)'), array(-100, 'CRC', 'CRC', '-%s100'),
array(1000.12, 'CRC', 'CRC', '%s1,000'), array(1000.12, 'CRC', 'CRC', '%s1,000'),
); );
} }
@ -108,7 +108,7 @@ abstract class AbstractNumberFormatterTest extends \PHPUnit_Framework_TestCase
{ {
return array( return array(
array(100, 'BRL', 'R', '%s$100.00'), array(100, 'BRL', 'R', '%s$100.00'),
array(-100, 'BRL', 'R', '(%s$100.00)'), array(-100, 'BRL', 'R', '-%s$100.00'),
array(1000.12, 'BRL', 'R', '%s$1,000.12'), array(1000.12, 'BRL', 'R', '%s$1,000.12'),
// Rounding checks // Rounding checks
@ -135,7 +135,7 @@ abstract class AbstractNumberFormatterTest extends \PHPUnit_Framework_TestCase
{ {
return array( return array(
array(100, 'CHF', 'CHF', '%s100.00'), array(100, 'CHF', 'CHF', '%s100.00'),
array(-100, 'CHF', 'CHF', '(%s100.00)'), array(-100, 'CHF', 'CHF', '-%s100.00'),
array(1000.12, 'CHF', 'CHF', '%s1,000.12'), array(1000.12, 'CHF', 'CHF', '%s1,000.12'),
array('1000.12', 'CHF', 'CHF', '%s1,000.12'), array('1000.12', 'CHF', 'CHF', '%s1,000.12'),
@ -216,7 +216,7 @@ abstract class AbstractNumberFormatterTest extends \PHPUnit_Framework_TestCase
return array( return array(
array($formatter, 1, '¤1.00'), array($formatter, 1, '¤1.00'),
array($formatter, 1.1, '¤1.00'), array($formatter, 1.1, '¤1.00'),
array($formatter, 2147483648, '(¤2,147,483,648.00)', $message), array($formatter, 2147483648, '-¤2,147,483,648.00', $message),
array($formatter, -2147483649, '¤2,147,483,647.00', $message), array($formatter, -2147483649, '¤2,147,483,647.00', $message),
); );
} }
@ -261,7 +261,7 @@ abstract class AbstractNumberFormatterTest extends \PHPUnit_Framework_TestCase
array($formatter, 1, '¤1.00'), array($formatter, 1, '¤1.00'),
array($formatter, 1.1, '¤1.00'), array($formatter, 1.1, '¤1.00'),
array($formatter, 2147483648, '¤2,147,483,648.00'), array($formatter, 2147483648, '¤2,147,483,648.00'),
array($formatter, -2147483649, '(¤2,147,483,649.00)'), array($formatter, -2147483649, '-¤2,147,483,649.00'),
); );
} }