Skip to content

Commit 175eed1

Browse files
committed
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
2 parents 8e7311c + c8af292 commit 175eed1

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Form/ChoiceList/DoctrineChoiceLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function __construct(
4141
private readonly ?EntityLoaderInterface $objectLoader = null,
4242
) {
4343
if ($idReader && !$idReader->isSingleId()) {
44-
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__));
44+
throw new \InvalidArgumentException(sprintf('The "$idReader" argument of "%s" must be null when the query cannot be optimized because of composite id fields.', __METHOD__));
4545
}
4646

4747
$this->class = $manager->getClassMetadata($class)->getName();

Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ public function testLoadChoicesForValuesLoadsOnlyChoicesIfValueIsIdReader()
375375
public function testPassingIdReaderWithoutSingleIdEntity()
376376
{
377377
$this->expectException(\InvalidArgumentException::class);
378-
$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.');
378+
$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.');
379379

380380
$idReader = $this->createMock(IdReader::class);
381381
$idReader->expects($this->once())

0 commit comments

Comments
 (0)