refactor: wip replace getStateOptionClass by dataClass

Thibaut Cholley · Thibaut Cholley · commit a66335a11acb · 2026-04-12T01:13:07.000+02:00
diff --git a/src/Doctrine/Odm/Metadata/Resource/DoctrineMongoDbOdmParameterResourceMetadataCollectionFactory.php b/src/Doctrine/Odm/Metadata/Resource/DoctrineMongoDbOdmParameterResourceMetadataCollectionFactory.php
@@ -13,7 +13,6 @@
 
 namespace ApiPlatform\Doctrine\Odm\Metadata\Resource;
 
-use ApiPlatform\Doctrine\Odm\State\Options;
 use ApiPlatform\Metadata\Operation;
 use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
 use ApiPlatform\Metadata\Resource\ResourceMetadataCollection;
@@ -79,7 +78,7 @@ private function enrichOperation(Operation $operation, string $resourceClass): O
             return $operation;
         }
 
-        $documentClass = $this->getStateOptionsClass($operation, $operation->getClass(), Options::class);
+        $documentClass = $operation->getDataClass();
         if (!$this->managerRegistry->getManagerForClass($documentClass) instanceof DocumentManager) {
             return $operation;
         }
diff --git a/src/Doctrine/Odm/Metadata/Resource/DoctrineMongoDbOdmResourceCollectionMetadataFactory.php b/src/Doctrine/Odm/Metadata/Resource/DoctrineMongoDbOdmResourceCollectionMetadataFactory.php
@@ -45,7 +45,7 @@ public function create(string $resourceClass): ResourceMetadataCollection
 
             if ($operations) {
                 foreach ($resourceMetadata->getOperations() as $operationName => $operation) {
-                    $documentClass = $this->getStateOptionsClass($operation, $operation->getClass(), Options::class);
+                    $documentClass = $operation->getDataClass();
                     if (!$this->managerRegistry->getManagerForClass($documentClass) instanceof DocumentManager) {
                         continue;
                     }
@@ -62,7 +62,7 @@ public function create(string $resourceClass): ResourceMetadataCollection
 
             if ($graphQlOperations) {
                 foreach ($graphQlOperations as $operationName => $graphQlOperation) {
-                    $documentClass = $this->getStateOptionsClass($graphQlOperation, $graphQlOperation->getClass(), Options::class);
+                    $documentClass = $operation->getDataClass();
                     if (!$this->managerRegistry->getManagerForClass($documentClass) instanceof DocumentManager) {
                         continue;
                     }
diff --git a/src/Doctrine/Odm/State/CollectionProvider.php b/src/Doctrine/Odm/State/CollectionProvider.php
@@ -47,7 +47,7 @@ public function __construct(ResourceMetadataCollectionFactoryInterface $resource
 
     public function provide(Operation $operation, array $uriVariables = [], array $context = []): iterable
     {
-        $documentClass = $this->getStateOptionsClass($operation, $operation->getClass(), Options::class);
+        $documentClass = $operation->getDataClass();
 
         /** @var DocumentManager $manager */
         $manager = $this->managerRegistry->getManagerForClass($documentClass);
diff --git a/src/Doctrine/Odm/State/ItemProvider.php b/src/Doctrine/Odm/State/ItemProvider.php
@@ -50,7 +50,7 @@ public function __construct(ResourceMetadataCollectionFactoryInterface $resource
 
     public function provide(Operation $operation, array $uriVariables = [], array $context = []): ?object
     {
-        $documentClass = $this->getStateOptionsClass($operation, $operation->getClass(), Options::class);
+        $documentClass = $operation->getDataClass();
 
         /** @var DocumentManager $manager */
         $manager = $this->managerRegistry->getManagerForClass($documentClass);
diff --git a/src/Doctrine/Odm/State/LinksHandlerTrait.php b/src/Doctrine/Odm/State/LinksHandlerTrait.php
@@ -133,15 +133,15 @@ 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);
+        $documentClass = $operation->getDataClass();
         $fromClass = $link->getFromClass();
         if ($fromClass === $operation->getClass() && $documentClass) {
             return $documentClass;
         }
 
         $operation = $this->resourceMetadataCollectionFactory->create($fromClass)->getOperation();
 
-        if ($documentClass = $this->getStateOptionsClass($operation, null, Options::class)) {
+        if ($documentClass = $operation->getDataClass()) {
             return $documentClass;
         }
 
diff --git a/src/Doctrine/Odm/State/Options.php b/src/Doctrine/Odm/State/Options.php
@@ -14,9 +14,9 @@
 namespace ApiPlatform\Doctrine\Odm\State;
 
 use ApiPlatform\Doctrine\Common\State\Options as CommonOptions;
-use ApiPlatform\State\OptionsInterface;
+use ApiPlatform\State\DataOptionsInterface;
 
-class Options extends CommonOptions implements OptionsInterface
+class Options extends CommonOptions implements DataOptionsInterface
 {
     /**
      * @param mixed $handleLinks experimental callable, typed mixed as we may want a service name in the future
@@ -30,6 +30,11 @@ public function __construct(
         parent::__construct(handleLinks: $handleLinks);
     }
 
+    public function getDataClass(): ?string
+    {
+        return $this->documentClass;
+    }
+
     public function getDocumentClass(): ?string
     {
         return $this->documentClass;
diff --git a/src/Doctrine/Orm/Metadata/Resource/DoctrineOrmParameterResourceMetadataCollectionFactory.php b/src/Doctrine/Orm/Metadata/Resource/DoctrineOrmParameterResourceMetadataCollectionFactory.php
@@ -13,7 +13,6 @@
 
 namespace ApiPlatform\Doctrine\Orm\Metadata\Resource;
 
-use ApiPlatform\Doctrine\Orm\State\Options;
 use ApiPlatform\Metadata\Operation;
 use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
 use ApiPlatform\Metadata\Resource\ResourceMetadataCollection;
@@ -77,7 +76,7 @@ private function enrichOperation(Operation $operation, string $resourceClass): O
             return $operation;
         }
 
-        $entityClass = $this->getStateOptionsClass($operation, $operation->getClass(), Options::class);
+        $entityClass = $operation->getDataClass();
         if (!$this->managerRegistry->getManagerForClass($entityClass) instanceof EntityManagerInterface) {
             return $operation;
         }
diff --git a/src/Doctrine/Orm/Metadata/Resource/DoctrineOrmResourceCollectionMetadataFactory.php b/src/Doctrine/Orm/Metadata/Resource/DoctrineOrmResourceCollectionMetadataFactory.php
@@ -47,7 +47,7 @@ public function create(string $resourceClass): ResourceMetadataCollection
 
             if ($operations) {
                 foreach ($operations as $operationName => $operation) {
-                    $entityClass = $this->getStateOptionsClass($operation, $operation->getClass(), Options::class);
+                    $entityClass = $operation->getDataClass();
 
                     $manager = $this->managerRegistry->getManagerForClass($entityClass);
                     if (!$manager instanceof EntityManagerInterface) {
@@ -74,7 +74,7 @@ public function create(string $resourceClass): ResourceMetadataCollection
 
             if ($graphQlOperations) {
                 foreach ($graphQlOperations as $operationName => $graphQlOperation) {
-                    $entityClass = $this->getStateOptionsClass($graphQlOperation, $graphQlOperation->getClass(), Options::class);
+                    $entityClass = $operation->getDataClass();
 
                     if (!$this->managerRegistry->getManagerForClass($entityClass) instanceof EntityManagerInterface) {
                         continue;
diff --git a/src/Doctrine/Orm/State/CollectionProvider.php b/src/Doctrine/Orm/State/CollectionProvider.php
@@ -50,7 +50,7 @@ public function __construct(ResourceMetadataCollectionFactoryInterface $resource
 
     public function provide(Operation $operation, array $uriVariables = [], array $context = []): iterable
     {
-        $entityClass = $this->getStateOptionsClass($operation, $operation->getClass(), Options::class);
+        $entityClass = $operation->getDataClass();
 
         /** @var EntityManagerInterface $manager */
         $manager = $this->managerRegistry->getManagerForClass($entityClass);
diff --git a/src/Doctrine/Orm/State/ItemProvider.php b/src/Doctrine/Orm/State/ItemProvider.php
@@ -50,7 +50,7 @@ public function __construct(ResourceMetadataCollectionFactoryInterface $resource
 
     public function provide(Operation $operation, array $uriVariables = [], array $context = []): ?object
     {
-        $entityClass = $this->getStateOptionsClass($operation, $operation->getClass(), Options::class);
+        $entityClass = $operation->getDataClass();
 
         /** @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
@@ -161,12 +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->getStateOptionsClass($operation, $operation->getClass(), Options::class)) {
+        if ($fromClass === $operation->getClass() && $entityClass = $operation->getDataClass()) {
             return $entityClass;
         }
 
         $operation = $this->resourceMetadataCollectionFactory->create($fromClass)->getOperation();
 
-        return $this->getStateOptionsClass($operation, $operation->getClass(), Options::class);
+        return $operation->getDataClass();
     }
 }
diff --git a/src/Doctrine/Orm/State/Options.php b/src/Doctrine/Orm/State/Options.php
@@ -14,9 +14,9 @@
 namespace ApiPlatform\Doctrine\Orm\State;
 
 use ApiPlatform\Doctrine\Common\State\Options as CommonOptions;
-use ApiPlatform\State\OptionsInterface;
+use ApiPlatform\State\DataOptionsInterface;
 
-class Options extends CommonOptions implements OptionsInterface
+class Options extends CommonOptions implements DataOptionsInterface
 {
     /**
      * @param string|callable $handleLinks experimental callable, typed mixed as we may want a service name in the future
@@ -30,6 +30,11 @@ public function __construct(
         parent::__construct(handleLinks: $handleLinks);
     }
 
+    public function getDataClass(): ?string
+    {
+        return $this->entityClass;
+    }
+
     public function getEntityClass(): ?string
     {
         return $this->entityClass;
diff --git a/src/GraphQl/Serializer/SerializerContextBuilder.php b/src/GraphQl/Serializer/SerializerContextBuilder.php
@@ -42,12 +42,12 @@ public function create(?string $resourceClass, Operation $operation, array $reso
         $context['operation'] = $operation;
         $context['input'] = $operation->getInputClass() === $operation->getClass() ? null : ['class' => $operation->getInputClass()];
         $context['output'] = $operation->getOutputClass() === $operation->getClass() ? null : ['class' => $operation->getOutputClass()];
-//        if (($inputClass = $operation->getInputClass()) !== $operation->getClass()) {
-//            $context['input'] = ['class' => $inputClass];
-//        }
-//        if (($outputClass = $operation->getOutputClass()) !== $operation->getClass()) {
-//            $context['output'] =  ['class' => $outputClass];
-//        }
+        //        if (($inputClass = $operation->getInputClass()) !== $operation->getClass()) {
+        //            $context['input'] = ['class' => $inputClass];
+        //        }
+        //        if (($outputClass = $operation->getOutputClass()) !== $operation->getClass()) {
+        //            $context['output'] =  ['class' => $outputClass];
+        //        }
         $context = $normalization ? array_merge($operation->getNormalizationContext() ?? [], $context) : array_merge($operation->getDenormalizationContext() ?? [], $context);
 
         if ($normalization) {
@@ -101,7 +101,7 @@ private function replaceIdKeys(array $fields, ?string $resourceClass, array $con
                 continue;
             }
 
-            $denormalizedFields[$this->denormalizePropertyName((string)$key, $resourceClass, $context)] = \is_array($value) ? $this->replaceIdKeys($value, $resourceClass, $context) : $value;
+            $denormalizedFields[$this->denormalizePropertyName((string) $key, $resourceClass, $context)] = \is_array($value) ? $this->replaceIdKeys($value, $resourceClass, $context) : $value;
         }
 
         return $denormalizedFields;
diff --git a/src/GraphQl/Type/FieldsBuilder.php b/src/GraphQl/Type/FieldsBuilder.php
@@ -616,7 +616,7 @@ private function getFilterArgs(array $args, ?string $resourceClass, string $root
                 continue;
             }
 
-            $entityClass = $this->getStateOptionsClass($resourceOperation, $resourceOperation->getClass());
+            $entityClass = $resourceOperation->getDataClass();
             foreach ($this->filterLocator->get($filterId)->getDescription($entityClass) as $key => $description) {
                 $filterType = \in_array($description['type'], TypeIdentifier::values(), true) ? Type::builtin($description['type']) : Type::object($description['type']);
                 if (!($description['required'] ?? false)) {
diff --git a/src/Hydra/Serializer/CollectionFiltersNormalizer.php b/src/Hydra/Serializer/CollectionFiltersNormalizer.php
@@ -105,7 +105,7 @@ public function normalize(mixed $data, ?string $format = null, array $context =
             }
         }
 
-        $resourceClass = $this->getStateOptionsClass($operation, $resourceClass);
+        $resourceClass = $operation->getDataClass();
 
         if ($currentFilters || ($parameters && \count($parameters))) {
             $hydraPrefix = $this->getHydraPrefix($context + $this->defaultContext);
diff --git a/src/Laravel/Eloquent/Metadata/Factory/Resource/EloquentResourceCollectionMetadataFactory.php b/src/Laravel/Eloquent/Metadata/Factory/Resource/EloquentResourceCollectionMetadataFactory.php
@@ -15,7 +15,6 @@
 
 use ApiPlatform\Laravel\Eloquent\State\CollectionProvider;
 use ApiPlatform\Laravel\Eloquent\State\ItemProvider;
-use ApiPlatform\Laravel\Eloquent\State\Options;
 use ApiPlatform\Laravel\Eloquent\State\PersistProcessor;
 use ApiPlatform\Laravel\Eloquent\State\RemoveProcessor;
 use ApiPlatform\Metadata\CollectionOperationInterface;
@@ -81,7 +80,7 @@ public function create(string $resourceClass): ResourceMetadataCollection
             $operations = $resourceMetadata->getOperations();
             foreach ($operations ?? [] as $operationName => $operation) {
                 // Check if this operation uses Eloquent via stateOptions
-                $modelClass = $this->getStateOptionsClass($operation, $resourceClass, Options::class);
+                $modelClass = $operation->getDataClass();
                 $usesEloquent = $isModel || ($modelClass !== $resourceClass);
 
                 if (!$usesEloquent) {
@@ -115,7 +114,7 @@ public function create(string $resourceClass): ResourceMetadataCollection
             $graphQlOperations = $resourceMetadata->getGraphQlOperations();
             foreach ($graphQlOperations ?? [] as $operationName => $graphQlOperation) {
                 // Check if this operation uses Eloquent via stateOptions
-                $modelClass = $this->getStateOptionsClass($graphQlOperation, $resourceClass, Options::class);
+                $modelClass = $operation->getDataClass();
                 $usesEloquent = $isModel || ($modelClass !== $resourceClass);
 
                 if (!$usesEloquent) {
diff --git a/src/Laravel/Eloquent/State/CollectionProvider.php b/src/Laravel/Eloquent/State/CollectionProvider.php
@@ -48,7 +48,7 @@ public function __construct(
 
     public function provide(Operation $operation, array $uriVariables = [], array $context = []): object|array|null
     {
-        $resourceClass = $this->getStateOptionsClass($operation, $operation->getClass(), Options::class);
+        $resourceClass = $operation->getDataClass();
         $model = new $resourceClass();
 
         if (!$model instanceof Model) {
diff --git a/src/Laravel/Eloquent/State/ItemProvider.php b/src/Laravel/Eloquent/State/ItemProvider.php
@@ -43,7 +43,7 @@ public function __construct(
 
     public function provide(Operation $operation, array $uriVariables = [], array $context = []): object|array|null
     {
-        $resourceClass = $this->getStateOptionsClass($operation, $operation->getClass(), Options::class);
+        $resourceClass = $operation->getDataClass();
         $model = new $resourceClass();
 
         if (!$model instanceof Model) {
diff --git a/src/Laravel/Eloquent/State/Options.php b/src/Laravel/Eloquent/State/Options.php
@@ -13,9 +13,9 @@
 
 namespace ApiPlatform\Laravel\Eloquent\State;
 
-use ApiPlatform\State\OptionsInterface;
+use ApiPlatform\State\DataOptionsInterface;
 
-class Options implements OptionsInterface
+class Options implements DataOptionsInterface
 {
     /**
      * @param string|callable $handleLinks experimental callable, typed mixed as we may want a service name in the future
@@ -28,6 +28,11 @@ public function __construct(
     ) {
     }
 
+    public function getDataClass(): ?string
+    {
+        return $this->modelClass;
+    }
+
     public function getHandleLinks(): mixed
     {
         return $this->handleLinks;
diff --git a/src/Metadata/ApiResource.php b/src/Metadata/ApiResource.php
@@ -48,9 +48,7 @@ class ApiResource extends Metadata
      * @param mixed|null                                                       $mercure
      * @param mixed|null                                                       $messenger
      * @param mixed|null                                                       $input
-     * @param string|null                                                      $inputClass
      * @param mixed|null                                                       $output
-     * @param string|null                                                      $outputClass
      * @param array<string, McpResource|McpTool>|null                          $mcp          A list of Mcp resources or tools
      */
     public function __construct(
@@ -983,6 +981,7 @@ public function __construct(
         protected array $extraProperties = [],
         ?bool $map = null,
         protected ?array $mcp = null,
+        protected ?string $dataClass = null,
     ) {
         parent::__construct(
             shortName: $shortName,
@@ -1032,6 +1031,7 @@ class: $class,
             jsonStream: $jsonStream,
             extraProperties: $extraProperties,
             map: $map,
+            dataClass: $dataClass,
         );
 
         /* @var Operations<HttpOperation> $operations> */
diff --git a/src/Metadata/Get.php b/src/Metadata/Get.php
@@ -103,6 +103,7 @@ public function __construct(
         ?bool $jsonStream = null,
         array $extraProperties = [],
         ?bool $map = null,
+        ?string $dataClass = null,
     ) {
         parent::__construct(
             uriTemplate: $uriTemplate,
@@ -185,7 +186,8 @@ class: $class,
             hideHydraOperation: $hideHydraOperation,
             jsonStream: $jsonStream,
             extraProperties: $extraProperties,
-            map: $map
+            map: $map,
+            dataClass: $dataClass
         );
     }
 }
diff --git a/src/Metadata/HttpOperation.php b/src/Metadata/HttpOperation.php
@@ -223,6 +223,7 @@ public function __construct(
         ?bool $jsonStream = null,
         array $extraProperties = [],
         ?bool $map = null,
+        ?string $dataClass = null,
     ) {
         $this->formats = (null === $formats || \is_array($formats)) ? $formats : [$formats];
         $this->inputFormats = (null === $inputFormats || \is_array($inputFormats)) ? $inputFormats : [$inputFormats];
@@ -283,7 +284,8 @@ class: $class,
             hideHydraOperation: $hideHydraOperation,
             jsonStream: $jsonStream,
             extraProperties: $extraProperties,
-            map: $map
+            map: $map,
+            dataClass: $dataClass
         );
     }
 
diff --git a/src/Metadata/Metadata.php b/src/Metadata/Metadata.php
diff --git a/src/Metadata/Operation.php b/src/Metadata/Operation.php
diff --git a/src/Metadata/Resource/Factory/ObjectMapperMetadataCollectionFactory.php b/src/Metadata/Resource/Factory/ObjectMapperMetadataCollectionFactory.php
diff --git a/src/Metadata/Resource/Factory/ParameterResourceMetadataCollectionFactory.php b/src/Metadata/Resource/Factory/ParameterResourceMetadataCollectionFactory.php
diff --git a/src/OpenApi/Factory/OpenApiFactory.php b/src/OpenApi/Factory/OpenApiFactory.php
diff --git a/src/State/DataOptionsInterface.php b/src/State/DataOptionsInterface.php
diff --git a/src/State/Processor/ObjectMapperInputProcessor.php b/src/State/Processor/ObjectMapperInputProcessor.php
diff --git a/src/State/Processor/ObjectMapperProcessor.php b/src/State/Processor/ObjectMapperProcessor.php
diff --git a/src/State/SerializerAwareProviderInterface.php b/src/State/SerializerAwareProviderInterface.php

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@`
`13`	`13`
`14`	`14`	`namespace ApiPlatform\Doctrine\Odm\Metadata\Resource;`
`15`	`15`
`16`		`-use ApiPlatform\Doctrine\Odm\State\Options;`
`17`	`16`	`use ApiPlatform\Metadata\Operation;`
`18`	`17`	`use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;`
`19`	`18`	`use ApiPlatform\Metadata\Resource\ResourceMetadataCollection;`
`@@ -79,7 +78,7 @@ private function enrichOperation(Operation $operation, string $resourceClass): O`
`79`	`78`	`return $operation;`
`80`	`79`	`}`
`81`	`80`
`82`		`- $documentClass = $this->getStateOptionsClass($operation, $operation->getClass(), Options::class);`
	`81`	`+ $documentClass = $operation->getDataClass();`
`83`	`82`	`if (!$this->managerRegistry->getManagerForClass($documentClass) instanceof DocumentManager) {`
`84`	`83`	`return $operation;`
`85`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public function __construct(ResourceMetadataCollectionFactoryInterface $resource`
`47`	`47`
`48`	`48`	`public function provide(Operation $operation, array $uriVariables = [], array $context = []): iterable`
`49`	`49`	`{`
`50`		`- $documentClass = $this->getStateOptionsClass($operation, $operation->getClass(), Options::class);`
	`50`	`+ $documentClass = $operation->getDataClass();`
`51`	`51`
`52`	`52`	`/** @var DocumentManager $manager */`
`53`	`53`	`$manager = $this->managerRegistry->getManagerForClass($documentClass);`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public function __construct(ResourceMetadataCollectionFactoryInterface $resource`
`50`	`50`
`51`	`51`	`public function provide(Operation $operation, array $uriVariables = [], array $context = []): ?object`
`52`	`52`	`{`
`53`		`- $documentClass = $this->getStateOptionsClass($operation, $operation->getClass(), Options::class);`
	`53`	`+ $documentClass = $operation->getDataClass();`
`54`	`54`
`55`	`55`	`/** @var DocumentManager $manager */`
`56`	`56`	`$manager = $this->managerRegistry->getManagerForClass($documentClass);`
Original file line number	Diff line number	Diff line change
`@@ -133,15 +133,15 @@ private function buildAggregation(string $toClass, array $links, array $identifi`
`133`	`133`
`134`	`134`	`private function getLinkFromClass(Link $link, Operation $operation): string`
`135`	`135`	`{`
`136`		`- $documentClass = $this->getStateOptionsClass($operation, $operation->getClass(), Options::class);`
	`136`	`+ $documentClass = $operation->getDataClass();`
`137`	`137`	`$fromClass = $link->getFromClass();`
`138`	`138`	`if ($fromClass === $operation->getClass() && $documentClass) {`
`139`	`139`	`return $documentClass;`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`$operation = $this->resourceMetadataCollectionFactory->create($fromClass)->getOperation();`
`143`	`143`
`144`		`- if ($documentClass = $this->getStateOptionsClass($operation, null, Options::class)) {`
	`144`	`+ if ($documentClass = $operation->getDataClass()) {`
`145`	`145`	`return $documentClass;`
`146`	`146`	`}`
`147`	`147`