fix: If it's a join column, use property access

EasyCorp · Mar 20, 2024 · 842e21b · 842e21b
1 parent f63e526
commit 842e21b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/Field/Configurator/CommonPreConfigurator.php b/src/Field/Configurator/CommonPreConfigurator.php
@@ -2,6 +2,7 @@
 
 namespace EasyCorp\Bundle\EasyAdminBundle\Field\Configurator;
 
+use Doctrine\ORM\Mapping\JoinColumnMapping;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Action;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Crud;
 use EasyCorp\Bundle\EasyAdminBundle\Context\AdminContext;
@@ -198,11 +199,11 @@ private function buildRequiredOption(FieldDto $field, EntityDto $entityDto): boo
             $associatedEntityMetadata = $this->entityFactory->getEntityMetadata($doctrinePropertyMetadata->get('targetEntity'));
             foreach ($doctrinePropertyMetadata->get('joinColumns', []) as $joinColumn) {
                 if (true === $doctrinePropertyMetadata->get('isOwningSide', true)) {
-                    if (false === ($joinColumn['nullable'] ?? true)) {
+                    if (false === (($joinColumn instanceof JoinColumnMapping ? $joinColumn->nullable : $joinColumn['nullable']) ?? true)) {
                         return true;
                     }
                 } else {
-                    $propertyNameInAssociatedEntity = $joinColumn['referencedColumnName'];
+                    $propertyNameInAssociatedEntity = $joinColumn instanceof JoinColumnMapping ? $joinColumn->referencedColumnName : $joinColumn['referencedColumnName'];
                     $associatedPropertyMetadata = $associatedEntityMetadata->fieldMappings[$propertyNameInAssociatedEntity] ?? [];
                     $isNullable = $associatedPropertyMetadata['nullable'] ?? true;
 

diff --git a/src/Filter/Configurator/EntityConfigurator.php b/src/Filter/Configurator/EntityConfigurator.php
@@ -40,7 +40,7 @@ public function configure(FilterDto $filterDto, ?FieldDto $fieldDto, EntityDto $
             $numberOfRequiredJoinColumns = \count(array_filter(
                 $doctrineMetadata->get('joinColumns'),
                 // Doctrine ORM 3.x changed the returned type from array to JoinColumnMapping
-                static fn (array|JoinColumnMapping $joinColumn): bool => false === ($joinColumn['nullable'] ?? false))
+                static fn (array|JoinColumnMapping $joinColumn): bool => false === (($joinColumn instanceof JoinColumnMapping ? $joinColumn->nullable : $joinColumn['nullable']) ?? false))
             );
 
             $someJoinColumnsAreNullable = \count($doctrineMetadata->get('joinColumns')) !== $numberOfRequiredJoinColumns;