Skip to content

Fix property access for field mapping type #7223

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

Draft
Chris53897 wants to merge 7 commits into
base: 4.x
Choose a base branch
from
Draft

Fix property access for field mapping type #7223

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
717ab59
Fix property access for field mapping type
Chris53897 Nov 8, 2025
967c0d2
feat: bump min version doctrine/orm
Chris8934 Nov 8, 2025
125f6dc
feat: explicit set doctrine/persistence
Chris8934 Nov 8, 2025
1092ab3
feat: explicit set doctrine/lexer
Chris8934 Nov 8, 2025
ec260c4
feat: explicit set doctrine/lexer
Chris8934 Nov 8, 2025
0659dfe
feat: check orm version
Chris8934 Nov 8, 2025
09fc65e
feat: check orm version
Chris8934 Nov 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/Factory/FilterFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace EasyCorp\Bundle\EasyAdminBundle\Factory;

use Composer\InstalledVersions;
use Doctrine\DBAL\Types\Types;
use EasyCorp\Bundle\EasyAdminBundle\Collection\FieldCollection;
use EasyCorp\Bundle\EasyAdminBundle\Collection\FilterCollection;
Expand Down Expand Up @@ -105,6 +106,12 @@ private function guessFilterClass(EntityDto $entityDto, string $propertyName): s

$fieldMapping = $entityDto->getClassMetadata()->getFieldMapping($propertyName);

return self::$doctrineTypeToFilterClass[$fieldMapping['type']] ?? TextFilter::class;
if (version_compare(InstalledVersions::getVersion('doctrine/orm'), '3.0', '<')) {
Copy link
Copy Markdown
Collaborator

@javiereguiluz javiereguiluz Nov 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the fix we use in other parts of the code:

EasyAdminBundle/src/Orm/EntityRepository.php

Lines 301 to 310 in e373893

// In Doctrine ORM 3.x, FieldMapping implements \ArrayAccess; in 4.x it's an object with properties
$fieldMapping = $associatedEntityDto->getClassMetadata()->getFieldMapping($propertyName);
// In Doctrine ORM 2.x, getFieldMapping() returns an array
/** @phpstan-ignore-next-line function.impossibleType */
if (\is_array($fieldMapping)) {
/** @phpstan-ignore-next-line cast.useless */
$fieldMapping = (object) $fieldMapping;
}
/** @phpstan-ignore-next-line function.alreadyNarrowedType */
$propertyDataType = property_exists($fieldMapping, 'type') ? $fieldMapping->type : $fieldMapping['type'];

It's a bit convoluted 😐 but it covers Doctrine ORM 2.x, 3.x and 4.x.

$index = $fieldMapping['type'];
} else {
$index = $fieldMapping->type;
}

return self::$doctrineTypeToFilterClass[$index] ?? TextFilter::class;
}
}