#2260 support "targetEntity" extraction from property type for Doctri…

…ne relations
Haehnchen · Apr 17, 2024 · 157cc56 · 157cc56
1 parent 7a38bc3
commit 157cc56
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/...rault/idea/symfony2plugin/doctrine/metadata/driver/DoctrinePhpAttributeMappingDriver.java b/...rault/idea/symfony2plugin/doctrine/metadata/driver/DoctrinePhpAttributeMappingDriver.java
@@ -2,9 +2,7 @@
 
 import com.intellij.psi.PsiFile;
 import com.jetbrains.php.lang.psi.PhpFile;
-import com.jetbrains.php.lang.psi.elements.Field;
-import com.jetbrains.php.lang.psi.elements.PhpAttribute;
-import com.jetbrains.php.lang.psi.elements.PhpClass;
+import com.jetbrains.php.lang.psi.elements.*;
 import fr.adrienbrault.idea.symfony2plugin.doctrine.dict.DoctrineModelField;
 import fr.adrienbrault.idea.symfony2plugin.doctrine.metadata.dict.DoctrineMetadataModel;
 import fr.adrienbrault.idea.symfony2plugin.util.PhpElementsUtil;
@@ -93,6 +91,20 @@ public DoctrineMetadataModel getMetadata(@NotNull DoctrineMappingDriverArguments
                         String targetEntity = PhpElementsUtil.getAttributeArgumentStringByName(attribute, "targetEntity");
                         if (StringUtils.isNotBlank(targetEntity)) {
                             doctrineModelField.setRelation("\\" + StringUtils.stripStart(targetEntity, "\\"));
+                        } else {
+                            PhpTypeDeclaration typeDeclaration = field.getTypeDeclaration();
+                            if (typeDeclaration != null) {
+                                Collection<ClassReference> classReferences = typeDeclaration.getClassReferences().stream()
+                                    .filter(classReference -> !"null".equals(classReference.getCanonicalText()))
+                                    .toList();
+
+                                if (!classReferences.isEmpty()) {
+                                    String fqnClass = classReferences.iterator().next().getFQN();
+                                    if (fqnClass != null) {
+                                        doctrineModelField.setRelation(fqnClass);
+                                    }
+                                }
+                            }
                         }
                     }
                 }

diff --git a/.../symfony2plugin/tests/doctrine/metadata/driver/DoctrinePhpAttributeMappingDriverTest.java b/.../symfony2plugin/tests/doctrine/metadata/driver/DoctrinePhpAttributeMappingDriverTest.java
@@ -53,6 +53,9 @@ public void testPhpAttributesMetadata() {
 
         assertEquals("\\ORM\\Foobar\\Egg", metadata.getField("eggClassStringBackslashless").getRelation());
         assertEquals("ManyToMany", metadata.getField("eggClassStringBackslashless").getRelationType());
+
+        assertEquals("\\ORM\\Foobar\\Egg", metadata.getField("eggTargetEntity").getRelation());
+        assertEquals("ManyToMany", metadata.getField("eggTargetEntity").getRelationType());
     }
 
     private DoctrineMetadataModel createOrmMetadata() {

diff --git a/...r/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/driver/fixtures/attributes.php b/...r/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/driver/fixtures/attributes.php
@@ -57,5 +57,8 @@ class AttributeEntity {
 
         #[ORM\ManyToMany(targetEntity: 'ORM\Foobar\Egg')]
         public $eggClassStringBackslashless;
+
+        #[ORM\ManyToMany]
+        public null|Egg $eggTargetEntity;
     };
 }