[DoctrineBridge] Deprecated using IdReader when optimization is not possible

HeahDude · HeahDude · commit 3416d56a835b · 2019-04-07T12:28:08.000+02:00
diff --git a/src/Symfony/Bridge/Doctrine/CHANGELOG.md b/src/Symfony/Bridge/Doctrine/CHANGELOG.md
@@ -6,6 +6,7 @@ CHANGELOG
 
  * changed guessing of DECIMAL to set the `input` option of `NumberType` to string
  * deprecated not passing an `IdReader` to the `DoctrineChoiceLoader` when query can be optimized with a single id field
+ * deprecated passing an `IdReader` to the `DoctrineChoiceLoader` when entities have a composite id
 
 4.2.0
 -----
diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php
@@ -49,6 +49,10 @@ public function __construct(ObjectManager $manager, string $class, IdReader $idR
     {
         $classMetadata = $manager->getClassMetadata($class);
 
+        if ($idReader && !$idReader->isSingleId()) {
+            @trigger_error(sprintf('Passing an instance of "%s" with an entity class "%s" that have a composite id is deprecated since 4.3 and will throw an exception in 5.0.', IdReader::class, $class), E_USER_DEPRECATED);
+        }
+
         if ((5 > \func_num_args() || false !== func_get_arg(4)) && null === $idReader) {
             $idReader = new IdReader($manager, $classMetadata);
 
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php
@@ -470,4 +470,27 @@ public function testLoaderWithoutIdReaderCanBeOptimized()
 
         $this->assertSame([$obj1], $loader->loadChoicesForValues(['1']));
     }
+
+    /**
+     * @group legacy
+     *
+     * @deprecationMessage Passing an instance of "Symfony\Bridge\Doctrine\Form\ChoiceList\IdReader" with an entity class "stdClass" that have a composite id is deprecated since 4.3 and will throw an exception in 5.0.
+     */
+    public function testPassingIdReaderWithoutSingleIdEntity()
+    {
+        $idReader = $this->createMock(IdReader::class);
+        $idReader->expects($this->once())
+            ->method('isSingleId')
+            ->willReturn(false)
+        ;
+
+        $loader = new DoctrineChoiceLoader(
+            $this->om,
+            $this->class,
+            $idReader,
+            $this->objectLoader
+        );
+
+        $this->assertInstanceOf(DoctrineChoiceLoader::class, $loader);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,10 @@ public function __construct(ObjectManager $manager, string $class, IdReader $idR`
`49`	`49`	`{`
`50`	`50`	`$classMetadata = $manager->getClassMetadata($class);`
`51`	`51`
	`52`	`+ if ($idReader && !$idReader->isSingleId()) {`
	`53`	`+ @trigger_error(sprintf('Passing an instance of "%s" with an entity class "%s" that have a composite id is deprecated since 4.3 and will throw an exception in 5.0.', IdReader::class, $class), E_USER_DEPRECATED);`
	`54`	`+ }`
	`55`	`+`
`52`	`56`	`if ((5 > \func_num_args() \|\| false !== func_get_arg(4)) && null === $idReader) {`
`53`	`57`	`$idReader = new IdReader($manager, $classMetadata);`
`54`	`58`