10000 minor #9488 [Form] fix deprecated usage and clarify constructor defau… · sroze/symfony@91efd7e · GitHub
[go: up one dir, main page]
Skip to content

Commit 91efd7e

Browse files
fabpotfabpot
committed
minor symfony#9488 [Form] fix deprecated usage and clarify constructor defaults for number formatter (Tobion)
This PR was submitted for the 2.4-dev branch but it was merged into the 2.4 branch instead (closes symfony#9488). Discussion ---------- [Form] 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 | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | n/a Commits ------- 5a25989 [Form] fix deprecated usage and clarify constructor defaults for number formatter
< 10000 div class="p-2 d-flex gap-2 flex-column flex-md-row flex-justify-between">
2 parents 07a89cb + 404944e commit 91efd7e

File tree

5 files changed

+20
-21
lines changed

5 files changed

+20
-21
lines changed

‎src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class IntegerToLocalizedStringTransformer extends NumberToLocalizedStringTransfo
2626
* @param Boolean $grouping Whether thousands should be grouped.
2727
* @param integer $roundingMode One of the ROUND_ constants in this class.
2828
*/
29-
public function __construct($precision = null, $grouping = null, $roundingMode = self::ROUND_DOWN)
29+
public function __construct($precision = 0, $grouping = false, $roundingMode = self::ROUND_DOWN)
3030
{
3131
if (null === $roundingMode) {
3232
$roundingMode = self::ROUND_DOWN;

‎src/Symfony/Component/Form/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,9 @@
2121
*/
2222
class MoneyToLocalizedStringTransformer extends NumberToLocalizedStringTransformer
2323
{
24-
2524
private $divisor;
2625

27-
public function __construct($precision = null, $grouping = null, $roundingMode = null, $divisor = null)
26+
public function __construct($precision = 2, $grouping = true, $roundingMode = self::ROUND_HALF_UP, $divisor = 1)
2827
{
2928
if (null === $grouping) {
3029
$grouping = true;

‎src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,14 @@ class NumberToLocalizedStringTransformer implements DataTransformerInterface
9999

100100
protected $roundingMode;
101101

102-
public function __construct($precision = null, $grouping = null, $roundingMode = null)
102+
public function __construct($precision = null, $grouping = false, $roundingMode = self::ROUND_HALF_UP)
103103
{
104104
if (null === $grouping) {
105105
$grouping = false;
106106
}
107107

108108
if (null === $roundingMode) {
109-
$roundingMode = self::ROUND_HALFUP;
109+
$roundingMode = self::ROUND_HALF_UP;
110110
}
111111

112112
$this->precision = $precision;

‎src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,19 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
4141
'precision' => null,
4242
'grouping' => false,
4343
// Integer cast rounds towards 0, so do the same when displaying fractions
44-
'rounding_mode' => \NumberFormatter::ROUND_DOWN,
44+
'rounding_mode' => IntegerToLocalizedStringTransformer::ROUND_DOWN,
4545
'compound' => false,
4646
));
4747

4848
$resolver->setAllowedValues(array(
4949
'rounding_mode' => array(
50-
\NumberFormatter::ROUND_FLOOR,
51-
\NumberFormatter::ROUND_DOWN,
52-
\NumberFormatter::ROUND_HALFDOWN,
53-
\NumberFormatter::ROUND_HALFEVEN,
54-
\NumberFormatter::ROUND_HALFUP,
55-
\NumberFormatter::ROUND_UP,
56-
\NumberFormatter::ROUND_CEILING,
50+
IntegerToLocalizedStringTransformer::ROUND_FLOOR,
51+
IntegerToLocalizedStringTransformer::ROUND_DOWN,
52+
IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN,
53+
IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN,
54+
IntegerToLocalizedStringTransformer::ROUND_HALF_UP,
55+
IntegerToLocalizedStringTransformer::ROUND_UP,
56+
IntegerToLocalizedStringTransformer::ROUND_CEILING,
5757
),
5858
));
5959
}

‎src/Symfony/Component/Form/Extension/Core/Type/NumberType.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,19 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
3939
// default precision is locale specific (usually around 3)
4040
'precision' => null,
4141
'grouping' => false,
42-
'rounding_mode' => \NumberFormatter::ROUND_HALFUP,
42+
'rounding_mode' => NumberToLocalizedStringTransformer::ROUND_HALF_UP,
4343
'compound' => false,
4444
));
4545

4646
$resolver->setAllowedValues(array(
4747
'rounding_mode' => array(
48-
\NumberFormatter::ROUND_FLOOR,
49-
\NumberFormatter::ROUND_DOWN,
50-
\NumberFormatter::ROUND_HALFDOWN,
51-
\NumberFormatter::ROUND_HALFEVEN,
52-
\NumberFormatter::ROUND_HALFUP,
53-
\NumberFormatter::ROUND_UP,
54-
\NumberFormatter::ROUND_CEILING,
48+
NumberToLocalizedStringTransformer::ROUND_FLOOR,
49+
NumberToLocalizedStringTransformer::ROUND_DOWN,
50+
NumberToLocalizedStringTransformer::ROUND_HALF_DOWN,
51+
NumberToLocalizedStringTransformer::ROUND_HALF_EVEN,
52+
NumberToLocalizedStringTransformer::ROUND_HALF_UP,
53+
NumberToLocalizedStringTransformer::ROUND_UP,
54+
NumberToLocalizedStringTransformer::ROUND_CEILING,
5555
),
5656
));
5757
}

0 commit comments

Comments
 (0)
0