diff --git a/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php b/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php
index 0cfdc8768c9fe..651ff3e96c79d 100644
--- a/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php
+++ b/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php
@@ -110,10 +110,24 @@ public function getTypes($class, $property, array $context = [])
$associationMapping = $metadata->getAssociationMapping($property);
if (isset($associationMapping['indexBy'])) {
- $indexColumn = $associationMapping['indexBy'];
/** @var ClassMetadataInfo $subMetadata */
$subMetadata = $this->classMetadataFactory->getMetadataFor($associationMapping['targetEntity']);
- $typeOfField = $subMetadata->getTypeOfField($subMetadata->getFieldForColumn($indexColumn));
+
+ // Check if indexBy value is a property
+ $fieldName = $associationMapping['indexBy'];
+ if (null === ($typeOfField = $subMetadata->getTypeOfField($fieldName))) {
+ $fieldName = $subMetadata->getFieldForColumn($associationMapping['indexBy']);
+ //Not a property, maybe a column name?
+ if (null === ($typeOfField = $subMetadata->getTypeOfField($fieldName))) {
+ //Maybe the column name is the association join column?
+ $associationMapping = $subMetadata->getAssociationMapping($fieldName);
+
+ /** @var ClassMetadataInfo $subMetadata */
+ $indexProperty = $subMetadata->getSingleAssociationReferencedJoinColumnName($fieldName);
+ $subMetadata = $this->classMetadataFactory->getMetadataFor($associationMapping['targetEntity']);
+ $typeOfField = $subMetadata->getTypeOfField($indexProperty);
+ }
+ }
if (!$collectionKeyType = $this->getPhpType($typeOfField)) {
return null;
diff --git a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php
index b9abd03347e83..98d64cefd77e9 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php
@@ -72,10 +72,13 @@ public function testGetProperties()
$expected = array_merge($expected, [
'foo',
'bar',
+ 'indexedRguid',
'indexedBar',
'indexedFoo',
+ 'indexedBaz',
'indexedByDt',
'indexedByCustomType',
+ 'indexedBuz',
]);
$this->assertEquals(
@@ -151,6 +154,14 @@ public function typesProvider()
new Type(Type::BUILTIN_TYPE_INT),
new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\DoctrineRelation')
)]],
+ ['indexedRguid', [new Type(
+ Type::BUILTIN_TYPE_OBJECT,
+ false,
+ 'Doctrine\Common\Collections\Collection',
+ true,
+ new Type(Type::BUILTIN_TYPE_STRING),
+ new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\DoctrineRelation')
+ )]],
['indexedBar', [new Type(
Type::BUILTIN_TYPE_OBJECT,
false,
@@ -167,6 +178,14 @@ public function typesProvider()
new Type(Type::BUILTIN_TYPE_STRING),
new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\DoctrineRelation')
)]],
+ ['indexedBaz', [new Type(
+ Type::BUILTIN_TYPE_OBJECT,
+ false,
+ Collection::class,
+ true,
+ new Type(Type::BUILTIN_TYPE_INT),
+ new Type(Type::BUILTIN_TYPE_OBJECT, false, DoctrineRelation::class)
+ )]],
['simpleArray', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_STRING))]],
['customFoo', null],
['notMapped', null],
@@ -179,6 +198,14 @@ public function typesProvider()
new Type(Type::BUILTIN_TYPE_OBJECT, false, DoctrineRelation::class)
)]],
['indexedByCustomType', null],
+ ['indexedBuz', [new Type(
+ Type::BUILTIN_TYPE_OBJECT,
+ false,
+ Collection::class,
+ true,
+ new Type(Type::BUILTIN_TYPE_STRING),
+ new Type(Type::BUILTIN_TYPE_OBJECT, false, DoctrineRelation::class)
+ )]],
];
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
index 568efce33d382..a065dc49cd2d4 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineDummy.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineDummy.php
@@ -41,6 +41,11 @@ class DoctrineDummy
*/
public $bar;
+ /**
+ * @ManyToMany(targetEntity="DoctrineRelation", indexBy="rguid")
+ */
+ protected $indexedRguid;
+
/**
* @ManyToMany(targetEntity="DoctrineRelation", indexBy="rguid_column")
*/
@@ -51,6 +56,11 @@ class DoctrineDummy
*/
protected $indexedFoo;
+ /**
+ * @OneToMany(targetEntity="DoctrineRelation", mappedBy="baz", indexBy="baz_id")
+ */
+ protected $indexedBaz;
+
/**
* @Column(type="guid")
*/
@@ -122,4 +132,9 @@ class DoctrineDummy
* @OneToMany(targetEntity="DoctrineRelation", mappedBy="customType", indexBy="customType")
*/
private $indexedByCustomType;
+
+ /**
+ * @OneToMany(targetEntity="DoctrineRelation", mappedBy="buzField", indexBy="buzField")
+ */
+ protected $indexedBuz;
}
diff --git a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineRelation.php b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineRelation.php
index e480ca9d777ba..d6d9af6d70c38 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineRelation.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineRelation.php
@@ -40,6 +40,11 @@ class DoctrineRelation
*/
protected $foo;
+ /**
+ * @ManyToOne(targetEntity="DoctrineDummy")
+ */
+ protected $baz;
+
/**
* @Column(type="datetime")
*/
@@ -49,4 +54,10 @@ class DoctrineRelation
* @Column(type="foo")
*/
private $customType;
+
+ /**
+ * @Column(type="guid", name="different_than_field")
+ * @ManyToOne(targetEntity="DoctrineDummy", inversedBy="indexedBuz")
+ */
+ protected $buzField;
}
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy