[DoctrineBridge] Fix exception message

OskarStark · OskarStark · commit 5660569fde55 · 2023-10-27T13:57:23.000+02:00
diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php b/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;
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php b/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())

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public function __construct(ObjectManager $manager, string $class, IdReader $idR`
`41`	`41`	`$classMetadata = $manager->getClassMetadata($class);`
`42`	`42`
`43`	`43`	`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__));`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`$this->manager = $manager;`
Original file line number	Diff line number	Diff line change
`@@ -416,7 +416,7 @@ public function testLoadChoicesForValuesLoadsOnlyChoicesIfValueIsIdReader()`
`416`	`416`	`public function testPassingIdReaderWithoutSingleIdEntity()`
`417`	`417`	`{`
`418`	`418`	`$this->expectException(\InvalidArgumentException::class);`
`419`		`- $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.');`
	`419`	`+ $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.');`
`420`	`420`
`421`	`421`	`$idReader = $this->createMock(IdReader::class);`
`422`	`422`	`$idReader->expects($this->once())`