api-platform · soyuka · Apr 23, 2025 · Apr 22, 2025
diff --git a/src/Doctrine/Odm/Metadata/Resource/DoctrineMongoDbOdmResourceCollectionMetadataFactory.php b/src/Doctrine/Odm/Metadata/Resource/DoctrineMongoDbOdmResourceCollectionMetadataFactory.php
@@ -22,11 +22,14 @@
 use ApiPlatform\Metadata\Operation;
 use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
 use ApiPlatform\Metadata\Resource\ResourceMetadataCollection;
+use ApiPlatform\State\Util\StateOptionsTrait;
 use Doctrine\ODM\MongoDB\DocumentManager;
 use Doctrine\Persistence\ManagerRegistry;
 
 final class DoctrineMongoDbOdmResourceCollectionMetadataFactory implements ResourceMetadataCollectionFactoryInterface
 {
+    use StateOptionsTrait;
+
     public function __construct(private readonly ManagerRegistry $managerRegistry, private readonly ResourceMetadataCollectionFactoryInterface $decorated)
     {
     }
@@ -45,11 +48,7 @@ public function create(string $resourceClass): ResourceMetadataCollection
             if ($operations) {
                 /** @var Operation $operation */
                 foreach ($resourceMetadata->getOperations() as $operationName => $operation) {
-                    $documentClass = $operation->getClass();
-                    if (($options = $operation->getStateOptions()) && $options instanceof Options && $options->getDocumentClass()) {
-                        $documentClass = $options->getDocumentClass();
-                    }
-
+                    $documentClass = $this->getStateOptionsClass($operation, $operation->getClass(), Options::class);
                     if (!$this->managerRegistry->getManagerForClass($documentClass) instanceof DocumentManager) {
                         continue;
                     }

diff --git a/src/Doctrine/Odm/State/CollectionProvider.php b/src/Doctrine/Odm/State/CollectionProvider.php
@@ -20,6 +20,7 @@
 use ApiPlatform\Metadata\Operation;
 use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
 use ApiPlatform\State\ProviderInterface;
+use ApiPlatform\State\Util\StateOptionsTrait;
 use Doctrine\ODM\MongoDB\DocumentManager;
 use Doctrine\ODM\MongoDB\Repository\DocumentRepository;
 use Doctrine\Persistence\ManagerRegistry;
@@ -32,6 +33,7 @@ final class CollectionProvider implements ProviderInterface
 {
     use LinksHandlerLocatorTrait;
     use LinksHandlerTrait;
+    use StateOptionsTrait;
 
     /**
      * @param AggregationCollectionExtensionInterface[] $collectionExtensions
@@ -45,10 +47,7 @@ public function __construct(ResourceMetadataCollectionFactoryInterface $resource
 
     public function provide(Operation $operation, array $uriVariables = [], array $context = []): iterable
     {
-        $documentClass = $operation->getClass();
-        if (($options = $operation->getStateOptions()) && $options instanceof Options && $options->getDocumentClass()) {
-            $documentClass = $options->getDocumentClass();
-        }
+        $documentClass = $this->getStateOptionsClass($operation, $operation->getClass(), Options::class);
 
         /** @var DocumentManager $manager */
         $manager = $this->managerRegistry->getManagerForClass($documentClass);

diff --git a/src/Doctrine/Odm/State/ItemProvider.php b/src/Doctrine/Odm/State/ItemProvider.php
@@ -20,6 +20,7 @@
 use ApiPlatform\Metadata\Operation;
 use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
 use ApiPlatform\State\ProviderInterface;
+use ApiPlatform\State\Util\StateOptionsTrait;
 use Doctrine\ODM\MongoDB\DocumentManager;
 use Doctrine\ODM\MongoDB\Repository\DocumentRepository;
 use Doctrine\Persistence\ManagerRegistry;
@@ -35,6 +36,7 @@ final class ItemProvider implements ProviderInterface
 {
     use LinksHandlerLocatorTrait;
     use LinksHandlerTrait;
+    use StateOptionsTrait;
 
     /**
      * @param AggregationItemExtensionInterface[] $itemExtensions
@@ -48,10 +50,7 @@ public function __construct(ResourceMetadataCollectionFactoryInterface $resource
 
     public function provide(Operation $operation, array $uriVariables = [], array $context = []): ?object
     {
-        $documentClass = $operation->getClass();
-        if (($options = $operation->getStateOptions()) && $options instanceof Options && $options->getDocumentClass()) {
-            $documentClass = $options->getDocumentClass();
-        }
+        $documentClass = $this->getStateOptionsClass($operation, $operation->getClass(), Options::class);
 
         /** @var DocumentManager $manager */
         $manager = $this->managerRegistry->getManagerForClass($documentClass);

diff --git a/src/Doctrine/Odm/State/LinksHandlerTrait.php b/src/Doctrine/Odm/State/LinksHandlerTrait.php
@@ -17,6 +17,7 @@
 use ApiPlatform\Metadata\Exception\RuntimeException;
 use ApiPlatform\Metadata\Link;
 use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\Util\StateOptionsTrait;
 use Doctrine\ODM\MongoDB\Aggregation\Builder;
 use Doctrine\ODM\MongoDB\DocumentManager;
 use Doctrine\ODM\MongoDB\Mapping\ClassMetadata;
@@ -28,6 +29,7 @@
 trait LinksHandlerTrait
 {
     use CommonLinksHandlerTrait;
+    use StateOptionsTrait;
 
     private ManagerRegistry $managerRegistry;
 
@@ -142,26 +144,18 @@ private function buildAggregation(string $toClass, array $links, array $identifi
 
     private function getLinkFromClass(Link $link, Operation $operation): string
     {
+        $documentClass = $this->getStateOptionsClass($operation, $operation->getClass(), Options::class);
         $fromClass = $link->getFromClass();
-        if ($fromClass === $operation->getClass() && $documentClass = $this->getStateOptionsDocumentClass($operation)) {
+        if ($fromClass === $operation->getClass() && $documentClass) {
             return $documentClass;
         }
 
         $operation = $this->resourceMetadataCollectionFactory->create($fromClass)->getOperation();
 
-        if ($documentClass = $this->getStateOptionsDocumentClass($operation)) {
+        if ($documentClass = $this->getStateOptionsClass($operation, null, Options::class)) {
             return $documentClass;
         }
 
         throw new \Exception('Can not found a doctrine class for this link.');
     }
-
-    private function getStateOptionsDocumentClass(Operation $operation): ?string
-    {
-        if (($options = $operation->getStateOptions()) && $options instanceof Options && $documentClass = $options->getDocumentClass()) {
-            return $documentClass;
-        }
-
-        return null;
-    }
 }
diff --git a/src/Doctrine/Orm/Metadata/Resource/DoctrineOrmResourceCollectionMetadataFactory.php b/src/Doctrine/Orm/Metadata/Resource/DoctrineOrmResourceCollectionMetadataFactory.php
@@ -22,11 +22,14 @@
 use ApiPlatform\Metadata\Operation;
 use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
 use ApiPlatform\Metadata\Resource\ResourceMetadataCollection;
+use ApiPlatform\State\Util\StateOptionsTrait;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\Persistence\ManagerRegistry;
 
 final class DoctrineOrmResourceCollectionMetadataFactory implements ResourceMetadataCollectionFactoryInterface
 {
+    use StateOptionsTrait;
+
     public function __construct(private readonly ManagerRegistry $managerRegistry, private readonly ResourceMetadataCollectionFactoryInterface $decorated)
     {
     }
@@ -45,10 +48,7 @@ public function create(string $resourceClass): ResourceMetadataCollection
             if ($operations) {
                 /** @var Operation $operation */
                 foreach ($resourceMetadata->getOperations() as $operationName => $operation) {
-                    $entityClass = $operation->getClass();
-                    if (($options = $operation->getStateOptions()) && $options instanceof Options && $options->getEntityClass()) {
-                        $entityClass = $options->getEntityClass();
-                    }
+                    $entityClass = $this->getStateOptionsClass($operation, $operation->getClass(), Options::class);
 
                     if (!$this->managerRegistry->getManagerForClass($entityClass) instanceof EntityManagerInterface) {
                         continue;
@@ -64,10 +64,7 @@ public function create(string $resourceClass): ResourceMetadataCollection
 
             if ($graphQlOperations) {
                 foreach ($graphQlOperations as $operationName => $graphQlOperation) {
-                    $entityClass = $graphQlOperation->getClass();
-                    if (($options = $graphQlOperation->getStateOptions()) && $options instanceof Options && $options->getEntityClass()) {
-                        $entityClass = $options->getEntityClass();
-                    }
+                    $entityClass = $this->getStateOptionsClass($graphQlOperation, $graphQlOperation->getClass(), Options::class);
 
                     if (!$this->managerRegistry->getManagerForClass($entityClass) instanceof EntityManagerInterface) {
                         continue;

diff --git a/src/Doctrine/Orm/State/CollectionProvider.php b/src/Doctrine/Orm/State/CollectionProvider.php
@@ -21,6 +21,7 @@
 use ApiPlatform\Metadata\Operation;
 use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
 use ApiPlatform\State\ProviderInterface;
+use ApiPlatform\State\Util\StateOptionsTrait;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\Persistence\ManagerRegistry;
 use Psr\Container\ContainerInterface;
@@ -35,6 +36,7 @@ final class CollectionProvider implements ProviderInterface
 {
     use LinksHandlerLocatorTrait;
     use LinksHandlerTrait;
+    use StateOptionsTrait;
 
     /**
      * @param QueryCollectionExtensionInterface[] $collectionExtensions
@@ -48,10 +50,7 @@ public function __construct(ResourceMetadataCollectionFactoryInterface $resource
 
     public function provide(Operation $operation, array $uriVariables = [], array $context = []): iterable
     {
-        $entityClass = $operation->getClass();
-        if (($options = $operation->getStateOptions()) && $options instanceof Options && $options->getEntityClass()) {
-            $entityClass = $options->getEntityClass();
-        }
+        $entityClass = $this->getStateOptionsClass($operation, $operation->getClass(), Options::class);
 
         /** @var EntityManagerInterface $manager */
         $manager = $this->managerRegistry->getManagerForClass($entityClass);

diff --git a/src/Doctrine/Orm/State/ItemProvider.php b/src/Doctrine/Orm/State/ItemProvider.php
@@ -21,6 +21,7 @@
 use ApiPlatform\Metadata\Operation;
 use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
 use ApiPlatform\State\ProviderInterface;
+use ApiPlatform\State\Util\StateOptionsTrait;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\Persistence\ManagerRegistry;
 use Psr\Container\ContainerInterface;
@@ -35,6 +36,7 @@ final class ItemProvider implements ProviderInterface
 {
     use LinksHandlerLocatorTrait;
     use LinksHandlerTrait;
+    use StateOptionsTrait;
 
     /**
      * @param QueryItemExtensionInterface[] $itemExtensions
@@ -48,10 +50,7 @@ public function __construct(ResourceMetadataCollectionFactoryInterface $resource
 
     public function provide(Operation $operation, array $uriVariables = [], array $context = []): ?object
     {
-        $entityClass = $operation->getClass();
-        if (($options = $operation->getStateOptions()) && $options instanceof Options && $options->getEntityClass()) {
-            $entityClass = $options->getEntityClass();
-        }
+        $entityClass = $this->getStateOptionsClass($operation, $operation->getClass(), Options::class);
 
         /** @var EntityManagerInterface|null $manager */
         $manager = $this->managerRegistry->getManagerForClass($entityClass);

diff --git a/src/Doctrine/Orm/State/LinksHandlerTrait.php b/src/Doctrine/Orm/State/LinksHandlerTrait.php
@@ -17,6 +17,7 @@
 use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface;
 use ApiPlatform\Metadata\Link;
 use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\Util\StateOptionsTrait;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ManagerRegistry;
@@ -27,6 +28,7 @@
 trait LinksHandlerTrait
 {
     use CommonLinksHandlerTrait;
+    use StateOptionsTrait;
 
     private ManagerRegistry $managerRegistry;
 
@@ -159,25 +161,12 @@ private function handleLinks(QueryBuilder $queryBuilder, array $identifiers, Que
     private function getLinkFromClass(Link $link, Operation $operation): string
     {
         $fromClass = $link->getFromClass();
-        if ($fromClass === $operation->getClass() && $entityClass = $this->getStateOptionsEntityClass($operation)) {
+        if ($fromClass === $operation->getClass() && $entityClass = $this->getStateOptionsClass($operation, $operation->getClass(), Options::class)) {
             return $entityClass;
         }
 
         $operation = $this->resourceMetadataCollectionFactory->create($fromClass)->getOperation();
 
-        if ($entityClass = $this->getStateOptionsEntityClass($operation)) {
-            return $entityClass;
-        }
-
-        throw new \Exception('Can not found a doctrine class for this link.');
-    }
-
-    private function getStateOptionsEntityClass(Operation $operation): ?string
-    {
-        if (($options = $operation->getStateOptions()) && $options instanceof Options && $entityClass = $options->getEntityClass()) {
-            return $entityClass;
-        }
-
-        return null;
+        return $this->getStateOptionsClass($operation, $operation->getClass(), Options::class);
     }
 }
diff --git a/src/GraphQl/Type/FieldsBuilder.php b/src/GraphQl/Type/FieldsBuilder.php
@@ -13,8 +13,6 @@
 
 namespace ApiPlatform\GraphQl\Type;
 
-use ApiPlatform\Doctrine\Odm\State\Options as ODMOptions;
-use ApiPlatform\Doctrine\Orm\State\Options;
 use ApiPlatform\GraphQl\Exception\InvalidTypeException;
 use ApiPlatform\GraphQl\Resolver\Factory\ResolverFactoryInterface;
 use ApiPlatform\GraphQl\Type\Definition\TypeInterface;
@@ -563,18 +561,7 @@ private function getFilterArgs(array $args, ?string $resourceClass, string $root
                 continue;
             }
 
-            $entityClass = $resourceClass;
-            if ($options = $resourceOperation->getStateOptions()) {
-                if (class_exists(Options::class) && $options instanceof Options && $options->getEntityClass()) {
-                    $entityClass = $options->getEntityClass();
-                }
-
-                if (class_exists(ODMOptions::class) && $options instanceof ODMOptions && $options->getDocumentClass()) {
-                    $entityClass = $options->getDocumentClass();
-                }
-            }
-
-            foreach ($this->filterLocator->get($filterId)->getDescription($entityClass) as $key => $description) {
+            foreach ($this->filterLocator->get($filterId)->getDescription($resourceClass) as $key => $description) {
                 $nullable = isset($description['required']) ? !$description['required'] : true;
                 $filterType = \in_array($description['type'], Type::$builtinTypes, true) ? new Type($description['type'], $nullable) : new Type('object', $nullable, $description['type']);
                 $graphqlFilterType = $this->convertType($filterType, false, $resourceOperation, $rootOperation, $resourceClass, $rootResource, $property, $depth);

diff --git a/src/Hydra/Serializer/CollectionFiltersNormalizer.php b/src/Hydra/Serializer/CollectionFiltersNormalizer.php
@@ -13,14 +13,13 @@
 
 namespace ApiPlatform\Hydra\Serializer;
 
-use ApiPlatform\Doctrine\Odm\State\Options as ODMOptions;
-use ApiPlatform\Doctrine\Orm\State\Options;
 use ApiPlatform\JsonLd\Serializer\HydraPrefixTrait;
 use ApiPlatform\Metadata\FilterInterface;
 use ApiPlatform\Metadata\Parameters;
 use ApiPlatform\Metadata\QueryParameterInterface;
 use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
 use ApiPlatform\Metadata\ResourceClassResolverInterface;
+use ApiPlatform\State\Util\StateOptionsTrait;
 use Psr\Container\ContainerInterface;
 use Symfony\Component\Serializer\Exception\UnexpectedValueException;
 use Symfony\Component\Serializer\Normalizer\AbstractObjectNormalizer;
@@ -35,6 +34,7 @@
 final class CollectionFiltersNormalizer implements NormalizerInterface, NormalizerAwareInterface
 {
     use HydraPrefixTrait;
+    use StateOptionsTrait;
     private ?ContainerInterface $filterLocator = null;
 
     /**
@@ -101,15 +101,7 @@ public function normalize(mixed $object, ?string $format = null, array $context
             }
         }
 
-        if ($options = $operation->getStateOptions()) {
-            if ($options instanceof Options && $options->getEntityClass()) {
-                $resourceClass = $options->getEntityClass();
-            }
-
-            if ($options instanceof ODMOptions && $options->getDocumentClass()) {
-                $resourceClass = $options->getDocumentClass();
-            }
-        }
+        $resourceClass = $this->getStateOptionsClass($operation, $resourceClass);
 
         if ($currentFilters || ($parameters && \count($parameters))) {
             $hydraPrefix = $this->getHydraPrefix($context + $this->defaultContext);

diff --git a/src/Laravel/Eloquent/State/CollectionProvider.php b/src/Laravel/Eloquent/State/CollectionProvider.php
@@ -20,6 +20,7 @@
 use ApiPlatform\Metadata\Operation;
 use ApiPlatform\State\Pagination\Pagination;
 use ApiPlatform\State\ProviderInterface;
+use ApiPlatform\State\Util\StateOptionsTrait;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Psr\Container\ContainerInterface;
@@ -30,7 +31,7 @@
 final class CollectionProvider implements ProviderInterface
 {
     use LinksHandlerLocatorTrait;
-    use ModelClassTrait;
+    use StateOptionsTrait;
 
     /**
      * @param LinksHandlerInterface<Model>      $linksHandler
@@ -47,7 +48,7 @@ public function __construct(
 
     public function provide(Operation $operation, array $uriVariables = [], array $context = []): object|array|null
     {
-        $resourceClass = $this->getModelClass($operation);
+        $resourceClass = $this->getStateOptionsClass($operation, $operation->getClass(), Options::class);
         $model = new $resourceClass();
 
         if (!$model instanceof Model) {

diff --git a/src/Laravel/Eloquent/State/ItemProvider.php b/src/Laravel/Eloquent/State/ItemProvider.php
@@ -17,6 +17,7 @@
 use ApiPlatform\Metadata\Exception\RuntimeException;
 use ApiPlatform\Metadata\Operation;
 use ApiPlatform\State\ProviderInterface;
+use ApiPlatform\State\Util\StateOptionsTrait;
 use Illuminate\Database\Eloquent\Model;
 use Psr\Container\ContainerInterface;
 
@@ -26,7 +27,7 @@
 final class ItemProvider implements ProviderInterface
 {
     use LinksHandlerLocatorTrait;
-    use ModelClassTrait;
+    use StateOptionsTrait;
 
     /**
      * @param LinksHandlerInterface<Model>      $linksHandler
@@ -42,7 +43,7 @@ public function __construct(
 
     public function provide(Operation $operation, array $uriVariables = [], array $context = []): object|array|null
     {
-        $resourceClass = $this->getModelClass($operation);
+        $resourceClass = $this->getStateOptionsClass($operation, $operation->getClass(), Options::class);
         $model = new $resourceClass();
 
         if (!$model instanceof Model) {