8000 [Form] IntegerType: Always use en for IntegerToLocalizedStringTransformer by Warxcell · Pull Request #40510 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Form] IntegerType: Always use en for IntegerToLocalizedStringTransformer #40510

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 26, 2021
Merged

[Form] IntegerType: Always use en for IntegerToLocalizedStringTransformer #40510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions ...ony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,21 @@ class IntegerToLocalizedStringTransformer extends NumberToLocalizedStringTransfo
/**
* Constructs a transformer.
*
* @param bool $grouping Whether thousands should be grouped
* @param int $roundingMode One of the ROUND_ constants in this class
* @param bool $grouping Whether thousands should be grouped
* @param int $roundingMode One of the ROUND_ constants in this class
* @param string|null $locale locale used for transforming
*/
public function __construct($grouping = false, $roundingMode = self::ROUND_DOWN)
public function __construct($grouping = false, $roundingMode = self::ROUND_DOWN, $locale = null)
{
if (\is_int($grouping) || \is_bool($roundingMode) || 2 < \func_num_args()) {
if (\is_int($grouping) || \is_bool($roundingMode) || \is_int($locale)) {
@trigger_error(sprintf('Passing a precision as the first value to %s::__construct() is deprecated since Symfony 4.2 and support for it will be dropped in 5.0.', __CLASS__), \E_USER_DEPRECATED);

$grouping = $roundingMode;
$roundingMode = 2 < \func_num_args() ? func_get_arg(2) : self::ROUND_DOWN;
$roundingMode = null !== $locale ? $locale : self::ROUND_DOWN;
$locale = null;
}

parent::__construct(0, $grouping, $roundingMode);
parent::__construct(0, $grouping, $roundingMode, $locale);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class IntegerType extends AbstractType
*/
public function buildForm(FormBuilderInterface $builder, array $options)
{
$builder->addViewTransformer(new IntegerToLocalizedStringTransformer($options['grouping'], $options['rounding_mode']));
$builder->addViewTransformer(new IntegerToLocalizedStringTransformer($options['grouping'], $options['rounding_mode'], !$options['grouping'] ? 'en' : null));
}

/**
Expand Down
31 changes: 30 additions & 1 deletion src/Symfony/Component/Form/Tests/Extension/Core/Type/IntegerTypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,42 @@ class IntegerTypeTest extends BaseTypeTest
{
public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\IntegerType';

private $previousLocale;

protected function setUp(): void
{
IntlTestHelper::requireIntl($this, false);

$this->previousLocale = \Locale::getDefault();
parent::setUp();
}

protected function tearDown(): void
{
\Locale::setDefault($this->previousLocale);
}

public function testArabicLocale()
{
\Locale::setDefault('ar');

$form = $this->factory->create(static::TESTED_TYPE);
$form->submit('123456');

$this->assertSame(123456, $form->getData());
$this->assertSame('123456', $form->getViewData());
}

public function testArabicLocaleNonHtml5()
{
\Locale::setDefault('ar');

$form = $this->factory->create(static::TESTED_TYPE, null, ['grouping' => true]);
$form->submit('123456');

$this->assertSame(123456, $form->getData());
$this->assertSame('١٢٣٬٤٥٦', $form->getViewData());
}

public function testSubmitRejectsFloats()
{
$form = $this->factory->create(static::TESTED_TYPE);
Expand Down
0