From 83b836dbc90e68e7b088c1c737d393b827baaded Mon Sep 17 00:00:00 2001
From: Warxcell <warxcell@gmail.com>
Date: Thu, 18 Mar 2021 15:13:44 +0200
Subject: [PATCH] IntegerType: Always use en for
 IntegerToLocalizedStringTransformer Fixes #40456

---
 .../IntegerToLocalizedStringTransformer.php   | 14 +++++----
 .../Form/Extension/Core/Type/IntegerType.php  |  2 +-
 .../Extension/Core/Type/IntegerTypeTest.php   | 31 ++++++++++++++++++-
 3 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php
index 76e3eea8ed..7e0eeea2a5 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php
@@ -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);
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php b/src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php
index 540cdb6f79..2fa7c9c642 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php
@@ -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));
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/IntegerTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/IntegerTypeTest.php
index a88eb70c5f..0156b21905 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/IntegerTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/IntegerTypeTest.php
@@ -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);