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

jakzal · jakzal · commit 6822147464d2 · 2016-03-05T13:11:12.000Z
diff --git a/src/Symfony/Component/Intl/Intl.php b/src/Symfony/Component/Intl/Intl.php
@@ -234,7 +234,7 @@ public static function getIcuDataVersion()
      */
     public static function getIcuStubVersion()
     {
-        return '51.2';
+        return '55.1';
     }
 
     /**
diff --git a/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php b/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
@@ -239,7 +239,7 @@ class NumberFormatter
 
     private static $enTextAttributes = array(
         self::DECIMAL => array('', '', '-', '', '*', '', ''),
-        self::CURRENCY => array('¤', '', '(¤', ')', '*', ''),
+        self::CURRENCY => array('¤', '', '-¤', '', '*', ''),
     );
 
     /**
@@ -337,7 +337,7 @@ public function formatCurrency($value, $currency)
 
         $ret = $symbol.$value;
 
-        return $negative ? '('.$ret.')' : $ret;
+        return $negative ? '-'.$ret : $ret;
     }
 
     /**
diff --git a/src/Symfony/Component/Intl/Tests/NumberFormatter/AbstractNumberFormatterTest.php b/src/Symfony/Component/Intl/Tests/NumberFormatter/AbstractNumberFormatterTest.php
@@ -64,15 +64,15 @@ public function formatCurrencyWithCurrencyStyleProvider()
     {
         return array(
             array(100, 'ALL', 'ALL100'),
-            array(-100, 'ALL', '(ALL100)'),
+            array(-100, 'ALL', '-ALL100'),
             array(1000.12, 'ALL', 'ALL1,000'),
 
             array(100, 'JPY', '¥100'),
-            array(-100, 'JPY', '(¥100)'),
+            array(-100, 'JPY', '-¥100'),
             array(1000.12, 'JPY', '¥1,000'),
 
             array(100, 'EUR', '€100.00'),
-            array(-100, 'EUR', '(€100.00)'),
+            array(-100, 'EUR', '-€100.00'),
             array(1000.12, 'EUR', '€1,000.12'),
         );
     }
@@ -90,7 +90,7 @@ public function formatCurrencyWithCurrencyStyleCostaRicanColonsRoundingProvider(
     {
         return array(
             array(100, 'CRC', 'CRC', '%s100'),
-            array(-100, 'CRC', 'CRC', '(%s100)'),
+            array(-100, 'CRC', 'CRC', '-%s100'),
             array(1000.12, 'CRC', 'CRC', '%s1,000'),
         );
     }
@@ -108,7 +108,7 @@ public function formatCurrencyWithCurrencyStyleBrazilianRealRoundingProvider()
     {
         return array(
             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'),
 
             // Rounding checks
@@ -135,7 +135,7 @@ public function formatCurrencyWithCurrencyStyleSwissRoundingProvider()
     {
         return array(
             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'),
 
@@ -216,7 +216,7 @@ public function formatTypeInt32WithCurrencyStyleProvider()
         return array(
             array($formatter, 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),
         );
     }
@@ -261,7 +261,7 @@ public function formatTypeInt64WithCurrencyStyleProvider()
             array($formatter, 1, '¤1.00'),
             array($formatter, 1.1, '¤1.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'),
         );
     }
 

Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ public static function getIcuDataVersion()`
`234`	`234`	`*/`
`235`	`235`	`public static function getIcuStubVersion()`
`236`	`236`	`{`
`237`		`- return '51.2';`
	`237`	`+ return '55.1';`
`238`	`238`	`}`
`239`	`239`
`240`	`240`	`/**`