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

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;

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())