Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: If it's a JoinColumnMapping, use property access #6216

Merged
merged 1 commit into from Apr 16, 2024
+9 −3
Merged

fix: If it's a JoinColumnMapping, use property access #6216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/Field/Configurator/CommonPreConfigurator.php
View file
Open in desktop
Expand Up @@ -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;
Expand Down Expand Up @@ -198,11 +199,16 @@ 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 ($joinColumn instanceof JoinColumnMapping) {
$isNullable = $joinColumn->nullable ?? true;
} else {
$isNullable = $joinColumn['nullable'] ?? true;
}
if (false === $isNullable) {
return true;
}
} else {
$propertyNameInAssociatedEntity = $joinColumn['referencedColumnName'];
$propertyNameInAssociatedEntity = $joinColumn instanceof JoinColumnMapping ? $joinColumn->referencedColumnName : $joinColumn['referencedColumnName'];
$associatedPropertyMetadata = $associatedEntityMetadata->fieldMappings[$propertyNameInAssociatedEntity] ?? [];
$isNullable = $associatedPropertyMetadata['nullable'] ?? true;

Expand Down
2 changes: 1 addition & 1 deletion src/Filter/Configurator/EntityConfigurator.php
View file
Open in desktop
Expand Up @@ -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 ?? false : $joinColumn['nullable'] ?? false)))
);

$someJoinColumnsAreNullable = \count($doctrineMetadata->get('joinColumns')) !== $numberOfRequiredJoinColumns;
Expand Down