refactor(doctrine): make DateFilter standalone, drop AbstractFilter

DateFilter (ORM + ODM) stops extending the deprecated AbstractFilter, the
last of the three 5.0 survivors (after ExistsFilter). It stays a genuine
survivor rather than a ComparisonFilter overlay: its date semantics —
isDateField, \DateTime/\DateTimeImmutable coercion by column immutability,
typed setParameter, and the INCLUDE_NULL_* null-management — are not
expressible through ComparisonFilter.

The decouple is structural: the AbstractFilter::apply() loop is reintroduced
as a local apply() (driving filterProperty over $context['filters'], the
universal value source for both legacy and QueryParameter declarations), and
the inherited helpers (ctor, properties accessors, isPropertyEnabled,
name-converter handling, logger) are inlined. ManagerRegistryAwareInterface
is kept for BC injection and the deprecated getDescription(); the ORM filter
reads class metadata from $queryBuilder->getEntityManager() so the active
path no longer depends on the registry, while ODM keeps it (its aggregation
Builder exposes no DocumentManager).

Author: soyuka

src/Doctrine/Odm/Filter/DateFilter.php

@@ -15,6 +15,11 @@
 
 use ApiPlatform\Doctrine\Common\Filter\DateFilterInterface;
 use ApiPlatform\Doctrine\Common\Filter\DateFilterTrait;
+use ApiPlatform\Doctrine\Common\Filter\ManagerRegistryAwareInterface;
+use ApiPlatform\Doctrine\Common\Filter\ManagerRegistryAwareTrait;
+use ApiPlatform\Doctrine\Common\Filter\NameConverterAwareInterface;
+use ApiPlatform\Doctrine\Common\Filter\PropertyAwareFilterInterface;
+use ApiPlatform\Doctrine\Odm\PropertyHelperTrait as MongoDbOdmPropertyHelperTrait;
 use ApiPlatform\Metadata\Exception\InvalidArgumentException;
 use ApiPlatform\Metadata\JsonSchemaFilterInterface;
 use ApiPlatform\Metadata\OpenApiParameterFilterInterface;
@@ -23,6 +28,10 @@
 use ApiPlatform\Metadata\QueryParameter;
 use ApiPlatform\OpenApi\Model\Parameter as OpenApiParameter;
 use Doctrine\ODM\MongoDB\Aggregation\Builder;
+use Doctrine\Persistence\ManagerRegistry;
+use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
+use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
 
 /**
  * The date filter allows to filter a collection by date intervals.
@@ -120,20 +129,101 @@
  * @author Kévin Dunglas <dunglas@gmail.com>
  * @author Théo FIDRY <theo.fidry@gmail.com>
  * @author Alan Poulain <contact@alanpoulain.eu>
- *
- * @deprecated since API Platform 4.4: extending {@see AbstractFilter} is deprecated. In 5.0 this filter is rewritten as a standalone overlay over {@see ComparisonFilter} (translating the `[before]`/`[strictly_before]`/`[after]`/`[strictly_after]` syntax) — same class name, same URL syntax, drop-in. Declare it through a QueryParameter to migrate.
  */
