Merge branch '5.4' into 6.3

* 5.4:
  [Form] Fix merging form data and files (ter)
  [Intl] Update the ICU data to 74.1
  [DoctrineBridge] Fix exception message
  [Security][Validator] Missing translations for Luxembourgish

Author: fabpot

src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php

@@ -41,7 +41,7 @@ public function __construct(ObjectManager $manager, string $class, IdReader $idR
         $classMetadata = $manager->getClassMetadata($class);
 
         if ($idReader && !$idReader->isSingleId()) {
-            throw new \InvalidArgumentException(sprintf('The second argument "$idReader" of "%s" must be null when the query cannot be optimized because of composite id fields.', __METHOD__));
+            throw new \InvalidArgumentException(sprintf('The "$idReader" argument of "%s" must be null when the query cannot be optimized because of composite id fields.', __METHOD__));
         }
 
         $this->manager = $manager;

src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php

@@ -416,7 +416,7 @@ public function testLoadChoicesForValuesLoadsOnlyChoicesIfValueIsIdReader()
     public function testPassingIdReaderWithoutSingleIdEntity()
     {
         $this->expectException(\InvalidArgumentException::class);
-        $this->expectExceptionMessage('The second argument "$idReader" of "Symfony\\Bridge\\Doctrine\\Form\\ChoiceList\\DoctrineChoiceLoader::__construct" must be null when the query cannot be optimized because of composite id fields.');
+        $this->expectExceptionMessage('The "$idReader" argument of "Symfony\\Bridge\\Doctrine\\Form\\ChoiceList\\DoctrineChoiceLoader::__construct" must be null when the query cannot be optimized because of composite id fields.');
 
         $idReader = $this->createMock(IdReader::class);
         $idReader->expects($this->once())

src/Symfony/Component/Form/Tests/AbstractRequestHandlerTestCase.php

@@ -14,6 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\Form\Extension\Core\DataMapper\DataMapper;
+use Symfony\Component\Form\Extension\Core\Type\CollectionType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\Form;
 use Symfony\Component\Form\FormBuilder;
@@ -23,6 +24,7 @@
 use Symfony\Component\Form\Forms;
 use Symfony\Component\Form\RequestHandlerInterface;
 use Symfony\Component\Form\ResolvedFormTypeFactory;
+use Symfony\Component\Form\Tests\Extension\Type\ItemFileType;
 use Symfony\Component\Form\Util\ServerParams;
 
 /**
@@ -311,6 +313,48 @@ public function testParamTakesPrecedenceOverFile($method)
         $this->assertSame('DATA', $form->getData());
     }
 
+    public function testMergeZeroIndexedCollection()
+    {
+        $form = $this->createForm('root', 'POST', true);
+        $form->add('items', CollectionType::class, [
+            'entry_type' => ItemFileType::class,
+            'allow_add' => true,
+        ]);
+
+        $file = $this->getUploadedFile();
+
+        $this->setRequestData('POST', [
+            'root' => [
+                'items' => [
+                    0 => [
+                        'item' => 'test',
+                    ],
+                ],
+            ],
+        ], [
+            'root' => [
+                'items' => [
+                    0 => [
+                        'file' => $file,
+                    ],
+                ],
+            ],
+        ]);
+
+        $this->requestHandler->handleRequest($form, $this->request);
+
+        $itemsForm = $form->get('items');
+
+        $this->assertTrue($form->isSubmitted());
+        $this->assertTrue($form->isValid());
+
+        $this->assertTrue($itemsForm->has('0'));
+        $this->assertFalse($itemsForm->has('1'));
+
+        $this->assertEquals('test', $itemsForm->get('0')->get('item')->getData());
+        $this->assertNotNull($itemsForm->get('0')->get('file'));
+    }
+
     /**
      * @dataProvider methodExceptGetProvider
      */

src/Symfony/Component/Form/Tests/Extension/Type/ItemFileType.php

@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Tests\Extension\Type;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\FileType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class ItemFileType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options): void
+    {
+        $builder->add('item', TextType::class);
+        $builder->add('file', FileType::class);
+    }
+}

src/Symfony/Component/Form/Util/FormUtil.php

@@ -46,13 +46,7 @@ public static function isEmpty(mixed $data): bool
      */
     public static function mergeParamsAndFiles(array $params, array $files): array
     {
-        if (array_is_list($files)) {
-            foreach ($files as $value) {
-                $params[] = $value;
-            }
-
-            return $params;
-        }
+        $isFilesList = array_is_list($files);
 
         foreach ($params as $key => $value) {
             if (\is_array($value) && \is_array($files[$key] ?? null)) {
@@ -61,6 +55,14 @@ public static function mergeParamsAndFiles(array $params, array $files): array
             }
         }
 
-        return array_replace($params, $files);
+        if (!$isFilesList) {
+            return array_replace($params, $files);
+        }
+
+        foreach ($files as $value) {
+            $params[] = $value;
+        }
+
+        return $params;
     }
 }

src/Symfony/Component/Intl/Intl.php

@@ -106,7 +106,7 @@ public static function getIcuDataVersion(): string
      */
     public static function getIcuStubVersion(): string
     {
-        return '73.2';
+        return '74.1';
     }
 
     /**

src/Symfony/Component/Intl/Resources/bin/compile

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-[[ $1 == force ]] && docker pull jakzal/php-intl
+[[ $1 == force ]] && docker pull jakzal/php-intl:8.2-73.2
 [[ ! -d /tmp/symfony/icu ]] && mkdir -p /tmp/symfony/icu
 
 docker run \
@@ -9,5 +9,5 @@ docker run \
     -v /tmp/symfony/icu:/tmp \
     -v $(pwd):/symfony \
     -w /symfony \
-    jakzal/php-intl:8.1-70.1 \
+    jakzal/php-intl:8.2-73.2 \
     php src/Symfony/Component/Intl/Resources/bin/update-data.php