From 404944e5f66c8a5f1dad1a706ad64194518f701b Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Sun, 10 Nov 2013 19:02:42 +0100 Subject: [PATCH] fix deprecated usage and clarify constructor defaults for number formatter by using the real default one can see the actual value without having to look into the implementation what NULL stands for --- .../IntegerToLocalizedStringTransformer.php | 2 +- .../MoneyToLocalizedStringTransformer.php | 3 +-- .../NumberToLocalizedStringTransformer.php | 4 ++-- .../Form/Extension/Core/Type/IntegerType.php | 16 ++++++++-------- .../Form/Extension/Core/Type/NumberType.php | 16 ++++++++-------- 5 files changed, 20 insertions(+), 21 deletions(-) diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php index c22dad5100e3..3f6463eb5ac4 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php @@ -26,7 +26,7 @@ class IntegerToLocalizedStringTransformer extends NumberToLocalizedStringTransfo * @param Boolean $grouping Whether thousands should be grouped. * @param integer $roundingMode One of the ROUND_ constants in this class. */ - public function __construct($precision = null, $grouping = null, $roundingMode = self::ROUND_DOWN) + public function __construct($precision = 0, $grouping = false, $roundingMode = self::ROUND_DOWN) { if (null === $roundingMode) { $roundingMode = self::ROUND_DOWN; diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php index 5b8e9d96641b..cfe4b954705a 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php @@ -21,10 +21,9 @@ */ class MoneyToLocalizedStringTransformer extends NumberToLocalizedStringTransformer { - private $divisor; - public function __construct($precision = null, $grouping = null, $roundingMode = null, $divisor = null) + public function __construct($precision = 2, $grouping = true, $roundingMode = self::ROUND_HALF_UP, $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 61f2f4441ea3..57416710d866 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php @@ -99,14 +99,14 @@ class NumberToLocalizedStringTransformer implements DataTransformerInterface protected $roundingMode; - public function __construct($precision = null, $grouping = null, $roundingMode = null) + public function __construct($precision = null, $grouping = false, $roundingMode = self::ROUND_HALF_UP) { if (null === $grouping) { $grouping = false; } if (null === $roundingMode) { - $roundingMode = self::ROUND_HALFUP; + $roundingMode = self::ROUND_HALF_UP; } $this->precision = $precision; diff --git a/src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php b/src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php index b224cac5fd7e..8e69f89661cf 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php @@ -41,19 +41,19 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) 'precision' => null, 'grouping' => false, // Integer cast rounds towards 0, so do the same when displaying fractions - 'rounding_mode' => \NumberFormatter::ROUND_DOWN, + 'rounding_mode' => IntegerToLocalizedStringTransformer::ROUND_DOWN, 'compound' => false, )); $resolver->setAllowedValues(array( 'rounding_mode' => array( - \NumberFormatter::ROUND_FLOOR, - \NumberFormatter::ROUND_DOWN, - \NumberFormatter::ROUND_HALFDOWN, - \NumberFormatter::ROUND_HALFEVEN, - \NumberFormatter::ROUND_HALFUP, - \NumberFormatter::ROUND_UP, - \NumberFormatter::ROUND_CEILING, + IntegerToLocalizedStringTransformer::ROUND_FLOOR, + IntegerToLocalizedStringTransformer::ROUND_DOWN, + IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN, + IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN, + IntegerToLocalizedStringTransformer::ROUND_HALF_UP, + IntegerToLocalizedStringTransformer::ROUND_UP, + IntegerToLocalizedStringTransformer::ROUND_CEILING, ), )); } diff --git a/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php b/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php index beb3c89a4134..321f25990b72 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php @@ -39,19 +39,19 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) // default precision is locale specific (usually around 3) 'precision' => null, 'grouping' => false, - 'rounding_mode' => \NumberFormatter::ROUND_HALFUP, + 'rounding_mode' => NumberToLocalizedStringTransformer::ROUND_HALF_UP, 'compound' => false, )); $resolver->setAllowedValues(array( 'rounding_mode' => array( - \NumberFormatter::ROUND_FLOOR, - \NumberFormatter::ROUND_DOWN, - \NumberFormatter::ROUND_HALFDOWN, - \NumberFormatter::ROUND_HALFEVEN, - \NumberFormatter::ROUND_HALFUP, - \NumberFormatter::ROUND_UP, - \NumberFormatter::ROUND_CEILING, + NumberToLocalizedStringTransformer::ROUND_FLOOR, + NumberToLocalizedStringTransformer::ROUND_DOWN, + NumberToLocalizedStringTransformer::ROUND_HALF_DOWN, + NumberToLocalizedStringTransformer::ROUND_HALF_EVEN, + NumberToLocalizedStringTransformer::ROUND_HALF_UP, + NumberToLocalizedStringTransformer::ROUND_UP, + NumberToLocalizedStringTransformer::ROUND_CEILING, ), )); }