-final class DateFilter extends AbstractFilter implements DateFilterInterface, JsonSchemaFilterInterface, OpenApiParameterFilterInterface
+final class DateFilter implements DateFilterInterface, FilterInterface, JsonSchemaFilterInterface, ManagerRegistryAwareInterface, NameConverterAwareInterface, OpenApiParameterFilterInterface, PropertyAwareFilterInterface
 {
     use DateFilterTrait;
+    use ManagerRegistryAwareTrait;
+    use MongoDbOdmPropertyHelperTrait;
 
     public const DOCTRINE_DATE_TYPES = [
         'date' => true,
         'date_immutable' => true,
     ];
 
+    private LoggerInterface $logger;
+
+    /**
+     * @param array<string, mixed>|null $properties
+     */
+    public function __construct(?ManagerRegistry $managerRegistry = null, ?LoggerInterface $logger = null, private ?array $properties = null, private ?NameConverterInterface $nameConverter = null)
+    {
+        $this->managerRegistry = $managerRegistry;
+        $this->logger = $logger ?? new NullLogger();
+    }
+
+    public function apply(Builder $aggregationBuilder, string $resourceClass, ?Operation $operation = null, array &$context = []): void
+    {
+        foreach ($context['filters'] ?? [] as $property => $value) {
+            $this->filterProperty($this->denormalizePropertyName($property), $value, $aggregationBuilder, $resourceClass, $operation, $context);
+        }
+    }
+
+    public function getProperties(): ?array
+    {
+        return $this->properties;
+    }
+
+    /**
+     * @param array<string, mixed> $properties
+     */
+    public function setProperties(array $properties): void
+    {
+        $this->properties = $properties;
+    }
+
+    public function hasNameConverter(): bool
+    {
+        return $this->nameConverter instanceof NameConverterInterface;
+    }
+
+    public function getNameConverter(): ?NameConverterInterface
+    {
+        return $this->nameConverter;
+    }
+
+    public function setNameConverter(NameConverterInterface $nameConverter): void
+    {
+        $this->nameConverter = $nameConverter;
+    }
+
+    protected function getLogger(): LoggerInterface
+    {
+        return $this->logger;
+    }
+
+    protected function isPropertyEnabled(string $property, string $resourceClass): bool
+    {
+        if (null === $this->properties) {
+            // to ensure sanity, nested properties must still be explicitly enabled
+            return !$this->isPropertyNested($property, $resourceClass);
+        }
+
+        return \array_key_exists($property, $this->properties);
+    }
+
+    protected function denormalizePropertyName(string|int $property): string
+    {
+        if (!$this->nameConverter instanceof NameConverterInterface) {
+            return (string) $property;
+        }
+
+        return implode('.', array_map($this->nameConverter->denormalize(...), explode('.', (string) $property)));
+    }
+
+    protected function normalizePropertyName(string $property): string
+    {
+        if (!$this->nameConverter instanceof NameConverterInterface) {
+            return $property;
+        }
+
+        return implode('.', array_map($this->nameConverter->normalize(...), explode('.', $property)));
+    }
+
     /**
-     * {@inheritdoc}
+     * @param array<string, mixed> $context
+     *
+     * @param-out array<string, mixed> $context
      */
     protected function filterProperty(string $property, mixed $value, Builder $aggregationBuilder, string $resourceClass, ?Operation $operation = null, array &$context = []): void
     {

src/Doctrine/Odm/Filter/ExistsFilter.php

@@ -215,7 +215,9 @@ public function apply(Builder $aggregationBuilder, string $resourceClass, ?Opera
     }
 
     /**
-     * {@inheritdoc}
+     * @param array<string, mixed> $context
+     *
+     * @param-out array<string, mixed> $context
      */
     protected function filterProperty(string $property, mixed $value, Builder $aggregationBuilder, string $resourceClass, ?Operation $operation = null, array &$context = []): void
     {

src/Doctrine/Orm/Filter/DateFilter.php

@@ -15,6 +15,11 @@
 
 use ApiPlatform\Doctrine\Common\Filter\DateFilterInterface;
 use ApiPlatform\Doctrine\Common\Filter\DateFilterTrait;
+use ApiPlatform\Doctrine\Common\Filter\ManagerRegistryAwareInterface;
+use ApiPlatform\Doctrine\Common\Filter\ManagerRegistryAwareTrait;
+use ApiPlatform\Doctrine\Common\Filter\NameConverterAwareInterface;
+use ApiPlatform\Doctrine\Common\Filter\PropertyAwareFilterInterface;
+use ApiPlatform\Doctrine\Orm\Util\QueryBuilderHelper;
 use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface;
 use ApiPlatform\Metadata\Exception\InvalidArgumentException;
 use ApiPlatform\Metadata\JsonSchemaFilterInterface;
@@ -25,8 +30,15 @@
 use ApiPlatform\OpenApi\Model\Parameter as OpenApiParameter;
 use Doctrine\DBAL\Types\Type as DBALType;
 use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
+use Doctrine\Persistence\ManagerRegistry;
+use Doctrine\Persistence\Mapping\ClassMetadata as LegacyClassMetadata;
+use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
+use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
 
 /**
  * The date filter allows to filter a collection by date intervals.
@@ -124,12 +136,11 @@
  *
  * @author Kévin Dunglas <dunglas@gmail.com>
  * @author Théo FIDRY <theo.fidry@gmail.com>
- *
- * @deprecated since API Platform 4.4: extending {@see AbstractFilter} is deprecated. In 5.0 this filter is rewritten as a standalone overlay over {@see ComparisonFilter} (translating the `[before]`/`[strictly_before]`/`[after]`/`[strictly_after]` syntax) — same class name, same URL syntax, drop-in. Declare it through a QueryParameter to migrate.
  */
-final class DateFilter extends AbstractFilter implements DateFilterInterface, JsonSchemaFilterInterface, OpenApiParameterFilterInterface
+final class DateFilter implements DateFilterInterface, FilterInterface, JsonSchemaFilterInterface, ManagerRegistryAwareInterface, NameConverterAwareInterface, OpenApiParameterFilterInterface, PropertyAwareFilterInterface
 {
     use DateFilterTrait;
+    use ManagerRegistryAwareTrait;
 
     public const DOCTRINE_DATE_TYPES = [
         Types::DATE_MUTABLE => true,
@@ -142,6 +153,129 @@ final class DateFilter extends AbstractFilter implements DateFilterInterface, Js
         Types::TIME_IMMUTABLE => true,
     ];
 
+    private LoggerInterface $logger;
+
+    /**
+     * Resolved from the QueryBuilder in apply(); metadata is read from it so the active filter path
+     * never touches the injected ManagerRegistry (kept only for the deprecated getDescription() and
+     * for BC injection through ManagerRegistryAwareInterface).
+     */
+    private ?EntityManagerInterface $entityManager = null;
+
+    /**
+     * @param array<string, mixed>|null $properties
+     */
+    public function __construct(?ManagerRegistry $managerRegistry = null, ?LoggerInterface $logger = null, private ?array $properties = null, private ?NameConverterInterface $nameConverter = null)
+    {
+        $this->managerRegistry = $managerRegistry;
+        $this->logger = $logger ?? new NullLogger();
+    }
+
+    public function apply(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $resourceClass, ?Operation $operation = null, array $context = []): void
+    {
+        $this->entityManager = $queryBuilder->getEntityManager();
+
+        foreach ($context['filters'] ?? [] as $property => $value) {
+            $this->filterProperty($this->denormalizePropertyName($property), $value, $queryBuilder, $queryNameGenerator, $resourceClass, $operation, $context);
+        }
+    }
+
+    public function getProperties(): ?array
+    {
+        return $this->properties;
+    }
+
+    /**
+     * @param array<string, mixed> $properties
+     */
+    public function setProperties(array $properties): void
+    {
+        $this->properties = $properties;
+    }
+
+    public function hasNameConverter(): bool
+    {
+        return $this->nameConverter instanceof NameConverterInterface;
+    }
+
+    public function getNameConverter(): ?NameConverterInterface
+    {
+        return $this->nameConverter;
+    }
+
+    public function setNameConverter(NameConverterInterface $nameConverter): void
+    {
+        $this->nameConverter = $nameConverter;
+    }
+
+    protected function getLogger(): LoggerInterface
+    {
+        return $this->logger;
+    }
+
+    protected function isPropertyEnabled(string $property, string $resourceClass): bool
+    {
+        if (null === $this->properties) {
+            // to ensure sanity, nested properties must still be explicitly enabled
+            return !$this->isPropertyNested($property, $resourceClass);
+        }
+
+        return \array_key_exists($property, $this->properties);
+    }
+
+    protected function denormalizePropertyName(string|int $property): string
+    {
+        if (!$this->nameConverter instanceof NameConverterInterface) {
+            return (string) $property;
+        }
+
+        return implode('.', array_map($this->nameConverter->denormalize(...), explode('.', (string) $property)));
+    }
+
+    protected function normalizePropertyName(string $property): string
+    {
+        if (!$this->nameConverter instanceof NameConverterInterface) {
+            return $property;
+        }
+
+        return implode('.', array_map($this->nameConverter->normalize(...), explode('.', $property)));
+    }
+
+    protected function getClassMetadata(string $resourceClass): LegacyClassMetadata
+    {
+        if ($this->entityManager instanceof EntityManagerInterface) {
+            return $this->entityManager->getClassMetadata($resourceClass);
+        }
+
+        // Legacy getDescription() runs without a QueryBuilder: fall back to the injected registry.
+        if ($this->hasManagerRegistry() && ($manager = $this->getManagerRegistry()->getManagerForClass($resourceClass))) {
+            return $manager->getClassMetadata($resourceClass);
+        }
+
+        return new ClassMetadata($resourceClass);
+    }
+
+    /**
+     * @return array{0: string, 1: string, 2: string[]}
+     */
+    protected function addJoinsForNestedProperty(string $property, string $rootAlias, QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $resourceClass, string $joinType): array
+    {
+        $propertyParts = $this->splitPropertyParts($property, $resourceClass);
+        $parentAlias = $rootAlias;
+        $alias = null;
+
+        foreach ($propertyParts['associations'] as $association) {
+            $alias = QueryBuilderHelper::addJoinOnce($queryBuilder, $queryNameGenerator, $parentAlias, $association, $joinType);
+            $parentAlias = $alias;
+        }
+
+        if (null === $alias) {
+            throw new InvalidArgumentException(\sprintf('Cannot add joins for property "%s" - property is not nested.', $property));
+        }
+
+        return [$alias, $propertyParts['field'], $propertyParts['associations']];
+    }
+
     /**
      * {@inheritdoc}
      */

tests/Functional/Parameters/DateFilterTest.php

@@ -13,6 +13,8 @@
 
 namespace ApiPlatform\Tests\Functional\Parameters;
 
+use ApiPlatform\Doctrine\Orm\Filter\AbstractFilter;
+use ApiPlatform\Doctrine\Orm\Filter\DateFilter;
 use ApiPlatform\Symfony\Bundle\Test\ApiTestCase;
 use ApiPlatform\Tests\Fixtures\TestBundle\Document\FilteredDateParameter as FilteredDateParameterDocument;
 use ApiPlatform\Tests\Fixtures\TestBundle\Entity\FilteredDateParameter;
@@ -36,6 +38,15 @@ public static function getResources(): array
         return [FilteredDateParameter::class];
     }
 
+    public function testDateFilterIsStandalone(): void
+    {
+        self::assertNotContains(
+            AbstractFilter::class,
+            class_parents(DateFilter::class) ?: [],
+            'DateFilter must not extend the deprecated AbstractFilter (5.0 standalone rewrite).'
+        );
+    }
+
     /**
      * @throws \Throwable
      */

tests/Functional/Parameters/ExistsFilterTest.php

@@ -54,8 +54,9 @@ protected function setUp(): void
 
     public function testExistsFilterIsStandalone(): void
     {
-        self::assertFalse(
-            is_subclass_of(ExistsFilter::class, AbstractFilter::class),
+        self::assertNotContains(
+            AbstractFilter::class,
+            class_parents(ExistsFilter::class) ?: [],
             'ExistsFilter must not extend the deprecated AbstractFilter (5.0 standalone rewrite).'
         );
     }