[DoctrineBridge] Take into account that indexBy="person_id" could be a db column name, for a referenced entity

victormacko · xabbuh · commit 1e2367d1e837 · 2021-01-15T09:22:59.000+01:00
diff --git a/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php b/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php
@@ -122,7 +122,12 @@ public function getTypes($class, $property, array $context = [])
                             /** @var ClassMetadataInfo $subMetadata */
                             $indexProperty = $subMetadata->getSingleAssociationReferencedJoinColumnName($fieldName);
                             $subMetadata = $this->entityManager ? $this->entityManager->getClassMetadata($associationMapping['targetEntity']) : $this->classMetadataFactory->getMetadataFor($associationMapping['targetEntity']);
-                            $typeOfField = $subMetadata->getTypeOfField($indexProperty);
+
+                            //Not a property, maybe a column name?
+                            if (null === ($typeOfField = $subMetadata->getTypeOfField($indexProperty))) {
+                                $fieldName = $subMetadata->getFieldForColumn($indexProperty);
+                                $typeOfField = $subMetadata->getTypeOfField($fieldName);
+                            }
                         }
                     }
 
diff --git a/src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php b/src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php
@@ -19,7 +19,7 @@ class ManagerRegistryTest extends TestCase
 {
     public static function setUpBeforeClass(): void
     {
-        if (!class_exists(\PHPUnit_Framework_TestCase::class)) {
+        if (!class_exists(PHPUnit_Framework_TestCase::class)) {
             self::markTestSkipped('proxy-manager-bridge is not yet compatible with namespaced phpunit versions.');
         }
         $test = new PhpDumperTest();
diff --git a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php
@@ -85,6 +85,7 @@ private function doTestGetProperties(bool $legacy)
             'indexedByDt',
             'indexedByCustomType',
             'indexedBuz',
+            'dummyGeneratedValueList',
         ]);
 
         $this->assertEquals(
@@ -245,6 +246,15 @@ public function typesProvider()
                 new Type(Type::BUILTIN_TYPE_STRING),
                 new Type(Type::BUILTIN_TYPE_OBJECT, false, DoctrineRelation::class)
             )]],
+            ['dummyGeneratedValueList', [new Type(
+                Type::BUILTIN_TYPE_OBJECT,
+                false,
+                'Doctrine\Common\Collections\Collection',
+                true,
+                new Type(Type::BUILTIN_TYPE_INT),
+                new Type(Type::BUILTIN_TYPE_OBJECT, false, DoctrineRelation::class)
+            )]],
+            ['json', null],
         ];
 
         if (class_exists(Types::class)) {
diff --git a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineDummy.php b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineDummy.php
@@ -137,4 +137,9 @@ class DoctrineDummy
      * @OneToMany(targetEntity="DoctrineRelation", mappedBy="buzField", indexBy="buzField")
      */
     protected $indexedBuz;
+
+    /**
+     * @OneToMany(targetEntity="DoctrineRelation", mappedBy="dummyRelation", indexBy="gen_value_col_id", orphanRemoval=true)
+     */
+    protected $dummyGeneratedValueList;
 }
diff --git a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineGeneratedValue.php b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineGeneratedValue.php
@@ -15,6 +15,7 @@
 use Doctrine\ORM\Mapping\Entity;
 use Doctrine\ORM\Mapping\GeneratedValue;
 use Doctrine\ORM\Mapping\Id;
+use Doctrine\ORM\Mapping\OneToMany;
 
 /**
  * @author Kévin Dunglas <dunglas@gmail.com>
@@ -34,4 +35,15 @@ class DoctrineGeneratedValue
      * @Column
      */
     public $foo;
+
+    /**
+     * @var int
+     * @Column(type="integer", name="gen_value_col_id")
+     */
+    public $valueId;
+
+    /**
+     * @OneToMany(targetEntity="DoctrineRelation", mappedBy="generatedValueRelation", indexBy="rguid_column", orphanRemoval=true)
+     */
+    protected $relationList;
 }
diff --git a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineRelation.php b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineRelation.php
@@ -15,6 +15,7 @@
 use Doctrine\ORM\Mapping\Entity;
 use Doctrine\ORM\Mapping\Id;
 use Doctrine\ORM\Mapping\ManyToOne;
+use Doctrine\ORM\Mapping\JoinColumn;
 
 /**
  * @Entity
@@ -60,4 +61,15 @@ class DoctrineRelation
      * @ManyToOne(targetEntity="DoctrineDummy", inversedBy="indexedBuz")
      */
     protected $buzField;
+
+    /**
+     * @ManyToOne(targetEntity="DoctrineDummy", inversedBy="dummyGeneratedValueList")
+     */
+    private $dummyRelation;
+
+    /**
+     * @ManyToOne(targetEntity="DoctrineGeneratedValue", inversedBy="relationList")
+     * @JoinColumn(name="gen_value_col_id", referencedColumnName="gen_value_col_id")
+     */
+    private $generatedValueRelation;
 }

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,12 @@ public function getTypes($class, $property, array $context = [])`
`122`	`122`	`/** @var ClassMetadataInfo $subMetadata */`
`123`	`123`	`$indexProperty = $subMetadata->getSingleAssociationReferencedJoinColumnName($fieldName);`
`124`	`124`	`$subMetadata = $this->entityManager ? $this->entityManager->getClassMetadata($associationMapping['targetEntity']) : $this->classMetadataFactory->getMetadataFor($associationMapping['targetEntity']);`
`125`		`- $typeOfField = $subMetadata->getTypeOfField($indexProperty);`
	`125`	`+`
	`126`	`+ //Not a property, maybe a column name?`
	`127`	`+ if (null === ($typeOfField = $subMetadata->getTypeOfField($indexProperty))) {`
	`128`	`+ $fieldName = $subMetadata->getFieldForColumn($indexProperty);`
	`129`	`+ $typeOfField = $subMetadata->getTypeOfField($fieldName);`
	`130`	`+ }`
`126`	`131`	`}`
`127`	`132`	`}`
`128`	`133`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class ManagerRegistryTest extends TestCase`
`19`	`19`	`{`
`20`	`20`	`public static function setUpBeforeClass(): void`
`21`	`21`	`{`
`22`		`- if (!class_exists(\PHPUnit_Framework_TestCase::class)) {`
	`22`	`+ if (!class_exists(PHPUnit_Framework_TestCase::class)) {`
`23`	`23`	`self::markTestSkipped('proxy-manager-bridge is not yet compatible with namespaced phpunit versions.');`
`24`	`24`	`}`
`25`	`25`	`$test = new PhpDumperTest();`