Merge branch '6.3' into 6.4

* 6.3: [Form] Fix merging form data and files (ter) [Intl] Update the ICU data to 74.1 [Scheduler] Use MockClock [HtmlSanitizer] Consider `width` attribute as safe [DoctrineBridge] Fix exception message [Security][Validator] Missing translations for Luxembourgish
symfony · Oct 28, 2023 · 175eed1 · 175eed1
2 parents 8e7311c + c8af292
commit 175eed1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Form/ChoiceList/DoctrineChoiceLoader.php b/Form/ChoiceList/DoctrineChoiceLoader.php
@@ -41,7 +41,7 @@ public function __construct(
         private readonly ?EntityLoaderInterface $objectLoader = null,
     ) {
         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->class = $manager->getClassMetadata($class)->getName();

diff --git a/Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php b/Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php
@@ -375,7 +375,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())