diff --git a/UPGRADE-5.1.md b/UPGRADE-5.1.md
index b575964e0b203..faea3a8599f3c 100644
--- a/UPGRADE-5.1.md
+++ b/UPGRADE-5.1.md
@@ -39,14 +39,15 @@ EventDispatcher
Form
----
- * Not configuring the `rounding_mode` option of the `PercentType` is deprecated. It will default to `PercentToLocalizedStringTransformer::ROUND_HALF_UP` in Symfony 6.
- * Not passing a rounding mode to the constructor of `PercentToLocalizedStringTransformer` is deprecated. It will default to `ROUND_HALF_UP` in Symfony 6.
+ * Not configuring the `rounding_mode` option of the `PercentType` is deprecated. It will default to `\NumberFormatter::ROUND_HALFUP` in Symfony 6.
+ * Not passing a rounding mode to the constructor of `PercentToLocalizedStringTransformer` is deprecated. It will default to `\NumberFormatter::ROUND_HALFUP` in Symfony 6.
* Implementing the `FormConfigInterface` without implementing the `getIsEmptyCallback()` method
is deprecated. The method will be added to the interface in 6.0.
* Implementing the `FormConfigBuilderInterface` without implementing the `setIsEmptyCallback()` method
is deprecated. The method will be added to the interface in 6.0.
* Added argument `callable|null $filter` to `ChoiceListFactoryInterface::createListFromChoices()` and `createListFromLoader()` - not defining them is deprecated.
* Using `Symfony\Component\Form\Extension\Validator\Util\ServerParams` class is deprecated, use its parent `Symfony\Component\Form\Util\ServerParams` instead.
+ * The `NumberToLocalizedStringTransformer::ROUND_*` constants have been deprecated, use `\NumberFormatter::ROUND_*` instead.
FrameworkBundle
---------------
diff --git a/UPGRADE-6.0.md b/UPGRADE-6.0.md
index 649386d76af83..1bece6f96a8b6 100644
--- a/UPGRADE-6.0.md
+++ b/UPGRADE-6.0.md
@@ -39,12 +39,13 @@ EventDispatcher
Form
----
- * The default value of the `rounding_mode` option of the `PercentType` has been changed to `PercentToLocalizedStringTransformer::ROUND_HALF_UP`.
- * The default rounding mode of the `PercentToLocalizedStringTransformer` has been changed to `ROUND_HALF_UP`.
+ * The default value of the `rounding_mode` option of the `PercentType` has been changed to `\NumberFormatter::ROUND_HALFUP`.
+ * The default rounding mode of the `PercentToLocalizedStringTransformer` has been changed to `\NumberFormatter::ROUND_HALFUP`.
* Added the `getIsEmptyCallback()` method to the `FormConfigInterface`.
* Added the `setIsEmptyCallback()` method to the `FormConfigBuilderInterface`.
* Added argument `callable|null $filter` to `ChoiceListFactoryInterface::createListFromChoices()` and `createListFromLoader()`.
* The `Symfony\Component\Form\Extension\Validator\Util\ServerParams` class has been removed, use its parent `Symfony\Component\Form\Util\ServerParams` instead.
+ * The `NumberToLocalizedStringTransformer::ROUND_*` constants have been removed, use `\NumberFormatter::ROUND_*` instead.
FrameworkBundle
---------------
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php
index 0a771d3320973..0a9319472552b 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php
@@ -11,7 +11,6 @@
namespace Symfony\Bridge\Twig\Tests\Extension;
-use Symfony\Component\Form\Extension\Core\DataTransformer\PercentToLocalizedStringTransformer;
use Symfony\Component\Form\Extension\Core\Type\PercentType;
use Symfony\Component\Form\FormError;
use Symfony\Component\Form\Tests\AbstractLayoutTest;
@@ -2212,7 +2211,7 @@ public function testPasswordWithMaxLength()
public function testPercent()
{
- $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\PercentType', 0.1, ['rounding_mode' => PercentToLocalizedStringTransformer::ROUND_CEILING]);
+ $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\PercentType', 0.1, ['rounding_mode' => \NumberFormatter::ROUND_CEILING]);
$this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
'/div
@@ -2234,7 +2233,7 @@ public function testPercent()
public function testPercentNoSymbol()
{
- $form = $this->factory->createNamed('name', PercentType::class, 0.1, ['symbol' => false, 'rounding_mode' => PercentToLocalizedStringTransformer::ROUND_CEILING]);
+ $form = $this->factory->createNamed('name', PercentType::class, 0.1, ['symbol' => false, 'rounding_mode' => \NumberFormatter::ROUND_CEILING]);
$this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
'/input
[@id="my&id"]
@@ -2248,7 +2247,7 @@ public function testPercentNoSymbol()
public function testPercentCustomSymbol()
{
- $form = $this->factory->createNamed('name', PercentType::class, 0.1, ['symbol' => '‱', 'rounding_mode' => PercentToLocalizedStringTransformer::ROUND_CEILING]);
+ $form = $this->factory->createNamed('name', PercentType::class, 0.1, ['symbol' => '‱', 'rounding_mode' => \NumberFormatter::ROUND_CEILING]);
$this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
'/div
[@class="input-group"]
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4LayoutTest.php
index e933433d818e5..d786434614bd4 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4LayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4LayoutTest.php
@@ -11,7 +11,6 @@
namespace Symfony\Bridge\Twig\Tests\Extension;
-use Symfony\Component\Form\Extension\Core\DataTransformer\PercentToLocalizedStringTransformer;
use Symfony\Component\Form\Extension\Core\Type\ButtonType;
use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
@@ -1169,7 +1168,7 @@ public function testMoney()
public function testPercent()
{
- $form = $this->factory->createNamed('name', PercentType::class, 0.1, ['rounding_mode' => PercentToLocalizedStringTransformer::ROUND_CEILING]);
+ $form = $this->factory->createNamed('name', PercentType::class, 0.1, ['rounding_mode' => \NumberFormatter::ROUND_CEILING]);
$this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
'/div
@@ -1195,7 +1194,7 @@ public function testPercent()
public function testPercentNoSymbol()
{
- $form = $this->factory->createNamed('name', PercentType::class, 0.1, ['symbol' => false, 'rounding_mode' => PercentToLocalizedStringTransformer::ROUND_CEILING]);
+ $form = $this->factory->createNamed('name', PercentType::class, 0.1, ['symbol' => false, 'rounding_mode' => \NumberFormatter::ROUND_CEILING]);
$this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
'/input
[@id="my&id"]
@@ -1209,7 +1208,7 @@ public function testPercentNoSymbol()
public function testPercentCustomSymbol()
{
- $form = $this->factory->createNamed('name', PercentType::class, 0.1, ['symbol' => '‱', 'rounding_mode' => PercentToLocalizedStringTransformer::ROUND_CEILING]);
+ $form = $this->factory->createNamed('name', PercentType::class, 0.1, ['symbol' => '‱', 'rounding_mode' => \NumberFormatter::ROUND_CEILING]);
$this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
'/div
[@class="input-group"]
diff --git a/src/Symfony/Component/Form/CHANGELOG.md b/src/Symfony/Component/Form/CHANGELOG.md
index 654bbc316c05e..bea3453002480 100644
--- a/src/Symfony/Component/Form/CHANGELOG.md
+++ b/src/Symfony/Component/Form/CHANGELOG.md
@@ -4,8 +4,8 @@ CHANGELOG
5.1.0
-----
- * Deprecated not configuring the `rounding_mode` option of the `PercentType`. It will default to `PercentToLocalizedStringTransformer::ROUND_HALF_UP` in Symfony 6.
- * Deprecated not passing a rounding mode to the constructor of `PercentToLocalizedStringTransformer`. It will default to `ROUND_HALF_UP` in Symfony 6.
+ * Deprecated not configuring the `rounding_mode` option of the `PercentType`. It will default to `\NumberFormatter::ROUND_HALFUP` in Symfony 6.
+ * Deprecated not passing a rounding mode to the constructor of `PercentToLocalizedStringTransformer`. It will default to `\NumberFormatter::ROUND_HALFUP` in Symfony 6.
* Added `collection_entry` block prefix to `CollectionType` entries
* Added a `choice_filter` option to `ChoiceType`
* Added argument `callable|null $filter` to `ChoiceListFactoryInterface::createListFromChoices()` and `createListFromLoader()` - not defining them is deprecated.
@@ -20,6 +20,7 @@ CHANGELOG
* Added a `rounding_mode` option for the PercentType and correctly round the value when submitted
* Deprecated `Symfony\Component\Form\Extension\Validator\Util\ServerParams` in favor of its parent class `Symfony\Component\Form\Util\ServerParams`
* Added the `html5` option to the `ColorType` to validate the input
+ * Deprecated `NumberToLocalizedStringTransformer::ROUND_*` constants, use `\NumberFormatter::ROUND_*` instead
5.0.0
-----
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php
index 68ba2c0227da4..9325a1aa66c25 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php
@@ -27,7 +27,7 @@ class IntegerToLocalizedStringTransformer extends NumberToLocalizedStringTransfo
* @param bool $grouping Whether thousands should be grouped
* @param int $roundingMode One of the ROUND_ constants in this class
*/
- public function __construct(?bool $grouping = false, ?int $roundingMode = self::ROUND_DOWN)
+ public function __construct(?bool $grouping = false, ?int $roundingMode = \NumberFormatter::ROUND_DOWN)
{
parent::__construct(0, $grouping, $roundingMode);
}
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php
index ca341ac7120a0..4b77934f10c13 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php
@@ -23,7 +23,7 @@ class MoneyToLocalizedStringTransformer extends NumberToLocalizedStringTransform
{
private $divisor;
- public function __construct(?int $scale = 2, ?bool $grouping = true, ?int $roundingMode = self::ROUND_HALF_UP, ?int $divisor = 1)
+ public function __construct(?int $scale = 2, ?bool $grouping = true, ?int $roundingMode = \NumberFormatter::ROUND_HALFUP, ?int $divisor = 1)
{
if (null === $grouping) {
$grouping = true;
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
index d86ae70968388..d004044f0bc82 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
@@ -24,51 +24,37 @@
class NumberToLocalizedStringTransformer implements DataTransformerInterface
{
/**
- * Rounds a number towards positive infinity.
- *
- * Rounds 1.4 to 2 and -1.4 to -1.
+ * @deprecated since Symfony 5.1, use \NumberFormatter::ROUND_CEILING instead.
*/
const ROUND_CEILING = \NumberFormatter::ROUND_CEILING;
/**
- * Rounds a number towards negative infinity.
- *
- * Rounds 1.4 to 1 and -1.4 to -2.
+ * @deprecated since Symfony 5.1, use \NumberFormatter::ROUND_FLOOR instead.
*/
const ROUND_FLOOR = \NumberFormatter::ROUND_FLOOR;
/**
- * Rounds a number away from zero.
- *
- * Rounds 1.4 to 2 and -1.4 to -2.
+ * @deprecated since Symfony 5.1, use \NumberFormatter::ROUND_UP instead.
*/
const ROUND_UP = \NumberFormatter::ROUND_UP;
/**
- * Rounds a number towards zero.
- *
- * Rounds 1.4 to 1 and -1.4 to -1.
+ * @deprecated since Symfony 5.1, use \NumberFormatter::ROUND_DOWN instead.
*/
const ROUND_DOWN = \NumberFormatter::ROUND_DOWN;
/**
- * Rounds to the nearest number and halves to the next even number.
- *
- * Rounds 2.5, 1.6 and 1.5 to 2 and 1.4 to 1.
+ * @deprecated since Symfony 5.1, use \NumberFormatter::ROUND_HALFEVEN instead.
*/
const ROUND_HALF_EVEN = \NumberFormatter::ROUND_HALFEVEN;
/**
- * Rounds to the nearest number and halves away from zero.
- *
- * Rounds 2.5 to 3, 1.6 and 1.5 to 2 and 1.4 to 1.
+ * @deprecated since Symfony 5.1, use \NumberFormatter::ROUND_HALFUP instead.
*/
const ROUND_HALF_UP = \NumberFormatter::ROUND_HALFUP;
/**
- * Rounds to the nearest number and halves towards zero.
- *
- * Rounds 2.5 and 1.6 to 2, 1.5 and 1.4 to 1.
+ * @deprecated since Symfony 5.1, use \NumberFormatter::ROUND_HALFDOWN instead.
*/
const ROUND_HALF_DOWN = \NumberFormatter::ROUND_HALFDOWN;
@@ -79,14 +65,14 @@ class NumberToLocalizedStringTransformer implements DataTransformerInterface
private $scale;
private $locale;
- public function __construct(int $scale = null, ?bool $grouping = false, ?int $roundingMode = self::ROUND_HALF_UP, string $locale = null)
+ public function __construct(int $scale = null, ?bool $grouping = false, ?int $roundingMode = \NumberFormatter::ROUND_HALFUP, string $locale = null)
{
if (null === $grouping) {
$grouping = false;
}
if (null === $roundingMode) {
- $roundingMode = self::ROUND_HALF_UP;
+ $roundingMode = \NumberFormatter::ROUND_HALFUP;
}
$this->scale = $scale;
@@ -256,25 +242,25 @@ private function round($number)
$number = (string) ($number * $roundingCoef);
switch ($this->roundingMode) {
- case self::ROUND_CEILING:
+ case \NumberFormatter::ROUND_CEILING:
$number = ceil($number);
break;
- case self::ROUND_FLOOR:
+ case \NumberFormatter::ROUND_FLOOR:
$number = floor($number);
break;
- case self::ROUND_UP:
+ case \NumberFormatter::ROUND_UP:
$number = $number > 0 ? ceil($number) : floor($number);
break;
- case self::ROUND_DOWN:
+ case \NumberFormatter::ROUND_DOWN:
$number = $number > 0 ? floor($number) : ceil($number);
break;
- case self::ROUND_HALF_EVEN:
+ case \NumberFormatter::ROUND_HALFEVEN:
$number = round($number, 0, PHP_ROUND_HALF_EVEN);
break;
- case self::ROUND_HALF_UP:
+ case \NumberFormatter::ROUND_HALFUP:
$number = round($number, 0, PHP_ROUND_HALF_UP);
break;
- case self::ROUND_HALF_DOWN:
+ case \NumberFormatter::ROUND_HALFDOWN:
$number = round($number, 0, PHP_ROUND_HALF_DOWN);
break;
}
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php
index 9cf1178297052..a08b14151764a 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php
@@ -23,55 +23,6 @@
*/
class PercentToLocalizedStringTransformer implements DataTransformerInterface
{
- /**
- * Rounds a number towards positive infinity.
- *
- * Rounds 1.4 to 2 and -1.4 to -1.
- */
- const ROUND_CEILING = \NumberFormatter::ROUND_CEILING;
-
- /**
- * Rounds a number towards negative infinity.
- *
- * Rounds 1.4 to 1 and -1.4 to -2.
- */
- const ROUND_FLOOR = \NumberFormatter::ROUND_FLOOR;
-
- /**
- * Rounds a number away from zero.
- *
- * Rounds 1.4 to 2 and -1.4 to -2.
- */
- const ROUND_UP = \NumberFormatter::ROUND_UP;
-
- /**
- * Rounds a number towards zero.
- *
- * Rounds 1.4 to 1 and -1.4 to -1.
- */
- const ROUND_DOWN = \NumberFormatter::ROUND_DOWN;
-
- /**
- * Rounds to the nearest number and halves to the next even number.
- *
- * Rounds 2.5, 1.6 and 1.5 to 2 and 1.4 to 1.
- */
- const ROUND_HALF_EVEN = \NumberFormatter::ROUND_HALFEVEN;
-
- /**
- * Rounds to the nearest number and halves away from zero.
- *
- * Rounds 2.5 to 3, 1.6 and 1.5 to 2 and 1.4 to 1.
- */
- const ROUND_HALF_UP = \NumberFormatter::ROUND_HALFUP;
-
- /**
- * Rounds to the nearest number and halves towards zero.
- *
- * Rounds 2.5 and 1.6 to 2, 1.5 and 1.4 to 1.
- */
- const ROUND_HALF_DOWN = \NumberFormatter::ROUND_HALFDOWN;
-
const FRACTIONAL = 'fractional';
const INTEGER = 'integer';
@@ -103,7 +54,7 @@ public function __construct(int $scale = null, string $type = null, ?int $roundi
}
if (null === $roundingMode && (\func_num_args() < 4 || func_get_arg(3))) {
- trigger_deprecation('symfony/form', '5.1', 'Not passing a rounding mode to %s() is deprecated. Starting with Symfony 6.0 it will default to "%s::ROUND_HALF_UP".', __METHOD__, __CLASS__);
+ trigger_deprecation('symfony/form', '5.1', 'Not passing a rounding mode to "%s()" is deprecated. Starting with Symfony 6.0 it will default to "\NumberFormatter::ROUND_HALFUP".', __METHOD__);
}
if (!\in_array($type, self::$types, true)) {
@@ -263,25 +214,25 @@ private function round($number)
$number = (string) ($number * $roundingCoef);
switch ($this->roundingMode) {
- case self::ROUND_CEILING:
+ case \NumberFormatter::ROUND_CEILING:
$number = ceil($number);
break;
- case self::ROUND_FLOOR:
+ case \NumberFormatter::ROUND_FLOOR:
$number = floor($number);
break;
- case self::ROUND_UP:
+ case \NumberFormatter::ROUND_UP:
$number = $number > 0 ? ceil($number) : floor($number);
break;
- case self::ROUND_DOWN:
+ case \NumberFormatter::ROUND_DOWN:
$number = $number > 0 ? floor($number) : ceil($number);
break;
- case self::ROUND_HALF_EVEN:
+ case \NumberFormatter::ROUND_HALFEVEN:
$number = round($number, 0, PHP_ROUND_HALF_EVEN);
break;
- case self::ROUND_HALF_UP:
+ case \NumberFormatter::ROUND_HALFUP:
$number = round($number, 0, PHP_ROUND_HALF_UP);
break;
- case self::ROUND_HALF_DOWN:
+ case \NumberFormatter::ROUND_HALFDOWN:
$number = round($number, 0, PHP_ROUND_HALF_DOWN);
break;
}
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php b/src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php
index 7555bf41b2566..dfea5074ca727 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php
@@ -46,18 +46,18 @@ public function configureOptions(OptionsResolver $resolver)
$resolver->setDefaults([
'grouping' => false,
// Integer cast rounds towards 0, so do the same when displaying fractions
- 'rounding_mode' => IntegerToLocalizedStringTransformer::ROUND_DOWN,
+ 'rounding_mode' => \NumberFormatter::ROUND_DOWN,
'compound' => false,
]);
$resolver->setAllowedValues('rounding_mode', [
- IntegerToLocalizedStringTransformer::ROUND_FLOOR,
- IntegerToLocalizedStringTransformer::ROUND_DOWN,
- IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN,
- IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN,
- IntegerToLocalizedStringTransformer::ROUND_HALF_UP,
- IntegerToLocalizedStringTransformer::ROUND_UP,
- IntegerToLocalizedStringTransformer::ROUND_CEILING,
+ \NumberFormatter::ROUND_FLOOR,
+ \NumberFormatter::ROUND_DOWN,
+ \NumberFormatter::ROUND_HALFDOWN,
+ \NumberFormatter::ROUND_HALFEVEN,
+ \NumberFormatter::ROUND_HALFUP,
+ \NumberFormatter::ROUND_UP,
+ \NumberFormatter::ROUND_CEILING,
]);
}
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php b/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php
index d402d311372b6..a6a46ee58b6ca 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php
@@ -13,7 +13,6 @@
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\DataTransformer\MoneyToLocalizedStringTransformer;
-use Symfony\Component\Form\Extension\Core\DataTransformer\NumberToLocalizedStringTransformer;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\Form\FormView;
@@ -54,20 +53,20 @@ public function configureOptions(OptionsResolver $resolver)
$resolver->setDefaults([
'scale' => 2,
'grouping' => false,
- 'rounding_mode' => NumberToLocalizedStringTransformer::ROUND_HALF_UP,
+ 'rounding_mode' => \NumberFormatter::ROUND_HALFUP,
'divisor' => 1,
'currency' => 'EUR',
'compound' => false,
]);
$resolver->setAllowedValues('rounding_mode', [
- NumberToLocalizedStringTransformer::ROUND_FLOOR,
- NumberToLocalizedStringTransformer::ROUND_DOWN,
- NumberToLocalizedStringTransformer::ROUND_HALF_DOWN,
- NumberToLocalizedStringTransformer::ROUND_HALF_EVEN,
- NumberToLocalizedStringTransformer::ROUND_HALF_UP,
- NumberToLocalizedStringTransformer::ROUND_UP,
- NumberToLocalizedStringTransformer::ROUND_CEILING,
+ \NumberFormatter::ROUND_FLOOR,
+ \NumberFormatter::ROUND_DOWN,
+ \NumberFormatter::ROUND_HALFDOWN,
+ \NumberFormatter::ROUND_HALFEVEN,
+ \NumberFormatter::ROUND_HALFUP,
+ \NumberFormatter::ROUND_UP,
+ \NumberFormatter::ROUND_CEILING,
]);
$resolver->setAllowedTypes('scale', 'int');
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php b/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php
index 4c1f1fd71f16b..0c434bee3aca5 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php
@@ -59,20 +59,20 @@ public function configureOptions(OptionsResolver $resolver)
// default scale is locale specific (usually around 3)
'scale' => null,
'grouping' => false,
- 'rounding_mode' => NumberToLocalizedStringTransformer::ROUND_HALF_UP,
+ 'rounding_mode' => \NumberFormatter::ROUND_HALFUP,
'compound' => false,
'input' => 'number',
'html5' => false,
]);
$resolver->setAllowedValues('rounding_mode', [
- NumberToLocalizedStringTransformer::ROUND_FLOOR,
- NumberToLocalizedStringTransformer::ROUND_DOWN,
- NumberToLocalizedStringTransformer::ROUND_HALF_DOWN,
- NumberToLocalizedStringTransformer::ROUND_HALF_EVEN,
- NumberToLocalizedStringTransformer::ROUND_HALF_UP,
- NumberToLocalizedStringTransformer::ROUND_UP,
- NumberToLocalizedStringTransformer::ROUND_CEILING,
+ \NumberFormatter::ROUND_FLOOR,
+ \NumberFormatter::ROUND_DOWN,
+ \NumberFormatter::ROUND_HALFDOWN,
+ \NumberFormatter::ROUND_HALFEVEN,
+ \NumberFormatter::ROUND_HALFUP,
+ \NumberFormatter::ROUND_UP,
+ \NumberFormatter::ROUND_CEILING,
]);
$resolver->setAllowedValues('input', ['number', 'string']);
$resolver->setAllowedTypes('scale', ['null', 'int']);
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/PercentType.php b/src/Symfony/Component/Form/Extension/Core/Type/PercentType.php
index 75c5485479f7a..9e89ca2d53a68 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/PercentType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/PercentType.php
@@ -50,7 +50,7 @@ public function configureOptions(OptionsResolver $resolver)
$resolver->setDefaults([
'scale' => 0,
'rounding_mode' => function (Options $options) {
- trigger_deprecation('symfony/form', '5.1', 'Not configuring the "rounding_mode" option is deprecated. It will default to "%s::ROUND_HALF_UP" in Symfony 6.0.', PercentToLocalizedStringTransformer::class);
+ trigger_deprecation('symfony/form', '5.1', 'Not configuring the "rounding_mode" option is deprecated. It will default to "\NumberFormatter::ROUND_HALFUP" in Symfony 6.0.');
return null;
},
@@ -65,19 +65,19 @@ public function configureOptions(OptionsResolver $resolver)
]);
$resolver->setAllowedValues('rounding_mode', [
null,
- PercentToLocalizedStringTransformer::ROUND_FLOOR,
- PercentToLocalizedStringTransformer::ROUND_DOWN,
- PercentToLocalizedStringTransformer::ROUND_HALF_DOWN,
- PercentToLocalizedStringTransformer::ROUND_HALF_EVEN,
- PercentToLocalizedStringTransformer::ROUND_HALF_UP,
- PercentToLocalizedStringTransformer::ROUND_UP,
- PercentToLocalizedStringTransformer::ROUND_CEILING,
+ \NumberFormatter::ROUND_FLOOR,
+ \NumberFormatter::ROUND_DOWN,
+ \NumberFormatter::ROUND_HALFDOWN,
+ \NumberFormatter::ROUND_HALFEVEN,
+ \NumberFormatter::ROUND_HALFUP,
+ \NumberFormatter::ROUND_UP,
+ \NumberFormatter::ROUND_CEILING,
]);
$resolver->setAllowedTypes('scale', 'int');
$resolver->setAllowedTypes('symbol', ['bool', 'string']);
$resolver->setDeprecated('rounding_mode', 'symfony/form', '5.1', function (Options $options, $roundingMode) {
if (null === $roundingMode) {
- return sprintf('Not configuring the "rounding_mode" option is deprecated. It will default to "%s::ROUND_HALF_UP" in Symfony 6.0.', PercentToLocalizedStringTransformer::class);
+ return 'Not configuring the "rounding_mode" option is deprecated. It will default to "\NumberFormatter::ROUND_HALFUP" in Symfony 6.0.';
}
return '';
diff --git a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
index 701c8bd8f4481..cd39b50db440d 100644
--- a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
+++ b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
@@ -12,7 +12,6 @@
namespace Symfony\Component\Form\Tests;
use PHPUnit\Framework\SkippedTestError;
-use Symfony\Component\Form\Extension\Core\DataTransformer\PercentToLocalizedStringTransformer;
use Symfony\Component\Form\Extension\Core\Type\PercentType;
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\Form\Extension\Csrf\CsrfExtension;
@@ -1924,7 +1923,7 @@ public function testPasswordWithMaxLength()
public function testPercent()
{
- $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\PercentType', 0.1, ['rounding_mode' => PercentToLocalizedStringTransformer::ROUND_CEILING]);
+ $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\PercentType', 0.1, ['rounding_mode' => \NumberFormatter::ROUND_CEILING]);
$this->assertWidgetMatchesXpath($form->createView(), [],
'/input
@@ -1940,7 +1939,7 @@ public function testPercentNoSymbol()
{
$this->requiresFeatureSet(403);
- $form = $this->factory->createNamed('name', PercentType::class, 0.1, ['symbol' => false, 'rounding_mode' => PercentToLocalizedStringTransformer::ROUND_CEILING]);
+ $form = $this->factory->createNamed('name', PercentType::class, 0.1, ['symbol' => false, 'rounding_mode' => \NumberFormatter::ROUND_CEILING]);
$this->assertWidgetMatchesXpath($form->createView(), [],
'/input
[@type="text"]
@@ -1955,7 +1954,7 @@ public function testPercentCustomSymbol()
{
$this->requiresFeatureSet(403);
- $form = $this->factory->createNamed('name', PercentType::class, 0.1, ['symbol' => '‱', 'rounding_mode' => PercentToLocalizedStringTransformer::ROUND_CEILING]);
+ $form = $this->factory->createNamed('name', PercentType::class, 0.1, ['symbol' => '‱', 'rounding_mode' => \NumberFormatter::ROUND_CEILING]);
$this->assertWidgetMatchesXpath($form->createView(), [],
'/input
[@type="text"]
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php
index 5645a34c5ac6d..fd3e93a6d7989 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php
@@ -34,50 +34,50 @@ public function transformWithRoundingProvider()
{
return [
// towards positive infinity (1.6 -> 2, -1.6 -> -1)
- [1234.5, '1235', IntegerToLocalizedStringTransformer::ROUND_CEILING],
- [1234.4, '1235', IntegerToLocalizedStringTransformer::ROUND_CEILING],
- [-1234.5, '-1234', IntegerToLocalizedStringTransformer::ROUND_CEILING],
- [-1234.4, '-1234', IntegerToLocalizedStringTransformer::ROUND_CEILING],
+ [1234.5, '1235', \NumberFormatter::ROUND_CEILING],
+ [1234.4, '1235', \NumberFormatter::ROUND_CEILING],
+ [-1234.5, '-1234', \NumberFormatter::ROUND_CEILING],
+ [-1234.4, '-1234', \NumberFormatter::ROUND_CEILING],
// towards negative infinity (1.6 -> 1, -1.6 -> -2)
- [1234.5, '1234', IntegerToLocalizedStringTransformer::ROUND_FLOOR],
- [1234.4, '1234', IntegerToLocalizedStringTransformer::ROUND_FLOOR],
- [-1234.5, '-1235', IntegerToLocalizedStringTransformer::ROUND_FLOOR],
- [-1234.4, '-1235', IntegerToLocalizedStringTransformer::ROUND_FLOOR],
+ [1234.5, '1234', \NumberFormatter::ROUND_FLOOR],
+ [1234.4, '1234', \NumberFormatter::ROUND_FLOOR],
+ [-1234.5, '-1235', \NumberFormatter::ROUND_FLOOR],
+ [-1234.4, '-1235', \NumberFormatter::ROUND_FLOOR],
// away from zero (1.6 -> 2, -1.6 -> 2)
- [1234.5, '1235', IntegerToLocalizedStringTransformer::ROUND_UP],
- [1234.4, '1235', IntegerToLocalizedStringTransformer::ROUND_UP],
- [-1234.5, '-1235', IntegerToLocalizedStringTransformer::ROUND_UP],
- [-1234.4, '-1235', IntegerToLocalizedStringTransformer::ROUND_UP],
+ [1234.5, '1235', \NumberFormatter::ROUND_UP],
+ [1234.4, '1235', \NumberFormatter::ROUND_UP],
+ [-1234.5, '-1235', \NumberFormatter::ROUND_UP],
+ [-1234.4, '-1235', \NumberFormatter::ROUND_UP],
// towards zero (1.6 -> 1, -1.6 -> -1)
- [1234.5, '1234', IntegerToLocalizedStringTransformer::ROUND_DOWN],
- [1234.4, '1234', IntegerToLocalizedStringTransformer::ROUND_DOWN],
- [-1234.5, '-1234', IntegerToLocalizedStringTransformer::ROUND_DOWN],
- [-1234.4, '-1234', IntegerToLocalizedStringTransformer::ROUND_DOWN],
+ [1234.5, '1234', \NumberFormatter::ROUND_DOWN],
+ [1234.4, '1234', \NumberFormatter::ROUND_DOWN],
+ [-1234.5, '-1234', \NumberFormatter::ROUND_DOWN],
+ [-1234.4, '-1234', \NumberFormatter::ROUND_DOWN],
// round halves (.5) to the next even number
- [1234.6, '1235', IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [1234.5, '1234', IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [1234.4, '1234', IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [1233.5, '1234', IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [1232.5, '1232', IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [-1234.6, '-1235', IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [-1234.5, '-1234', IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [-1234.4, '-1234', IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [-1233.5, '-1234', IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [-1232.5, '-1232', IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
+ [1234.6, '1235', \NumberFormatter::ROUND_HALFEVEN],
+ [1234.5, '1234', \NumberFormatter::ROUND_HALFEVEN],
+ [1234.4, '1234', \NumberFormatter::ROUND_HALFEVEN],
+ [1233.5, '1234', \NumberFormatter::ROUND_HALFEVEN],
+ [1232.5, '1232', \NumberFormatter::ROUND_HALFEVEN],
+ [-1234.6, '-1235', \NumberFormatter::ROUND_HALFEVEN],
+ [-1234.5, '-1234', \NumberFormatter::ROUND_HALFEVEN],
+ [-1234.4, '-1234', \NumberFormatter::ROUND_HALFEVEN],
+ [-1233.5, '-1234', \NumberFormatter::ROUND_HALFEVEN],
+ [-1232.5, '-1232', \NumberFormatter::ROUND_HALFEVEN],
// round halves (.5) away from zero
- [1234.6, '1235', IntegerToLocalizedStringTransformer::ROUND_HALF_UP],
- [1234.5, '1235', IntegerToLocalizedStringTransformer::ROUND_HALF_UP],
- [1234.4, '1234', IntegerToLocalizedStringTransformer::ROUND_HALF_UP],
- [-1234.6, '-1235', IntegerToLocalizedStringTransformer::ROUND_HALF_UP],
- [-1234.5, '-1235', IntegerToLocalizedStringTransformer::ROUND_HALF_UP],
- [-1234.4, '-1234', IntegerToLocalizedStringTransformer::ROUND_HALF_UP],
+ [1234.6, '1235', \NumberFormatter::ROUND_HALFUP],
+ [1234.5, '1235', \NumberFormatter::ROUND_HALFUP],
+ [1234.4, '1234', \NumberFormatter::ROUND_HALFUP],
+ [-1234.6, '-1235', \NumberFormatter::ROUND_HALFUP],
+ [-1234.5, '-1235', \NumberFormatter::ROUND_HALFUP],
+ [-1234.4, '-1234', \NumberFormatter::ROUND_HALFUP],
// round halves (.5) towards zero
- [1234.6, '1235', IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN],
- [1234.5, '1234', IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN],
- [1234.4, '1234', IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN],
- [-1234.6, '-1235', IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN],
- [-1234.5, '-1234', IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN],
- [-1234.4, '-1234', IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN],
+ [1234.6, '1235', \NumberFormatter::ROUND_HALFDOWN],
+ [1234.5, '1234', \NumberFormatter::ROUND_HALFDOWN],
+ [1234.4, '1234', \NumberFormatter::ROUND_HALFDOWN],
+ [-1234.6, '-1235', \NumberFormatter::ROUND_HALFDOWN],
+ [-1234.5, '-1234', \NumberFormatter::ROUND_HALFDOWN],
+ [-1234.4, '-1234', \NumberFormatter::ROUND_HALFDOWN],
];
}
@@ -130,50 +130,50 @@ public function reverseTransformWithRoundingProvider()
{
return [
// towards positive infinity (1.6 -> 2, -1.6 -> -1)
- ['1234,5', 1235, IntegerToLocalizedStringTransformer::ROUND_CEILING],
- ['1234,4', 1235, IntegerToLocalizedStringTransformer::ROUND_CEILING],
- ['-1234,5', -1234, IntegerToLocalizedStringTransformer::ROUND_CEILING],
- ['-1234,4', -1234, IntegerToLocalizedStringTransformer::ROUND_CEILING],
+ ['1234,5', 1235, \NumberFormatter::ROUND_CEILING],
+ ['1234,4', 1235, \NumberFormatter::ROUND_CEILING],
+ ['-1234,5', -1234, \NumberFormatter::ROUND_CEILING],
+ ['-1234,4', -1234, \NumberFormatter::ROUND_CEILING],
// towards negative infinity (1.6 -> 1, -1.6 -> -2)
- ['1234,5', 1234, IntegerToLocalizedStringTransformer::ROUND_FLOOR],
- ['1234,4', 1234, IntegerToLocalizedStringTransformer::ROUND_FLOOR],
- ['-1234,5', -1235, IntegerToLocalizedStringTransformer::ROUND_FLOOR],
- ['-1234,4', -1235, IntegerToLocalizedStringTransformer::ROUND_FLOOR],
+ ['1234,5', 1234, \NumberFormatter::ROUND_FLOOR],
+ ['1234,4', 1234, \NumberFormatter::ROUND_FLOOR],
+ ['-1234,5', -1235, \NumberFormatter::ROUND_FLOOR],
+ ['-1234,4', -1235, \NumberFormatter::ROUND_FLOOR],
// away from zero (1.6 -> 2, -1.6 -> 2)
- ['1234,5', 1235, IntegerToLocalizedStringTransformer::ROUND_UP],
- ['1234,4', 1235, IntegerToLocalizedStringTransformer::ROUND_UP],
- ['-1234,5', -1235, IntegerToLocalizedStringTransformer::ROUND_UP],
- ['-1234,4', -1235, IntegerToLocalizedStringTransformer::ROUND_UP],
+ ['1234,5', 1235, \NumberFormatter::ROUND_UP],
+ ['1234,4', 1235, \NumberFormatter::ROUND_UP],
+ ['-1234,5', -1235, \NumberFormatter::ROUND_UP],
+ ['-1234,4', -1235, \NumberFormatter::ROUND_UP],
// towards zero (1.6 -> 1, -1.6 -> -1)
- ['1234,5', 1234, IntegerToLocalizedStringTransformer::ROUND_DOWN],
- ['1234,4', 1234, IntegerToLocalizedStringTransformer::ROUND_DOWN],
- ['-1234,5', -1234, IntegerToLocalizedStringTransformer::ROUND_DOWN],
- ['-1234,4', -1234, IntegerToLocalizedStringTransformer::ROUND_DOWN],
+ ['1234,5', 1234, \NumberFormatter::ROUND_DOWN],
+ ['1234,4', 1234, \NumberFormatter::ROUND_DOWN],
+ ['-1234,5', -1234, \NumberFormatter::ROUND_DOWN],
+ ['-1234,4', -1234, \NumberFormatter::ROUND_DOWN],
// round halves (.5) to the next even number
- ['1234,6', 1235, IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
- ['1234,5', 1234, IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
- ['1234,4', 1234, IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
- ['1233,5', 1234, IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
- ['1232,5', 1232, IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
- ['-1234,6', -1235, IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
- ['-1234,5', -1234, IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
- ['-1234,4', -1234, IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
- ['-1233,5', -1234, IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
- ['-1232,5', -1232, IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
+ ['1234,6', 1235, \NumberFormatter::ROUND_HALFEVEN],
+ ['1234,5', 1234, \NumberFormatter::ROUND_HALFEVEN],
+ ['1234,4', 1234, \NumberFormatter::ROUND_HALFEVEN],
+ ['1233,5', 1234, \NumberFormatter::ROUND_HALFEVEN],
+ ['1232,5', 1232, \NumberFormatter::ROUND_HALFEVEN],
+ ['-1234,6', -1235, \NumberFormatter::ROUND_HALFEVEN],
+ ['-1234,5', -1234, \NumberFormatter::ROUND_HALFEVEN],
+ ['-1234,4', -1234, \NumberFormatter::ROUND_HALFEVEN],
+ ['-1233,5', -1234, \NumberFormatter::ROUND_HALFEVEN],
+ ['-1232,5', -1232, \NumberFormatter::ROUND_HALFEVEN],
// round halves (.5) away from zero
- ['1234,6', 1235, IntegerToLocalizedStringTransformer::ROUND_HALF_UP],
- ['1234,5', 1235, IntegerToLocalizedStringTransformer::ROUND_HALF_UP],
- ['1234,4', 1234, IntegerToLocalizedStringTransformer::ROUND_HALF_UP],
- ['-1234,6', -1235, IntegerToLocalizedStringTransformer::ROUND_HALF_UP],
- ['-1234,5', -1235, IntegerToLocalizedStringTransformer::ROUND_HALF_UP],
- ['-1234,4', -1234, IntegerToLocalizedStringTransformer::ROUND_HALF_UP],
+ ['1234,6', 1235, \NumberFormatter::ROUND_HALFUP],
+ ['1234,5', 1235, \NumberFormatter::ROUND_HALFUP],
+ ['1234,4', 1234, \NumberFormatter::ROUND_HALFUP],
+ ['-1234,6', -1235, \NumberFormatter::ROUND_HALFUP],
+ ['-1234,5', -1235, \NumberFormatter::ROUND_HALFUP],
+ ['-1234,4', -1234, \NumberFormatter::ROUND_HALFUP],
// round halves (.5) towards zero
- ['1234,6', 1235, IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN],
- ['1234,5', 1234, IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN],
- ['1234,4', 1234, IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN],
- ['-1234,6', -1235, IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN],
- ['-1234,5', -1234, IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN],
- ['-1234,4', -1234, IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN],
+ ['1234,6', 1235, \NumberFormatter::ROUND_HALFDOWN],
+ ['1234,5', 1234, \NumberFormatter::ROUND_HALFDOWN],
+ ['1234,4', 1234, \NumberFormatter::ROUND_HALFDOWN],
+ ['-1234,6', -1235, \NumberFormatter::ROUND_HALFDOWN],
+ ['-1234,5', -1234, \NumberFormatter::ROUND_HALFDOWN],
+ ['-1234,4', -1234, \NumberFormatter::ROUND_HALFDOWN],
];
}
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php
index f175a34287418..69d9e85267672 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php
@@ -96,7 +96,7 @@ public function testFloatToIntConversionMismatchOnReverseTransform()
public function testFloatToIntConversionMismatchOnTransform()
{
- $transformer = new MoneyToLocalizedStringTransformer(null, null, MoneyToLocalizedStringTransformer::ROUND_DOWN, 100);
+ $transformer = new MoneyToLocalizedStringTransformer(null, null, \NumberFormatter::ROUND_DOWN, 100);
IntlTestHelper::requireFullIntl($this, false);
\Locale::setDefault('de_AT');
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php
index 80da74ed56455..66e955a1dc4d9 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php
@@ -101,88 +101,88 @@ public function transformWithRoundingProvider()
{
return [
// towards positive infinity (1.6 -> 2, -1.6 -> -1)
- [0, 1234.5, '1235', NumberToLocalizedStringTransformer::ROUND_CEILING],
- [0, 1234.4, '1235', NumberToLocalizedStringTransformer::ROUND_CEILING],
- [0, -1234.5, '-1234', NumberToLocalizedStringTransformer::ROUND_CEILING],
- [0, -1234.4, '-1234', NumberToLocalizedStringTransformer::ROUND_CEILING],
- [1, 123.45, '123,5', NumberToLocalizedStringTransformer::ROUND_CEILING],
- [1, 123.44, '123,5', NumberToLocalizedStringTransformer::ROUND_CEILING],
- [1, -123.45, '-123,4', NumberToLocalizedStringTransformer::ROUND_CEILING],
- [1, -123.44, '-123,4', NumberToLocalizedStringTransformer::ROUND_CEILING],
+ [0, 1234.5, '1235', \NumberFormatter::ROUND_CEILING],
+ [0, 1234.4, '1235', \NumberFormatter::ROUND_CEILING],
+ [0, -1234.5, '-1234', \NumberFormatter::ROUND_CEILING],
+ [0, -1234.4, '-1234', \NumberFormatter::ROUND_CEILING],
+ [1, 123.45, '123,5', \NumberFormatter::ROUND_CEILING],
+ [1, 123.44, '123,5', \NumberFormatter::ROUND_CEILING],
+ [1, -123.45, '-123,4', \NumberFormatter::ROUND_CEILING],
+ [1, -123.44, '-123,4', \NumberFormatter::ROUND_CEILING],
// towards negative infinity (1.6 -> 1, -1.6 -> -2)
- [0, 1234.5, '1234', NumberToLocalizedStringTransformer::ROUND_FLOOR],
- [0, 1234.4, '1234', NumberToLocalizedStringTransformer::ROUND_FLOOR],
- [0, -1234.5, '-1235', NumberToLocalizedStringTransformer::ROUND_FLOOR],
- [0, -1234.4, '-1235', NumberToLocalizedStringTransformer::ROUND_FLOOR],
- [1, 123.45, '123,4', NumberToLocalizedStringTransformer::ROUND_FLOOR],
- [1, 123.44, '123,4', NumberToLocalizedStringTransformer::ROUND_FLOOR],
- [1, -123.45, '-123,5', NumberToLocalizedStringTransformer::ROUND_FLOOR],
- [1, -123.44, '-123,5', NumberToLocalizedStringTransformer::ROUND_FLOOR],
+ [0, 1234.5, '1234', \NumberFormatter::ROUND_FLOOR],
+ [0, 1234.4, '1234', \NumberFormatter::ROUND_FLOOR],
+ [0, -1234.5, '-1235', \NumberFormatter::ROUND_FLOOR],
+ [0, -1234.4, '-1235', \NumberFormatter::ROUND_FLOOR],
+ [1, 123.45, '123,4', \NumberFormatter::ROUND_FLOOR],
+ [1, 123.44, '123,4', \NumberFormatter::ROUND_FLOOR],
+ [1, -123.45, '-123,5', \NumberFormatter::ROUND_FLOOR],
+ [1, -123.44, '-123,5', \NumberFormatter::ROUND_FLOOR],
// away from zero (1.6 -> 2, -1.6 -> 2)
- [0, 1234.5, '1235', NumberToLocalizedStringTransformer::ROUND_UP],
- [0, 1234.4, '1235', NumberToLocalizedStringTransformer::ROUND_UP],
- [0, -1234.5, '-1235', NumberToLocalizedStringTransformer::ROUND_UP],
- [0, -1234.4, '-1235', NumberToLocalizedStringTransformer::ROUND_UP],
- [1, 123.45, '123,5', NumberToLocalizedStringTransformer::ROUND_UP],
- [1, 123.44, '123,5', NumberToLocalizedStringTransformer::ROUND_UP],
- [1, -123.45, '-123,5', NumberToLocalizedStringTransformer::ROUND_UP],
- [1, -123.44, '-123,5', NumberToLocalizedStringTransformer::ROUND_UP],
+ [0, 1234.5, '1235', \NumberFormatter::ROUND_UP],
+ [0, 1234.4, '1235', \NumberFormatter::ROUND_UP],
+ [0, -1234.5, '-1235', \NumberFormatter::ROUND_UP],
+ [0, -1234.4, '-1235', \NumberFormatter::ROUND_UP],
+ [1, 123.45, '123,5', \NumberFormatter::ROUND_UP],
+ [1, 123.44, '123,5', \NumberFormatter::ROUND_UP],
+ [1, -123.45, '-123,5', \NumberFormatter::ROUND_UP],
+ [1, -123.44, '-123,5', \NumberFormatter::ROUND_UP],
// towards zero (1.6 -> 1, -1.6 -> -1)
- [0, 1234.5, '1234', NumberToLocalizedStringTransformer::ROUND_DOWN],
- [0, 1234.4, '1234', NumberToLocalizedStringTransformer::ROUND_DOWN],
- [0, -1234.5, '-1234', NumberToLocalizedStringTransformer::ROUND_DOWN],
- [0, -1234.4, '-1234', NumberToLocalizedStringTransformer::ROUND_DOWN],
- [1, 123.45, '123,4', NumberToLocalizedStringTransformer::ROUND_DOWN],
- [1, 123.44, '123,4', NumberToLocalizedStringTransformer::ROUND_DOWN],
- [1, -123.45, '-123,4', NumberToLocalizedStringTransformer::ROUND_DOWN],
- [1, -123.44, '-123,4', NumberToLocalizedStringTransformer::ROUND_DOWN],
+ [0, 1234.5, '1234', \NumberFormatter::ROUND_DOWN],
+ [0, 1234.4, '1234', \NumberFormatter::ROUND_DOWN],
+ [0, -1234.5, '-1234', \NumberFormatter::ROUND_DOWN],
+ [0, -1234.4, '-1234', \NumberFormatter::ROUND_DOWN],
+ [1, 123.45, '123,4', \NumberFormatter::ROUND_DOWN],
+ [1, 123.44, '123,4', \NumberFormatter::ROUND_DOWN],
+ [1, -123.45, '-123,4', \NumberFormatter::ROUND_DOWN],
+ [1, -123.44, '-123,4', \NumberFormatter::ROUND_DOWN],
// round halves (.5) to the next even number
- [0, 1234.6, '1235', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [0, 1234.5, '1234', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [0, 1234.4, '1234', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [0, 1233.5, '1234', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [0, 1232.5, '1232', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [0, -1234.6, '-1235', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [0, -1234.5, '-1234', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [0, -1234.4, '-1234', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [0, -1233.5, '-1234', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [0, -1232.5, '-1232', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [1, 123.46, '123,5', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [1, 123.45, '123,4', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [1, 123.44, '123,4', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [1, 123.35, '123,4', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [1, 123.25, '123,2', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [1, -123.46, '-123,5', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [1, -123.45, '-123,4', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [1, -123.44, '-123,4', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [1, -123.35, '-123,4', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [1, -123.25, '-123,2', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
+ [0, 1234.6, '1235', \NumberFormatter::ROUND_HALFEVEN],
+ [0, 1234.5, '1234', \NumberFormatter::ROUND_HALFEVEN],
+ [0, 1234.4, '1234', \NumberFormatter::ROUND_HALFEVEN],
+ [0, 1233.5, '1234', \NumberFormatter::ROUND_HALFEVEN],
+ [0, 1232.5, '1232', \NumberFormatter::ROUND_HALFEVEN],
+ [0, -1234.6, '-1235', \NumberFormatter::ROUND_HALFEVEN],
+ [0, -1234.5, '-1234', \NumberFormatter::ROUND_HALFEVEN],
+ [0, -1234.4, '-1234', \NumberFormatter::ROUND_HALFEVEN],
+ [0, -1233.5, '-1234', \NumberFormatter::ROUND_HALFEVEN],
+ [0, -1232.5, '-1232', \NumberFormatter::ROUND_HALFEVEN],
+ [1, 123.46, '123,5', \NumberFormatter::ROUND_HALFEVEN],
+ [1, 123.45, '123,4', \NumberFormatter::ROUND_HALFEVEN],
+ [1, 123.44, '123,4', \NumberFormatter::ROUND_HALFEVEN],
+ [1, 123.35, '123,4', \NumberFormatter::ROUND_HALFEVEN],
+ [1, 123.25, '123,2', \NumberFormatter::ROUND_HALFEVEN],
+ [1, -123.46, '-123,5', \NumberFormatter::ROUND_HALFEVEN],
+ [1, -123.45, '-123,4', \NumberFormatter::ROUND_HALFEVEN],
+ [1, -123.44, '-123,4', \NumberFormatter::ROUND_HALFEVEN],
+ [1, -123.35, '-123,4', \NumberFormatter::ROUND_HALFEVEN],
+ [1, -123.25, '-123,2', \NumberFormatter::ROUND_HALFEVEN],
// round halves (.5) away from zero
- [0, 1234.6, '1235', NumberToLocalizedStringTransformer::ROUND_HALF_UP],
- [0, 1234.5, '1235', NumberToLocalizedStringTransformer::ROUND_HALF_UP],
- [0, 1234.4, '1234', NumberToLocalizedStringTransformer::ROUND_HALF_UP],
- [0, -1234.6, '-1235', NumberToLocalizedStringTransformer::ROUND_HALF_UP],
- [0, -1234.5, '-1235', NumberToLocalizedStringTransformer::ROUND_HALF_UP],
- [0, -1234.4, '-1234', NumberToLocalizedStringTransformer::ROUND_HALF_UP],
- [1, 123.46, '123,5', NumberToLocalizedStringTransformer::ROUND_HALF_UP],
- [1, 123.45, '123,5', NumberToLocalizedStringTransformer::ROUND_HALF_UP],
- [1, 123.44, '123,4', NumberToLocalizedStringTransformer::ROUND_HALF_UP],
- [1, -123.46, '-123,5', NumberToLocalizedStringTransformer::ROUND_HALF_UP],
- [1, -123.45, '-123,5', NumberToLocalizedStringTransformer::ROUND_HALF_UP],
- [1, -123.44, '-123,4', NumberToLocalizedStringTransformer::ROUND_HALF_UP],
+ [0, 1234.6, '1235', \NumberFormatter::ROUND_HALFUP],
+ [0, 1234.5, '1235', \NumberFormatter::ROUND_HALFUP],
+ [0, 1234.4, '1234', \NumberFormatter::ROUND_HALFUP],
+ [0, -1234.6, '-1235', \NumberFormatter::ROUND_HALFUP],
+ [0, -1234.5, '-1235', \NumberFormatter::ROUND_HALFUP],
+ [0, -1234.4, '-1234', \NumberFormatter::ROUND_HALFUP],
+ [1, 123.46, '123,5', \NumberFormatter::ROUND_HALFUP],
+ [1, 123.45, '123,5', \NumberFormatter::ROUND_HALFUP],
+ [1, 123.44, '123,4', \NumberFormatter::ROUND_HALFUP],
+ [1, -123.46, '-123,5', \NumberFormatter::ROUND_HALFUP],
+ [1, -123.45, '-123,5', \NumberFormatter::ROUND_HALFUP],
+ [1, -123.44, '-123,4', \NumberFormatter::ROUND_HALFUP],
// round halves (.5) towards zero
- [0, 1234.6, '1235', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
- [0, 1234.5, '1234', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
- [0, 1234.4, '1234', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
- [0, -1234.6, '-1235', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
- [0, -1234.5, '-1234', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
- [0, -1234.4, '-1234', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
- [1, 123.46, '123,5', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
- [1, 123.45, '123,4', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
- [1, 123.44, '123,4', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
- [1, -123.46, '-123,5', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
- [1, -123.45, '-123,4', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
- [1, -123.44, '-123,4', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
+ [0, 1234.6, '1235', \NumberFormatter::ROUND_HALFDOWN],
+ [0, 1234.5, '1234', \NumberFormatter::ROUND_HALFDOWN],
+ [0, 1234.4, '1234', \NumberFormatter::ROUND_HALFDOWN],
+ [0, -1234.6, '-1235', \NumberFormatter::ROUND_HALFDOWN],
+ [0, -1234.5, '-1234', \NumberFormatter::ROUND_HALFDOWN],
+ [0, -1234.4, '-1234', \NumberFormatter::ROUND_HALFDOWN],
+ [1, 123.46, '123,5', \NumberFormatter::ROUND_HALFDOWN],
+ [1, 123.45, '123,4', \NumberFormatter::ROUND_HALFDOWN],
+ [1, 123.44, '123,4', \NumberFormatter::ROUND_HALFDOWN],
+ [1, -123.46, '-123,5', \NumberFormatter::ROUND_HALFDOWN],
+ [1, -123.45, '-123,4', \NumberFormatter::ROUND_HALFDOWN],
+ [1, -123.44, '-123,4', \NumberFormatter::ROUND_HALFDOWN],
];
}
@@ -208,7 +208,7 @@ public function testTransformDoesNotRoundIfNoScale()
\Locale::setDefault('de_AT');
- $transformer = new NumberToLocalizedStringTransformer(null, null, NumberToLocalizedStringTransformer::ROUND_DOWN);
+ $transformer = new NumberToLocalizedStringTransformer(null, null, \NumberFormatter::ROUND_DOWN);
$this->assertEquals('1234,547', $transformer->transform(1234.547));
}
@@ -276,90 +276,90 @@ public function reverseTransformWithRoundingProvider()
{
return [
// towards positive infinity (1.6 -> 2, -1.6 -> -1)
- [0, '1234,5', 1235, NumberToLocalizedStringTransformer::ROUND_CEILING],
- [0, '1234,4', 1235, NumberToLocalizedStringTransformer::ROUND_CEILING],
- [0, '-1234,5', -1234, NumberToLocalizedStringTransformer::ROUND_CEILING],
- [0, '-1234,4', -1234, NumberToLocalizedStringTransformer::ROUND_CEILING],
- [1, '123,45', 123.5, NumberToLocalizedStringTransformer::ROUND_CEILING],
- [1, '123,44', 123.5, NumberToLocalizedStringTransformer::ROUND_CEILING],
- [1, '-123,45', -123.4, NumberToLocalizedStringTransformer::ROUND_CEILING],
- [1, '-123,44', -123.4, NumberToLocalizedStringTransformer::ROUND_CEILING],
+ [0, '1234,5', 1235, \NumberFormatter::ROUND_CEILING],
+ [0, '1234,4', 1235, \NumberFormatter::ROUND_CEILING],
+ [0, '-1234,5', -1234, \NumberFormatter::ROUND_CEILING],
+ [0, '-1234,4', -1234, \NumberFormatter::ROUND_CEILING],
+ [1, '123,45', 123.5, \NumberFormatter::ROUND_CEILING],
+ [1, '123,44', 123.5, \NumberFormatter::ROUND_CEILING],
+ [1, '-123,45', -123.4, \NumberFormatter::ROUND_CEILING],
+ [1, '-123,44', -123.4, \NumberFormatter::ROUND_CEILING],
// towards negative infinity (1.6 -> 1, -1.6 -> -2)
- [0, '1234,5', 1234, NumberToLocalizedStringTransformer::ROUND_FLOOR],
- [0, '1234,4', 1234, NumberToLocalizedStringTransformer::ROUND_FLOOR],
- [0, '-1234,5', -1235, NumberToLocalizedStringTransformer::ROUND_FLOOR],
- [0, '-1234,4', -1235, NumberToLocalizedStringTransformer::ROUND_FLOOR],
- [1, '123,45', 123.4, NumberToLocalizedStringTransformer::ROUND_FLOOR],
- [1, '123,44', 123.4, NumberToLocalizedStringTransformer::ROUND_FLOOR],
- [1, '-123,45', -123.5, NumberToLocalizedStringTransformer::ROUND_FLOOR],
- [1, '-123,44', -123.5, NumberToLocalizedStringTransformer::ROUND_FLOOR],
+ [0, '1234,5', 1234, \NumberFormatter::ROUND_FLOOR],
+ [0, '1234,4', 1234, \NumberFormatter::ROUND_FLOOR],
+ [0, '-1234,5', -1235, \NumberFormatter::ROUND_FLOOR],
+ [0, '-1234,4', -1235, \NumberFormatter::ROUND_FLOOR],
+ [1, '123,45', 123.4, \NumberFormatter::ROUND_FLOOR],
+ [1, '123,44', 123.4, \NumberFormatter::ROUND_FLOOR],
+ [1, '-123,45', -123.5, \NumberFormatter::ROUND_FLOOR],
+ [1, '-123,44', -123.5, \NumberFormatter::ROUND_FLOOR],
// away from zero (1.6 -> 2, -1.6 -> 2)
- [0, '1234,5', 1235, NumberToLocalizedStringTransformer::ROUND_UP],
- [0, '1234,4', 1235, NumberToLocalizedStringTransformer::ROUND_UP],
- [0, '-1234,5', -1235, NumberToLocalizedStringTransformer::ROUND_UP],
- [0, '-1234,4', -1235, NumberToLocalizedStringTransformer::ROUND_UP],
- [1, '123,45', 123.5, NumberToLocalizedStringTransformer::ROUND_UP],
- [1, '123,44', 123.5, NumberToLocalizedStringTransformer::ROUND_UP],
- [1, '-123,45', -123.5, NumberToLocalizedStringTransformer::ROUND_UP],
- [1, '-123,44', -123.5, NumberToLocalizedStringTransformer::ROUND_UP],
+ [0, '1234,5', 1235, \NumberFormatter::ROUND_UP],
+ [0, '1234,4', 1235, \NumberFormatter::ROUND_UP],
+ [0, '-1234,5', -1235, \NumberFormatter::ROUND_UP],
+ [0, '-1234,4', -1235, \NumberFormatter::ROUND_UP],
+ [1, '123,45', 123.5, \NumberFormatter::ROUND_UP],
+ [1, '123,44', 123.5, \NumberFormatter::ROUND_UP],
+ [1, '-123,45', -123.5, \NumberFormatter::ROUND_UP],
+ [1, '-123,44', -123.5, \NumberFormatter::ROUND_UP],
// towards zero (1.6 -> 1, -1.6 -> -1)
- [0, '1234,5', 1234, NumberToLocalizedStringTransformer::ROUND_DOWN],
- [0, '1234,4', 1234, NumberToLocalizedStringTransformer::ROUND_DOWN],
- [0, '-1234,5', -1234, NumberToLocalizedStringTransformer::ROUND_DOWN],
- [0, '-1234,4', -1234, NumberToLocalizedStringTransformer::ROUND_DOWN],
- [1, '123,45', 123.4, NumberToLocalizedStringTransformer::ROUND_DOWN],
- [1, '123,44', 123.4, NumberToLocalizedStringTransformer::ROUND_DOWN],
- [1, '-123,45', -123.4, NumberToLocalizedStringTransformer::ROUND_DOWN],
- [1, '-123,44', -123.4, NumberToLocalizedStringTransformer::ROUND_DOWN],
- [2, '37.37', 37.37, NumberToLocalizedStringTransformer::ROUND_DOWN],
- [2, '2.01', 2.01, NumberToLocalizedStringTransformer::ROUND_DOWN],
+ [0, '1234,5', 1234, \NumberFormatter::ROUND_DOWN],
+ [0, '1234,4', 1234, \NumberFormatter::ROUND_DOWN],
+ [0, '-1234,5', -1234, \NumberFormatter::ROUND_DOWN],
+ [0, '-1234,4', -1234, \NumberFormatter::ROUND_DOWN],
+ [1, '123,45', 123.4, \NumberFormatter::ROUND_DOWN],
+ [1, '123,44', 123.4, \NumberFormatter::ROUND_DOWN],
+ [1, '-123,45', -123.4, \NumberFormatter::ROUND_DOWN],
+ [1, '-123,44', -123.4, \NumberFormatter::ROUND_DOWN],
+ [2, '37.37', 37.37, \NumberFormatter::ROUND_DOWN],
+ [2, '2.01', 2.01, \NumberFormatter::ROUND_DOWN],
// round halves (.5) to the next even number
- [0, '1234,6', 1235, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [0, '1234,5', 1234, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [0, '1234,4', 1234, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [0, '1233,5', 1234, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [0, '1232,5', 1232, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [0, '-1234,6', -1235, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [0, '-1234,5', -1234, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [0, '-1234,4', -1234, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [0, '-1233,5', -1234, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [0, '-1232,5', -1232, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [1, '123,46', 123.5, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [1, '123,45', 123.4, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [1, '123,44', 123.4, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [1, '123,35', 123.4, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [1, '123,25', 123.2, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [1, '-123,46', -123.5, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [1, '-123,45', -123.4, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [1, '-123,44', -123.4, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [1, '-123,35', -123.4, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [1, '-123,25', -123.2, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
+ [0, '1234,6', 1235, \NumberFormatter::ROUND_HALFEVEN],
+ [0, '1234,5', 1234, \NumberFormatter::ROUND_HALFEVEN],
+ [0, '1234,4', 1234, \NumberFormatter::ROUND_HALFEVEN],
+ [0, '1233,5', 1234, \NumberFormatter::ROUND_HALFEVEN],
+ [0, '1232,5', 1232, \NumberFormatter::ROUND_HALFEVEN],
+ [0, '-1234,6', -1235, \NumberFormatter::ROUND_HALFEVEN],
+ [0, '-1234,5', -1234, \NumberFormatter::ROUND_HALFEVEN],
+ [0, '-1234,4', -1234, \NumberFormatter::ROUND_HALFEVEN],
+ [0, '-1233,5', -1234, \NumberFormatter::ROUND_HALFEVEN],
+ [0, '-1232,5', -1232, \NumberFormatter::ROUND_HALFEVEN],
+ [1, '123,46', 123.5, \NumberFormatter::ROUND_HALFEVEN],
+ [1, '123,45', 123.4, \NumberFormatter::ROUND_HALFEVEN],
+ [1, '123,44', 123.4, \NumberFormatter::ROUND_HALFEVEN],
+ [1, '123,35', 123.4, \NumberFormatter::ROUND_HALFEVEN],
+ [1, '123,25', 123.2, \NumberFormatter::ROUND_HALFEVEN],
+ [1, '-123,46', -123.5, \NumberFormatter::ROUND_HALFEVEN],
+ [1, '-123,45', -123.4, \NumberFormatter::ROUND_HALFEVEN],
+ [1, '-123,44', -123.4, \NumberFormatter::ROUND_HALFEVEN],
+ [1, '-123,35', -123.4, \NumberFormatter::ROUND_HALFEVEN],
+ [1, '-123,25', -123.2, \NumberFormatter::ROUND_HALFEVEN],
// round halves (.5) away from zero
- [0, '1234,6', 1235, NumberToLocalizedStringTransformer::ROUND_HALF_UP],
- [0, '1234,5', 1235, NumberToLocalizedStringTransformer::ROUND_HALF_UP],
- [0, '1234,4', 1234, NumberToLocalizedStringTransformer::ROUND_HALF_UP],
- [0, '-1234,6', -1235, NumberToLocalizedStringTransformer::ROUND_HALF_UP],
- [0, '-1234,5', -1235, NumberToLocalizedStringTransformer::ROUND_HALF_UP],
- [0, '-1234,4', -1234, NumberToLocalizedStringTransformer::ROUND_HALF_UP],
- [1, '123,46', 123.5, NumberToLocalizedStringTransformer::ROUND_HALF_UP],
- [1, '123,45', 123.5, NumberToLocalizedStringTransformer::ROUND_HALF_UP],
- [1, '123,44', 123.4, NumberToLocalizedStringTransformer::ROUND_HALF_UP],
- [1, '-123,46', -123.5, NumberToLocalizedStringTransformer::ROUND_HALF_UP],
- [1, '-123,45', -123.5, NumberToLocalizedStringTransformer::ROUND_HALF_UP],
- [1, '-123,44', -123.4, NumberToLocalizedStringTransformer::ROUND_HALF_UP],
+ [0, '1234,6', 1235, \NumberFormatter::ROUND_HALFUP],
+ [0, '1234,5', 1235, \NumberFormatter::ROUND_HALFUP],
+ [0, '1234,4', 1234, \NumberFormatter::ROUND_HALFUP],
+ [0, '-1234,6', -1235, \NumberFormatter::ROUND_HALFUP],
+ [0, '-1234,5', -1235, \NumberFormatter::ROUND_HALFUP],
+ [0, '-1234,4', -1234, \NumberFormatter::ROUND_HALFUP],
+ [1, '123,46', 123.5, \NumberFormatter::ROUND_HALFUP],
+ [1, '123,45', 123.5, \NumberFormatter::ROUND_HALFUP],
+ [1, '123,44', 123.4, \NumberFormatter::ROUND_HALFUP],
+ [1, '-123,46', -123.5, \NumberFormatter::ROUND_HALFUP],
+ [1, '-123,45', -123.5, \NumberFormatter::ROUND_HALFUP],
+ [1, '-123,44', -123.4, \NumberFormatter::ROUND_HALFUP],
// round halves (.5) towards zero
- [0, '1234,6', 1235, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
- [0, '1234,5', 1234, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
- [0, '1234,4', 1234, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
- [0, '-1234,6', -1235, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
- [0, '-1234,5', -1234, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
- [0, '-1234,4', -1234, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
- [1, '123,46', 123.5, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
- [1, '123,45', 123.4, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
- [1, '123,44', 123.4, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
- [1, '-123,46', -123.5, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
- [1, '-123,45', -123.4, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
- [1, '-123,44', -123.4, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
+ [0, '1234,6', 1235, \NumberFormatter::ROUND_HALFDOWN],
+ [0, '1234,5', 1234, \NumberFormatter::ROUND_HALFDOWN],
+ [0, '1234,4', 1234, \NumberFormatter::ROUND_HALFDOWN],
+ [0, '-1234,6', -1235, \NumberFormatter::ROUND_HALFDOWN],
+ [0, '-1234,5', -1234, \NumberFormatter::ROUND_HALFDOWN],
+ [0, '-1234,4', -1234, \NumberFormatter::ROUND_HALFDOWN],
+ [1, '123,46', 123.5, \NumberFormatter::ROUND_HALFDOWN],
+ [1, '123,45', 123.4, \NumberFormatter::ROUND_HALFDOWN],
+ [1, '123,44', 123.4, \NumberFormatter::ROUND_HALFDOWN],
+ [1, '-123,46', -123.5, \NumberFormatter::ROUND_HALFDOWN],
+ [1, '-123,45', -123.4, \NumberFormatter::ROUND_HALFDOWN],
+ [1, '-123,44', -123.4, \NumberFormatter::ROUND_HALFDOWN],
];
}
@@ -375,7 +375,7 @@ public function testReverseTransformWithRounding($scale, $input, $output, $round
public function testReverseTransformDoesNotRoundIfNoScale()
{
- $transformer = new NumberToLocalizedStringTransformer(null, null, NumberToLocalizedStringTransformer::ROUND_DOWN);
+ $transformer = new NumberToLocalizedStringTransformer(null, null, \NumberFormatter::ROUND_DOWN);
$this->assertEquals(1234.547, $transformer->reverseTransform('1234,547'));
}
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php
index c42c595aa5f61..6a510552efebe 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php
@@ -35,7 +35,7 @@ protected function tearDown(): void
public function testTransform()
{
- $transformer = new PercentToLocalizedStringTransformer(null, null, PercentToLocalizedStringTransformer::ROUND_HALF_UP);
+ $transformer = new PercentToLocalizedStringTransformer(null, null, \NumberFormatter::ROUND_HALFUP);
$this->assertEquals('10', $transformer->transform(0.1));
$this->assertEquals('15', $transformer->transform(0.15));
@@ -45,14 +45,14 @@ public function testTransform()
public function testTransformEmpty()
{
- $transformer = new PercentToLocalizedStringTransformer(null, null, PercentToLocalizedStringTransformer::ROUND_HALF_UP);
+ $transformer = new PercentToLocalizedStringTransformer(null, null, \NumberFormatter::ROUND_HALFUP);
$this->assertEquals('', $transformer->transform(null));
}
public function testTransformWithInteger()
{
- $transformer = new PercentToLocalizedStringTransformer(null, 'integer', PercentToLocalizedStringTransformer::ROUND_HALF_UP);
+ $transformer = new PercentToLocalizedStringTransformer(null, 'integer', \NumberFormatter::ROUND_HALFUP);
$this->assertEquals('0', $transformer->transform(0.1));
$this->assertEquals('1', $transformer->transform(1));
@@ -67,7 +67,7 @@ public function testTransformWithScale()
\Locale::setDefault('de_AT');
- $transformer = new PercentToLocalizedStringTransformer(2, null, PercentToLocalizedStringTransformer::ROUND_HALF_UP);
+ $transformer = new PercentToLocalizedStringTransformer(2, null, \NumberFormatter::ROUND_HALFUP);
$this->assertEquals('12,34', $transformer->transform(0.1234));
}
@@ -77,7 +77,7 @@ public function testTransformWithScale()
*/
public function testReverseTransformWithScaleAndRoundingDisabled()
{
- $this->expectDeprecation('Since symfony/form 5.1: Not passing a rounding mode to Symfony\Component\Form\Extension\Core\DataTransformer\PercentToLocalizedStringTransformer::__construct() is deprecated. Starting with Symfony 6.0 it will default to "Symfony\Component\Form\Extension\Core\DataTransformer\PercentToLocalizedStringTransformer::ROUND_HALF_UP".');
+ $this->expectDeprecation('Since symfony/form 5.1: Not passing a rounding mode to "Symfony\Component\Form\Extension\Core\DataTransformer\PercentToLocalizedStringTransformer::__construct()" is deprecated. Starting with Symfony 6.0 it will default to "\NumberFormatter::ROUND_HALFUP".');
$transformer = new PercentToLocalizedStringTransformer(2, PercentToLocalizedStringTransformer::FRACTIONAL);
@@ -86,7 +86,7 @@ public function testReverseTransformWithScaleAndRoundingDisabled()
public function testReverseTransform()
{
- $transformer = new PercentToLocalizedStringTransformer(null, null, PercentToLocalizedStringTransformer::ROUND_HALF_UP);
+ $transformer = new PercentToLocalizedStringTransformer(null, null, \NumberFormatter::ROUND_HALFUP);
$this->assertEquals(0.1, $transformer->reverseTransform('10'));
$this->assertEquals(0.15, $transformer->reverseTransform('15'));
@@ -98,92 +98,92 @@ public function reverseTransformWithRoundingProvider()
{
return [
// towards positive infinity (1.6 -> 2, -1.6 -> -1)
- [PercentToLocalizedStringTransformer::INTEGER, 0, '34.5', 35, PercentToLocalizedStringTransformer::ROUND_CEILING],
- [PercentToLocalizedStringTransformer::INTEGER, 0, '34.4', 35, PercentToLocalizedStringTransformer::ROUND_CEILING],
- [PercentToLocalizedStringTransformer::INTEGER, 1, '3.45', 3.5, PercentToLocalizedStringTransformer::ROUND_CEILING],
- [PercentToLocalizedStringTransformer::INTEGER, 1, '3.44', 3.5, PercentToLocalizedStringTransformer::ROUND_CEILING],
- [null, 0, '34.5', 0.35, PercentToLocalizedStringTransformer::ROUND_CEILING],
- [null, 0, '34.4', 0.35, PercentToLocalizedStringTransformer::ROUND_CEILING],
- [null, 1, '3.45', 0.035, PercentToLocalizedStringTransformer::ROUND_CEILING],
- [null, 1, '3.44', 0.035, PercentToLocalizedStringTransformer::ROUND_CEILING],
+ [PercentToLocalizedStringTransformer::INTEGER, 0, '34.5', 35, \NumberFormatter::ROUND_CEILING],
+ [PercentToLocalizedStringTransformer::INTEGER, 0, '34.4', 35, \NumberFormatter::ROUND_CEILING],
+ [PercentToLocalizedStringTransformer::INTEGER, 1, '3.45', 3.5, \NumberFormatter::ROUND_CEILING],
+ [PercentToLocalizedStringTransformer::INTEGER, 1, '3.44', 3.5, \NumberFormatter::ROUND_CEILING],
+ [null, 0, '34.5', 0.35, \NumberFormatter::ROUND_CEILING],
+ [null, 0, '34.4', 0.35, \NumberFormatter::ROUND_CEILING],
+ [null, 1, '3.45', 0.035, \NumberFormatter::ROUND_CEILING],
+ [null, 1, '3.44', 0.035, \NumberFormatter::ROUND_CEILING],
// towards negative infinity (1.6 -> 1, -1.6 -> -2)
- [PercentToLocalizedStringTransformer::INTEGER, 0, '34.5', 34, PercentToLocalizedStringTransformer::ROUND_FLOOR],
- [PercentToLocalizedStringTransformer::INTEGER, 0, '34.4', 34, PercentToLocalizedStringTransformer::ROUND_FLOOR],
- [PercentToLocalizedStringTransformer::INTEGER, 1, '3.45', 3.4, PercentToLocalizedStringTransformer::ROUND_FLOOR],
- [PercentToLocalizedStringTransformer::INTEGER, 1, '3.44', 3.4, PercentToLocalizedStringTransformer::ROUND_FLOOR],
- [null, 0, '34.5', 0.34, PercentToLocalizedStringTransformer::ROUND_FLOOR],
- [null, 0, '34.4', 0.34, PercentToLocalizedStringTransformer::ROUND_FLOOR],
- [null, 1, '3.45', 0.034, PercentToLocalizedStringTransformer::ROUND_FLOOR],
- [null, 1, '3.44', 0.034, PercentToLocalizedStringTransformer::ROUND_FLOOR],
+ [PercentToLocalizedStringTransformer::INTEGER, 0, '34.5', 34, \NumberFormatter::ROUND_FLOOR],
+ [PercentToLocalizedStringTransformer::INTEGER, 0, '34.4', 34, \NumberFormatter::ROUND_FLOOR],
+ [PercentToLocalizedStringTransformer::INTEGER, 1, '3.45', 3.4, \NumberFormatter::ROUND_FLOOR],
+ [PercentToLocalizedStringTransformer::INTEGER, 1, '3.44', 3.4, \NumberFormatter::ROUND_FLOOR],
+ [null, 0, '34.5', 0.34, \NumberFormatter::ROUND_FLOOR],
+ [null, 0, '34.4', 0.34, \NumberFormatter::ROUND_FLOOR],
+ [null, 1, '3.45', 0.034, \NumberFormatter::ROUND_FLOOR],
+ [null, 1, '3.44', 0.034, \NumberFormatter::ROUND_FLOOR],
// away from zero (1.6 -> 2, -1.6 -> 2)
- [PercentToLocalizedStringTransformer::INTEGER, 0, '34.5', 35, PercentToLocalizedStringTransformer::ROUND_UP],
- [PercentToLocalizedStringTransformer::INTEGER, 0, '34.4', 35, PercentToLocalizedStringTransformer::ROUND_UP],
- [PercentToLocalizedStringTransformer::INTEGER, 1, '3.45', 3.5, PercentToLocalizedStringTransformer::ROUND_UP],
- [PercentToLocalizedStringTransformer::INTEGER, 1, '3.44', 3.5, PercentToLocalizedStringTransformer::ROUND_UP],
- [null, 0, '34.5', 0.35, PercentToLocalizedStringTransformer::ROUND_UP],
- [null, 0, '34.4', 0.35, PercentToLocalizedStringTransformer::ROUND_UP],
- [null, 1, '3.45', 0.035, PercentToLocalizedStringTransformer::ROUND_UP],
- [null, 1, '3.44', 0.035, PercentToLocalizedStringTransformer::ROUND_UP],
+ [PercentToLocalizedStringTransformer::INTEGER, 0, '34.5', 35, \NumberFormatter::ROUND_UP],
+ [PercentToLocalizedStringTransformer::INTEGER, 0, '34.4', 35, \NumberFormatter::ROUND_UP],
+ [PercentToLocalizedStringTransformer::INTEGER, 1, '3.45', 3.5, \NumberFormatter::ROUND_UP],
+ [PercentToLocalizedStringTransformer::INTEGER, 1, '3.44', 3.5, \NumberFormatter::ROUND_UP],
+ [null, 0, '34.5', 0.35, \NumberFormatter::ROUND_UP],
+ [null, 0, '34.4', 0.35, \NumberFormatter::ROUND_UP],
+ [null, 1, '3.45', 0.035, \NumberFormatter::ROUND_UP],
+ [null, 1, '3.44', 0.035, \NumberFormatter::ROUND_UP],
// towards zero (1.6 -> 1, -1.6 -> -1)
- [PercentToLocalizedStringTransformer::INTEGER, 0, '34.5', 34, PercentToLocalizedStringTransformer::ROUND_DOWN],
- [PercentToLocalizedStringTransformer::INTEGER, 0, '34.4', 34, PercentToLocalizedStringTransformer::ROUND_DOWN],
- [PercentToLocalizedStringTransformer::INTEGER, 1, '3.45', 3.4, PercentToLocalizedStringTransformer::ROUND_DOWN],
- [PercentToLocalizedStringTransformer::INTEGER, 1, '3.44', 3.4, PercentToLocalizedStringTransformer::ROUND_DOWN],
- [PercentToLocalizedStringTransformer::INTEGER, 2, '37.37', 37.37, PercentToLocalizedStringTransformer::ROUND_DOWN],
- [PercentToLocalizedStringTransformer::INTEGER, 2, '2.01', 2.01, PercentToLocalizedStringTransformer::ROUND_DOWN],
- [null, 0, '34.5', 0.34, PercentToLocalizedStringTransformer::ROUND_DOWN],
- [null, 0, '34.4', 0.34, PercentToLocalizedStringTransformer::ROUND_DOWN],
- [null, 1, '3.45', 0.034, PercentToLocalizedStringTransformer::ROUND_DOWN],
- [null, 1, '3.44', 0.034, PercentToLocalizedStringTransformer::ROUND_DOWN],
- [null, 2, '37.37', 0.3737, PercentToLocalizedStringTransformer::ROUND_DOWN],
- [null, 2, '2.01', 0.0201, PercentToLocalizedStringTransformer::ROUND_DOWN],
+ [PercentToLocalizedStringTransformer::INTEGER, 0, '34.5', 34, \NumberFormatter::ROUND_DOWN],
+ [PercentToLocalizedStringTransformer::INTEGER, 0, '34.4', 34, \NumberFormatter::ROUND_DOWN],
+ [PercentToLocalizedStringTransformer::INTEGER, 1, '3.45', 3.4, \NumberFormatter::ROUND_DOWN],
+ [PercentToLocalizedStringTransformer::INTEGER, 1, '3.44', 3.4, \NumberFormatter::ROUND_DOWN],
+ [PercentToLocalizedStringTransformer::INTEGER, 2, '37.37', 37.37, \NumberFormatter::ROUND_DOWN],
+ [PercentToLocalizedStringTransformer::INTEGER, 2, '2.01', 2.01, \NumberFormatter::ROUND_DOWN],
+ [null, 0, '34.5', 0.34, \NumberFormatter::ROUND_DOWN],
+ [null, 0, '34.4', 0.34, \NumberFormatter::ROUND_DOWN],
+ [null, 1, '3.45', 0.034, \NumberFormatter::ROUND_DOWN],
+ [null, 1, '3.44', 0.034, \NumberFormatter::ROUND_DOWN],
+ [null, 2, '37.37', 0.3737, \NumberFormatter::ROUND_DOWN],
+ [null, 2, '2.01', 0.0201, \NumberFormatter::ROUND_DOWN],
// round halves (.5) to the next even number
- [PercentToLocalizedStringTransformer::INTEGER, 0, '34.6', 35, PercentToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [PercentToLocalizedStringTransformer::INTEGER, 0, '34.5', 34, PercentToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [PercentToLocalizedStringTransformer::INTEGER, 0, '34.4', 34, PercentToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [PercentToLocalizedStringTransformer::INTEGER, 0, '33.5', 34, PercentToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [PercentToLocalizedStringTransformer::INTEGER, 0, '32.5', 32, PercentToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [PercentToLocalizedStringTransformer::INTEGER, 1, '3.46', 3.5, PercentToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [PercentToLocalizedStringTransformer::INTEGER, 1, '3.45', 3.4, PercentToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [PercentToLocalizedStringTransformer::INTEGER, 1, '3.44', 3.4, PercentToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [PercentToLocalizedStringTransformer::INTEGER, 1, '3.35', 3.4, PercentToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [PercentToLocalizedStringTransformer::INTEGER, 1, '3.25', 3.2, PercentToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [null, 0, '34.6', 0.35, PercentToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [null, 0, '34.5', 0.34, PercentToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [null, 0, '34.4', 0.34, PercentToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [null, 0, '33.5', 0.34, PercentToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [null, 0, '32.5', 0.32, PercentToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [null, 1, '3.46', 0.035, PercentToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [null, 1, '3.45', 0.034, PercentToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [null, 1, '3.44', 0.034, PercentToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [null, 1, '3.35', 0.034, PercentToLocalizedStringTransformer::ROUND_HALF_EVEN],
- [null, 1, '3.25', 0.032, PercentToLocalizedStringTransformer::ROUND_HALF_EVEN],
+ [PercentToLocalizedStringTransformer::INTEGER, 0, '34.6', 35, \NumberFormatter::ROUND_HALFEVEN],
+ [PercentToLocalizedStringTransformer::INTEGER, 0, '34.5', 34, \NumberFormatter::ROUND_HALFEVEN],
+ [PercentToLocalizedStringTransformer::INTEGER, 0, '34.4', 34, \NumberFormatter::ROUND_HALFEVEN],
+ [PercentToLocalizedStringTransformer::INTEGER, 0, '33.5', 34, \NumberFormatter::ROUND_HALFEVEN],
+ [PercentToLocalizedStringTransformer::INTEGER, 0, '32.5', 32, \NumberFormatter::ROUND_HALFEVEN],
+ [PercentToLocalizedStringTransformer::INTEGER, 1, '3.46', 3.5, \NumberFormatter::ROUND_HALFEVEN],
+ [PercentToLocalizedStringTransformer::INTEGER, 1, '3.45', 3.4, \NumberFormatter::ROUND_HALFEVEN],
+ [PercentToLocalizedStringTransformer::INTEGER, 1, '3.44', 3.4, \NumberFormatter::ROUND_HALFEVEN],
+ [PercentToLocalizedStringTransformer::INTEGER, 1, '3.35', 3.4, \NumberFormatter::ROUND_HALFEVEN],
+ [PercentToLocalizedStringTransformer::INTEGER, 1, '3.25', 3.2, \NumberFormatter::ROUND_HALFEVEN],
+ [null, 0, '34.6', 0.35, \NumberFormatter::ROUND_HALFEVEN],
+ [null, 0, '34.5', 0.34, \NumberFormatter::ROUND_HALFEVEN],
+ [null, 0, '34.4', 0.34, \NumberFormatter::ROUND_HALFEVEN],
+ [null, 0, '33.5', 0.34, \NumberFormatter::ROUND_HALFEVEN],
+ [null, 0, '32.5', 0.32, \NumberFormatter::ROUND_HALFEVEN],
+ [null, 1, '3.46', 0.035, \NumberFormatter::ROUND_HALFEVEN],
+ [null, 1, '3.45', 0.034, \NumberFormatter::ROUND_HALFEVEN],
+ [null, 1, '3.44', 0.034, \NumberFormatter::ROUND_HALFEVEN],
+ [null, 1, '3.35', 0.034, \NumberFormatter::ROUND_HALFEVEN],
+ [null, 1, '3.25', 0.032, \NumberFormatter::ROUND_HALFEVEN],
// round halves (.5) away from zero
- [PercentToLocalizedStringTransformer::INTEGER, 0, '34.6', 35, PercentToLocalizedStringTransformer::ROUND_HALF_UP],
- [PercentToLocalizedStringTransformer::INTEGER, 0, '34.5', 35, PercentToLocalizedStringTransformer::ROUND_HALF_UP],
- [PercentToLocalizedStringTransformer::INTEGER, 0, '34.4', 34, PercentToLocalizedStringTransformer::ROUND_HALF_UP],
- [PercentToLocalizedStringTransformer::INTEGER, 1, '3.46', 3.5, PercentToLocalizedStringTransformer::ROUND_HALF_UP],
- [PercentToLocalizedStringTransformer::INTEGER, 1, '3.45', 3.5, PercentToLocalizedStringTransformer::ROUND_HALF_UP],
- [PercentToLocalizedStringTransformer::INTEGER, 1, '3.44', 3.4, PercentToLocalizedStringTransformer::ROUND_HALF_UP],
- [null, 0, '34.6', 0.35, PercentToLocalizedStringTransformer::ROUND_HALF_UP],
- [null, 0, '34.5', 0.35, PercentToLocalizedStringTransformer::ROUND_HALF_UP],
- [null, 0, '34.4', 0.34, PercentToLocalizedStringTransformer::ROUND_HALF_UP],
- [null, 1, '3.46', 0.035, PercentToLocalizedStringTransformer::ROUND_HALF_UP],
- [null, 1, '3.45', 0.035, PercentToLocalizedStringTransformer::ROUND_HALF_UP],
- [null, 1, '3.44', 0.034, PercentToLocalizedStringTransformer::ROUND_HALF_UP],
+ [PercentToLocalizedStringTransformer::INTEGER, 0, '34.6', 35, \NumberFormatter::ROUND_HALFUP],
+ [PercentToLocalizedStringTransformer::INTEGER, 0, '34.5', 35, \NumberFormatter::ROUND_HALFUP],
+ [PercentToLocalizedStringTransformer::INTEGER, 0, '34.4', 34, \NumberFormatter::ROUND_HALFUP],
+ [PercentToLocalizedStringTransformer::INTEGER, 1, '3.46', 3.5, \NumberFormatter::ROUND_HALFUP],
+ [PercentToLocalizedStringTransformer::INTEGER, 1, '3.45', 3.5, \NumberFormatter::ROUND_HALFUP],
+ [PercentToLocalizedStringTransformer::INTEGER, 1, '3.44', 3.4, \NumberFormatter::ROUND_HALFUP],
+ [null, 0, '34.6', 0.35, \NumberFormatter::ROUND_HALFUP],
+ [null, 0, '34.5', 0.35, \NumberFormatter::ROUND_HALFUP],
+ [null, 0, '34.4', 0.34, \NumberFormatter::ROUND_HALFUP],
+ [null, 1, '3.46', 0.035, \NumberFormatter::ROUND_HALFUP],
+ [null, 1, '3.45', 0.035, \NumberFormatter::ROUND_HALFUP],
+ [null, 1, '3.44', 0.034, \NumberFormatter::ROUND_HALFUP],
// round halves (.5) towards zero
- [PercentToLocalizedStringTransformer::INTEGER, 0, '34.6', 35, PercentToLocalizedStringTransformer::ROUND_HALF_DOWN],
- [PercentToLocalizedStringTransformer::INTEGER, 0, '34.5', 34, PercentToLocalizedStringTransformer::ROUND_HALF_DOWN],
- [PercentToLocalizedStringTransformer::INTEGER, 0, '34.4', 34, PercentToLocalizedStringTransformer::ROUND_HALF_DOWN],
- [PercentToLocalizedStringTransformer::INTEGER, 1, '3.46', 3.5, PercentToLocalizedStringTransformer::ROUND_HALF_DOWN],
- [PercentToLocalizedStringTransformer::INTEGER, 1, '3.45', 3.4, PercentToLocalizedStringTransformer::ROUND_HALF_DOWN],
- [PercentToLocalizedStringTransformer::INTEGER, 1, '3.44', 3.4, PercentToLocalizedStringTransformer::ROUND_HALF_DOWN],
- [null, 0, '34.6', 0.35, PercentToLocalizedStringTransformer::ROUND_HALF_DOWN],
- [null, 0, '34.5', 0.34, PercentToLocalizedStringTransformer::ROUND_HALF_DOWN],
- [null, 0, '34.4', 0.34, PercentToLocalizedStringTransformer::ROUND_HALF_DOWN],
- [null, 1, '3.46', 0.035, PercentToLocalizedStringTransformer::ROUND_HALF_DOWN],
- [null, 1, '3.45', 0.034, PercentToLocalizedStringTransformer::ROUND_HALF_DOWN],
- [null, 1, '3.44', 0.034, PercentToLocalizedStringTransformer::ROUND_HALF_DOWN],
+ [PercentToLocalizedStringTransformer::INTEGER, 0, '34.6', 35, \NumberFormatter::ROUND_HALFDOWN],
+ [PercentToLocalizedStringTransformer::INTEGER, 0, '34.5', 34, \NumberFormatter::ROUND_HALFDOWN],
+ [PercentToLocalizedStringTransformer::INTEGER, 0, '34.4', 34, \NumberFormatter::ROUND_HALFDOWN],
+ [PercentToLocalizedStringTransformer::INTEGER, 1, '3.46', 3.5, \NumberFormatter::ROUND_HALFDOWN],
+ [PercentToLocalizedStringTransformer::INTEGER, 1, '3.45', 3.4, \NumberFormatter::ROUND_HALFDOWN],
+ [PercentToLocalizedStringTransformer::INTEGER, 1, '3.44', 3.4, \NumberFormatter::ROUND_HALFDOWN],
+ [null, 0, '34.6', 0.35, \NumberFormatter::ROUND_HALFDOWN],
+ [null, 0, '34.5', 0.34, \NumberFormatter::ROUND_HALFDOWN],
+ [null, 0, '34.4', 0.34, \NumberFormatter::ROUND_HALFDOWN],
+ [null, 1, '3.46', 0.035, \NumberFormatter::ROUND_HALFDOWN],
+ [null, 1, '3.45', 0.034, \NumberFormatter::ROUND_HALFDOWN],
+ [null, 1, '3.44', 0.034, \NumberFormatter::ROUND_HALFDOWN],
];
}
@@ -199,14 +199,14 @@ public function testReverseTransformWithRounding($type, $scale, $input, $output,
public function testReverseTransformEmpty()
{
- $transformer = new PercentToLocalizedStringTransformer(null, null, PercentToLocalizedStringTransformer::ROUND_HALF_UP);
+ $transformer = new PercentToLocalizedStringTransformer(null, null, \NumberFormatter::ROUND_HALFUP);
$this->assertNull($transformer->reverseTransform(''));
}
public function testReverseTransformWithInteger()
{
- $transformer = new PercentToLocalizedStringTransformer(null, 'integer', PercentToLocalizedStringTransformer::ROUND_HALF_UP);
+ $transformer = new PercentToLocalizedStringTransformer(null, 'integer', \NumberFormatter::ROUND_HALFUP);
$this->assertEquals(10, $transformer->reverseTransform('10'));
$this->assertEquals(15, $transformer->reverseTransform('15'));
@@ -221,14 +221,14 @@ public function testReverseTransformWithScale()
\Locale::setDefault('de_AT');
- $transformer = new PercentToLocalizedStringTransformer(2, null, PercentToLocalizedStringTransformer::ROUND_HALF_UP);
+ $transformer = new PercentToLocalizedStringTransformer(2, null, \NumberFormatter::ROUND_HALFUP);
$this->assertEquals(0.1234, $transformer->reverseTransform('12,34'));
}
public function testTransformExpectsNumeric()
{
- $transformer = new PercentToLocalizedStringTransformer(null, null, PercentToLocalizedStringTransformer::ROUND_HALF_UP);
+ $transformer = new PercentToLocalizedStringTransformer(null, null, \NumberFormatter::ROUND_HALFUP);
$this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
@@ -237,7 +237,7 @@ public function testTransformExpectsNumeric()
public function testReverseTransformExpectsString()
{
- $transformer = new PercentToLocalizedStringTransformer(null, null, PercentToLocalizedStringTransformer::ROUND_HALF_UP);
+ $transformer = new PercentToLocalizedStringTransformer(null, null, \NumberFormatter::ROUND_HALFUP);
$this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
@@ -249,7 +249,7 @@ public function testDecimalSeparatorMayBeDotIfGroupingSeparatorIsNotDot()
IntlTestHelper::requireFullIntl($this, '4.8.1.1');
\Locale::setDefault('fr');
- $transformer = new PercentToLocalizedStringTransformer(1, 'integer', PercentToLocalizedStringTransformer::ROUND_HALF_UP);
+ $transformer = new PercentToLocalizedStringTransformer(1, 'integer', \NumberFormatter::ROUND_HALFUP);
// completely valid format
$this->assertEquals(1234.5, $transformer->reverseTransform('1 234,5'));
@@ -268,7 +268,7 @@ public function testDecimalSeparatorMayNotBeDotIfGroupingSeparatorIsDot()
\Locale::setDefault('de_DE');
- $transformer = new PercentToLocalizedStringTransformer(1, 'integer', PercentToLocalizedStringTransformer::ROUND_HALF_UP);
+ $transformer = new PercentToLocalizedStringTransformer(1, 'integer', \NumberFormatter::ROUND_HALFUP);
$transformer->reverseTransform('1.234.5');
}
@@ -281,7 +281,7 @@ public function testDecimalSeparatorMayNotBeDotIfGroupingSeparatorIsDotWithNoGro
\Locale::setDefault('de_DE');
- $transformer = new PercentToLocalizedStringTransformer(1, 'integer', PercentToLocalizedStringTransformer::ROUND_HALF_UP);
+ $transformer = new PercentToLocalizedStringTransformer(1, 'integer', \NumberFormatter::ROUND_HALFUP);
$transformer->reverseTransform('1234.5');
}
@@ -292,7 +292,7 @@ public function testDecimalSeparatorMayBeDotIfGroupingSeparatorIsDotButNoGroupin
IntlTestHelper::requireFullIntl($this, false);
\Locale::setDefault('fr');
- $transformer = new PercentToLocalizedStringTransformer(1, 'integer', PercentToLocalizedStringTransformer::ROUND_HALF_UP);
+ $transformer = new PercentToLocalizedStringTransformer(1, 'integer', \NumberFormatter::ROUND_HALFUP);
$this->assertEquals(1234.5, $transformer->reverseTransform('1234,5'));
$this->assertEquals(1234.5, $transformer->reverseTransform('1234.5'));
@@ -304,7 +304,7 @@ public function testDecimalSeparatorMayBeCommaIfGroupingSeparatorIsNotComma()
IntlTestHelper::requireFullIntl($this, '4.8.1.1');
\Locale::setDefault('bg');
- $transformer = new PercentToLocalizedStringTransformer(1, 'integer', PercentToLocalizedStringTransformer::ROUND_HALF_UP);
+ $transformer = new PercentToLocalizedStringTransformer(1, 'integer', \NumberFormatter::ROUND_HALFUP);
// completely valid format
$this->assertEquals(1234.5, $transformer->reverseTransform('1 234.5'));
@@ -320,7 +320,7 @@ public function testDecimalSeparatorMayNotBeCommaIfGroupingSeparatorIsComma()
$this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
IntlTestHelper::requireFullIntl($this, '4.8.1.1');
- $transformer = new PercentToLocalizedStringTransformer(1, 'integer', PercentToLocalizedStringTransformer::ROUND_HALF_UP);
+ $transformer = new PercentToLocalizedStringTransformer(1, 'integer', \NumberFormatter::ROUND_HALFUP);
$transformer->reverseTransform('1,234,5');
}
@@ -330,7 +330,7 @@ public function testDecimalSeparatorMayNotBeCommaIfGroupingSeparatorIsCommaWithN
$this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
IntlTestHelper::requireFullIntl($this, '4.8.1.1');
- $transformer = new PercentToLocalizedStringTransformer(1, 'integer', PercentToLocalizedStringTransformer::ROUND_HALF_UP);
+ $transformer = new PercentToLocalizedStringTransformer(1, 'integer', \NumberFormatter::ROUND_HALFUP);
$transformer->reverseTransform('1234,5');
}
@@ -343,7 +343,7 @@ public function testDecimalSeparatorMayBeCommaIfGroupingSeparatorIsCommaButNoGro
$transformer = $this->getMockBuilder('Symfony\Component\Form\Extension\Core\DataTransformer\PercentToLocalizedStringTransformer')
->setMethods(['getNumberFormatter'])
- ->setConstructorArgs([1, 'integer', PercentToLocalizedStringTransformer::ROUND_HALF_UP])
+ ->setConstructorArgs([1, 'integer', \NumberFormatter::ROUND_HALFUP])
->getMock();
$transformer->expects($this->any())
->method('getNumberFormatter')
@@ -356,7 +356,7 @@ public function testDecimalSeparatorMayBeCommaIfGroupingSeparatorIsCommaButNoGro
public function testReverseTransformDisallowsLeadingExtraCharacters()
{
$this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
- $transformer = new PercentToLocalizedStringTransformer(null, null, PercentToLocalizedStringTransformer::ROUND_HALF_UP);
+ $transformer = new PercentToLocalizedStringTransformer(null, null, \NumberFormatter::ROUND_HALFUP);
$transformer->reverseTransform('foo123');
}
@@ -365,7 +365,7 @@ public function testReverseTransformDisallowsCenteredExtraCharacters()
{
$this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$this->expectExceptionMessage('The number contains unrecognized characters: "foo3"');
- $transformer = new PercentToLocalizedStringTransformer(null, null, PercentToLocalizedStringTransformer::ROUND_HALF_UP);
+ $transformer = new PercentToLocalizedStringTransformer(null, null, \NumberFormatter::ROUND_HALFUP);
$transformer->reverseTransform('12foo3');
}
@@ -382,7 +382,7 @@ public function testReverseTransformDisallowsCenteredExtraCharactersMultibyte()
\Locale::setDefault('ru');
- $transformer = new PercentToLocalizedStringTransformer(null, null, PercentToLocalizedStringTransformer::ROUND_HALF_UP);
+ $transformer = new PercentToLocalizedStringTransformer(null, null, \NumberFormatter::ROUND_HALFUP);
$transformer->reverseTransform("12\xc2\xa0345,67foo8");
}
@@ -391,7 +391,7 @@ public function testReverseTransformDisallowsTrailingExtraCharacters()
{
$this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$this->expectExceptionMessage('The number contains unrecognized characters: "foo"');
- $transformer = new PercentToLocalizedStringTransformer(null, null, PercentToLocalizedStringTransformer::ROUND_HALF_UP);
+ $transformer = new PercentToLocalizedStringTransformer(null, null, \NumberFormatter::ROUND_HALFUP);
$transformer->reverseTransform('123foo');
}
@@ -408,7 +408,7 @@ public function testReverseTransformDisallowsTrailingExtraCharactersMultibyte()
\Locale::setDefault('ru');
- $transformer = new PercentToLocalizedStringTransformer(null, null, PercentToLocalizedStringTransformer::ROUND_HALF_UP);
+ $transformer = new PercentToLocalizedStringTransformer(null, null, \NumberFormatter::ROUND_HALFUP);
$transformer->reverseTransform("12\xc2\xa0345,678foo");
}
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/PercentTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/PercentTypeTest.php
index 4a8d51c965ce4..9515a43d00cf2 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/PercentTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/PercentTypeTest.php
@@ -12,7 +12,6 @@
namespace Symfony\Component\Form\Tests\Extension\Core\Type;
use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
-use Symfony\Component\Form\Extension\Core\DataTransformer\PercentToLocalizedStringTransformer;
use Symfony\Component\Form\Extension\Core\Type\PercentType;
use Symfony\Component\Form\Test\TypeTestCase;
@@ -26,7 +25,7 @@ public function testSubmitWithRoundingMode()
{
$form = $this->factory->create(self::TESTED_TYPE, null, [
'scale' => 2,
- 'rounding_mode' => PercentToLocalizedStringTransformer::ROUND_CEILING,
+ 'rounding_mode' => \NumberFormatter::ROUND_CEILING,
]);
$form->submit('1.23456');
@@ -39,7 +38,7 @@ public function testSubmitWithRoundingMode()
*/
public function testSubmitWithoutRoundingMode()
{
- $this->expectDeprecation('Since symfony/form 5.1: Not configuring the "rounding_mode" option is deprecated. It will default to "Symfony\Component\Form\Extension\Core\DataTransformer\PercentToLocalizedStringTransformer::ROUND_HALF_UP" in Symfony 6.0.');
+ $this->expectDeprecation('Since symfony/form 5.1: Not configuring the "rounding_mode" option is deprecated. It will default to "\NumberFormatter::ROUND_HALFUP" in Symfony 6.0.');
$form = $this->factory->create(self::TESTED_TYPE, null, [
'scale' => 2,
@@ -55,7 +54,7 @@ public function testSubmitWithoutRoundingMode()
*/
public function testSubmitWithNullRoundingMode()
{
- $this->expectDeprecation('Since symfony/form 5.1: Not configuring the "rounding_mode" option is deprecated. It will default to "Symfony\Component\Form\Extension\Core\DataTransformer\PercentToLocalizedStringTransformer::ROUND_HALF_UP" in Symfony 6.0.');
+ $this->expectDeprecation('Since symfony/form 5.1: Not configuring the "rounding_mode" option is deprecated. It will default to "\NumberFormatter::ROUND_HALFUP" in Symfony 6.0.');
$form = $this->factory->create(self::TESTED_TYPE, null, [
'rounding_mode' => null,
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy