fix mapping objects vs arrays

sonata-project · Feb 24, 2024 · ee1aee2 · ee1aee2
1 parent fe87bbf
commit ee1aee2
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/FieldDescription/FieldDescriptionFactory.php b/src/FieldDescription/FieldDescriptionFactory.php
@@ -14,6 +14,7 @@
 namespace Sonata\DoctrineORMAdminBundle\FieldDescription;
 
 use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Mapping\AssociationMapping;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Sonata\AdminBundle\FieldDescription\FieldDescriptionFactoryInterface;
 use Sonata\AdminBundle\FieldDescription\FieldDescriptionInterface;
@@ -29,11 +30,19 @@ public function create(string $class, string $name, array $options = []): FieldD
     {
         [$metadata, $propertyName, $parentAssociationMappings] = $this->getParentMetadataForProperty($class, $name);
 
+        $associationMapping = $metadata->associationMappings[$propertyName] ?? [];
+
+        if ($associationMapping instanceof AssociationMapping) {
+            $associationMappingType = $associationMapping->type();
+            $associationMapping = (array) $associationMapping;
+            $associationMapping['type'] = $associationMappingType;
+        }
+
         return new FieldDescription(
             $name,
             $options,
-            $metadata->fieldMappings[$propertyName] ?? [],
-            $metadata->associationMappings[$propertyName] ?? [],
+            (array) ($metadata->fieldMappings[$propertyName] ?? []),
+            $associationMapping,
             $parentAssociationMappings,
             $propertyName
         );