mhh

Author: soyuka

src/JsonLd/Serializer/ItemNormalizer.php

@@ -28,6 +28,7 @@
 use ApiPlatform\Metadata\Util\ClassInfoTrait;
 use ApiPlatform\Serializer\AbstractItemNormalizer;
 use ApiPlatform\Serializer\ContextTrait;
+use ApiPlatform\Serializer\OperationResourceResolverInterface;
 use ApiPlatform\Serializer\TagCollectorInterface;
 use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
 use Symfony\Component\Serializer\Exception\LogicException;
@@ -71,9 +72,9 @@ final class ItemNormalizer extends AbstractItemNormalizer
         '@vocab',
     ];
 
-    public function __construct(ResourceMetadataCollectionFactoryInterface $resourceMetadataCollectionFactory, PropertyNameCollectionFactoryInterface $propertyNameCollectionFactory, PropertyMetadataFactoryInterface $propertyMetadataFactory, IriConverterInterface $iriConverter, ResourceClassResolverInterface $resourceClassResolver, private readonly ContextBuilderInterface $contextBuilder, ?PropertyAccessorInterface $propertyAccessor = null, ?NameConverterInterface $nameConverter = null, ?ClassMetadataFactoryInterface $classMetadataFactory = null, array $defaultContext = [], ?ResourceAccessCheckerInterface $resourceAccessChecker = null, protected ?TagCollectorInterface $tagCollector = null, private ?OperationMetadataFactoryInterface $operationMetadataFactory = null)
+    public function __construct(ResourceMetadataCollectionFactoryInterface $resourceMetadataCollectionFactory, PropertyNameCollectionFactoryInterface $propertyNameCollectionFactory, PropertyMetadataFactoryInterface $propertyMetadataFactory, IriConverterInterface $iriConverter, ResourceClassResolverInterface $resourceClassResolver, private readonly ContextBuilderInterface $contextBuilder, ?PropertyAccessorInterface $propertyAccessor = null, ?NameConverterInterface $nameConverter = null, ?ClassMetadataFactoryInterface $classMetadataFactory = null, array $defaultContext = [], ?ResourceAccessCheckerInterface $resourceAccessChecker = null, protected ?TagCollectorInterface $tagCollector = null, private ?OperationMetadataFactoryInterface $operationMetadataFactory = null, ?OperationResourceResolverInterface $operationResourceResolver = null)
     {
-        parent::__construct($propertyNameCollectionFactory, $propertyMetadataFactory, $iriConverter, $resourceClassResolver, $propertyAccessor, $nameConverter, $classMetadataFactory, $defaultContext, $resourceMetadataCollectionFactory, $resourceAccessChecker, $tagCollector);
+        parent::__construct($propertyNameCollectionFactory, $propertyMetadataFactory, $iriConverter, $resourceClassResolver, $propertyAccessor, $nameConverter, $classMetadataFactory, $defaultContext, $resourceMetadataCollectionFactory, $resourceAccessChecker, $tagCollector, $operationResourceResolver);
     }
 
     /**
@@ -109,11 +110,12 @@ public function normalize(mixed $data, ?string $format = null, array $context =
                 // from the output class (not from the item_uri_template operation).
                 $itemUriTemplate = $context['item_uri_template'];
                 unset($context['item_uri_template']);
+                $originalData = $data;
                 $data = parent::normalize($data, $format, $context);
                 if (\is_array($data)) {
                     try {
                         $context['item_uri_template'] = $itemUriTemplate;
-                        $data['@id'] = $this->iriConverter->getIriFromResource($resourceClass, UrlGeneratorInterface::ABS_PATH, null, $context);
+                        $data['@id'] = $this->iriConverter->getIriFromResource($originalData, UrlGeneratorInterface::ABS_PATH, null, $context);
                     } catch (\Exception) {
                     }
                 }
@@ -139,7 +141,14 @@ public function normalize(mixed $data, ?string $format = null, array $context =
             }
 
             if (isset($context['item_uri_template']) && $this->operationMetadataFactory) {
-                $context['output']['operation'] = $this->operationMetadataFactory->create($context['item_uri_template']);
+                $itemOp = $this->operationMetadataFactory->create($context['item_uri_template']);
+                // Use resource-level shortName for @type, not operation-specific shortName
+                try {
+                    $itemResourceShortName = $this->resourceMetadataCollectionFactory->create($itemOp->getClass())[0]->getShortName();
+                    $context['output']['operation'] = $itemOp->withShortName($itemResourceShortName);
+                } catch (\Exception) {
+                    $context['output']['operation'] = $itemOp;
+                }
             } elseif ($this->resourceClassResolver->isResourceClass($resourceClass)) {
                 $context['output']['operation'] = $this->resourceMetadataCollectionFactory->create($resourceClass)->getOperation();
             }
@@ -178,7 +187,13 @@ public function normalize(mixed $data, ?string $format = null, array $context =
         if (!isset($metadata['@type']) && $operation) {
             $types = $operation instanceof HttpOperation ? $operation->getTypes() : null;
             if (null === $types) {
-                $types = [$operation->getShortName()];
+                // Use resource-level shortName to avoid operation-specific overrides
+                $typeClass = $isResourceClass ? $resourceClass : ($operation->getClass() ?? $resourceClass);
+                try {
+                    $types = [$this->resourceMetadataCollectionFactory->create($typeClass)[0]->getShortName()];
+                } catch (\Exception) {
+                    $types = [$operation->getShortName()];
+                }
             }
             $metadata['@type'] = 1 === \count($types) ? $types[0] : $types;
         }

src/Laravel/ApiPlatformProvider.php

@@ -976,6 +976,9 @@ public function register(): void
                 $defaultContext,
                 $app->make(ResourceAccessCheckerInterface::class),
                 // $app->make(TagCollectorInterface::class)
+                null,
+                null,
+                $app->make(OperationResourceResolverInterface::class),
             );
         });
 

src/Serializer/AbstractItemNormalizer.php

@@ -76,7 +76,7 @@ abstract class AbstractItemNormalizer extends AbstractObjectNormalizer
     protected array $localFactoryOptionsCache = [];
     protected ?ResourceAccessCheckerInterface $resourceAccessChecker;
 
-    public function __construct(protected PropertyNameCollectionFactoryInterface $propertyNameCollectionFactory, protected PropertyMetadataFactoryInterface $propertyMetadataFactory, protected IriConverterInterface $iriConverter, protected ResourceClassResolverInterface $resourceClassResolver, ?PropertyAccessorInterface $propertyAccessor = null, ?NameConverterInterface $nameConverter = null, ?ClassMetadataFactoryInterface $classMetadataFactory = null, array $defaultContext = [], ?ResourceMetadataCollectionFactoryInterface $resourceMetadataCollectionFactory = null, ?ResourceAccessCheckerInterface $resourceAccessChecker = null, protected ?TagCollectorInterface $tagCollector = null)
+    public function __construct(protected PropertyNameCollectionFactoryInterface $propertyNameCollectionFactory, protected PropertyMetadataFactoryInterface $propertyMetadataFactory, protected IriConverterInterface $iriConverter, protected ResourceClassResolverInterface $resourceClassResolver, ?PropertyAccessorInterface $propertyAccessor = null, ?NameConverterInterface $nameConverter = null, ?ClassMetadataFactoryInterface $classMetadataFactory = null, array $defaultContext = [], ?ResourceMetadataCollectionFactoryInterface $resourceMetadataCollectionFactory = null, ?ResourceAccessCheckerInterface $resourceAccessChecker = null, protected ?TagCollectorInterface $tagCollector = null, protected ?OperationResourceResolverInterface $operationResourceResolver = null)
     {
         if (!isset($defaultContext['circular_reference_handler'])) {
             $defaultContext['circular_reference_handler'] = fn ($object): ?string => $this->iriConverter->getIriFromResource($object);
@@ -97,7 +97,21 @@ public function supportsNormalization(mixed $data, ?string $format = null, array
             return false;
         }
 
-        $class = $context['force_resource_class'] ?? $this->getObjectClass($data);
+        $class = $this->getObjectClass($data);
+
+        // Only honor force_resource_class if the resolver confirms this object
+        // maps to the operation's resource class (prevents context leakage to
+        // unrelated objects like DateTimeImmutable)
+        if (isset($context['force_resource_class']) && $context['force_resource_class'] !== $class) {
+            $operation = $context['operation'] ?? $context['root_operation'] ?? null;
+            if ($operation && $this->operationResourceResolver) {
+                $resolvedClass = $this->operationResourceResolver->resolve($data, $operation);
+                if ($resolvedClass !== $class) {
+                    $class = $context['force_resource_class'];
+                }
+            }
+        }
+
         if (($context['output']['class'] ?? null) === $class) {
             return true;
         }
@@ -123,6 +137,8 @@ public function getSupportedTypes(?string $format): array
     public function normalize(mixed $data, ?string $format = null, array $context = []): array|string|int|float|bool|\ArrayObject|null
     {
         $resourceClass = $context['force_resource_class'] ?? $this->getObjectClass($data);
+        // Prevent force_resource_class from leaking to child property normalizations
+        unset($context['force_resource_class']);
         if ($outputClass = $this->getOutputClass($context)) {
             if (!$this->serializer instanceof NormalizerInterface) {
                 throw new LogicException('Cannot normalize the output because the injected serializer is not a normalizer');

src/Serializer/ItemNormalizer.php

@@ -41,9 +41,9 @@ class ItemNormalizer extends AbstractItemNormalizer
 {
     private readonly LoggerInterface $logger;
 
-    public function __construct(PropertyNameCollectionFactoryInterface $propertyNameCollectionFactory, PropertyMetadataFactoryInterface $propertyMetadataFactory, IriConverterInterface $iriConverter, ResourceClassResolverInterface $resourceClassResolver, ?PropertyAccessorInterface $propertyAccessor = null, ?NameConverterInterface $nameConverter = null, ?ClassMetadataFactoryInterface $classMetadataFactory = null, ?LoggerInterface $logger = null, ?ResourceMetadataCollectionFactoryInterface $resourceMetadataFactory = null, ?ResourceAccessCheckerInterface $resourceAccessChecker = null, array $defaultContext = [], protected ?TagCollectorInterface $tagCollector = null)
+    public function __construct(PropertyNameCollectionFactoryInterface $propertyNameCollectionFactory, PropertyMetadataFactoryInterface $propertyMetadataFactory, IriConverterInterface $iriConverter, ResourceClassResolverInterface $resourceClassResolver, ?PropertyAccessorInterface $propertyAccessor = null, ?NameConverterInterface $nameConverter = null, ?ClassMetadataFactoryInterface $classMetadataFactory = null, ?LoggerInterface $logger = null, ?ResourceMetadataCollectionFactoryInterface $resourceMetadataFactory = null, ?ResourceAccessCheckerInterface $resourceAccessChecker = null, array $defaultContext = [], protected ?TagCollectorInterface $tagCollector = null, ?OperationResourceResolverInterface $operationResourceResolver = null)
     {
-        parent::__construct($propertyNameCollectionFactory, $propertyMetadataFactory, $iriConverter, $resourceClassResolver, $propertyAccessor, $nameConverter, $classMetadataFactory, $defaultContext, $resourceMetadataFactory, $resourceAccessChecker, $tagCollector);
+        parent::__construct($propertyNameCollectionFactory, $propertyMetadataFactory, $iriConverter, $resourceClassResolver, $propertyAccessor, $nameConverter, $classMetadataFactory, $defaultContext, $resourceMetadataFactory, $resourceAccessChecker, $tagCollector, $operationResourceResolver);
 
         $this->logger = $logger ?: new NullLogger();
     }

src/Symfony/Bundle/Resources/config/api.php

@@ -32,6 +32,8 @@
 use ApiPlatform\Serializer\ItemNormalizer;
 use ApiPlatform\Serializer\Mapping\Factory\ClassMetadataFactory;
 use ApiPlatform\Serializer\Mapping\Loader\PropertyMetadataLoader;
+use ApiPlatform\Serializer\OperationResourceResolver;
+use ApiPlatform\Serializer\OperationResourceResolverInterface;
 use ApiPlatform\Serializer\Parameter\SerializerFilterParameterProvider;
 use ApiPlatform\Serializer\SerializerContextBuilder;
 use ApiPlatform\Serializer\SerializerFilterContextBuilder;
@@ -115,6 +117,9 @@
 
     $services->alias(GroupFilter::class, 'api_platform.serializer.group_filter');
 
+    $services->set('api_platform.serializer.operation_resource_resolver', OperationResourceResolver::class);
+    $services->alias(OperationResourceResolverInterface::class, 'api_platform.serializer.operation_resource_resolver');
+
     $services->set('api_platform.serializer.normalizer.item', ItemNormalizer::class)
         ->args([
             service('api_platform.metadata.property.name_collection_factory'),
@@ -129,6 +134,7 @@
             service('api_platform.security.resource_access_checker')->ignoreOnInvalid(),
             [],
             service('api_platform.http_cache.tag_collector')->ignoreOnInvalid(),
+            service('api_platform.serializer.operation_resource_resolver'),
         ])
         ->tag('serializer.normalizer', ['priority' => -895]);
 

src/Symfony/Bundle/Resources/config/doctrine_mongodb_odm.php

@@ -32,6 +32,7 @@
 use ApiPlatform\Doctrine\Odm\State\CollectionProvider;
 use ApiPlatform\Doctrine\Odm\State\ItemProvider;
 use ApiPlatform\Doctrine\Odm\State\LinksHandler;
+use ApiPlatform\Doctrine\Orm\Serializer\DoctrineOperationResourceResolver;
 use Doctrine\Persistence\Mapping\ClassMetadataFactory;
 
 return function (ContainerConfigurator $container) {
@@ -45,6 +46,8 @@
 
     $services->set('api_platform.doctrine.metadata_factory', ClassMetadataFactory::class)->factory([service('doctrine_mongodb.odm.default_document_manager'), 'getMetadataFactory']);
 
+    $services->set('api_platform.serializer.operation_resource_resolver', DoctrineOperationResourceResolver::class);
+
     $services->set('api_platform.doctrine_mongodb.odm.state.remove_processor', RemoveProcessor::class)
         ->args([service('doctrine_mongodb')])
         ->tag('api_platform.state_processor', ['priority' => -100, 'key' => 'api_platform.doctrine_mongodb.odm.state.remove_processor'])

src/Symfony/Bundle/Resources/config/doctrine_orm.php

@@ -32,6 +32,7 @@
 use ApiPlatform\Doctrine\Orm\Metadata\Property\DoctrineOrmPropertyMetadataFactory;
 use ApiPlatform\Doctrine\Orm\Metadata\Resource\DoctrineOrmLinkFactory;
 use ApiPlatform\Doctrine\Orm\Metadata\Resource\DoctrineOrmResourceCollectionMetadataFactory;
+use ApiPlatform\Doctrine\Orm\Serializer\DoctrineOperationResourceResolver;
 use ApiPlatform\Doctrine\Orm\State\CollectionProvider;
 use ApiPlatform\Doctrine\Orm\State\ItemProvider;
 use ApiPlatform\Doctrine\Orm\State\LinksHandler;
@@ -42,6 +43,8 @@
 
     $services->set('api_platform.doctrine.metadata_factory', ClassMetadataFactory::class)->factory([service('doctrine.orm.default_entity_manager'), 'getMetadataFactory']);
 
+    $services->set('api_platform.serializer.operation_resource_resolver', DoctrineOperationResourceResolver::class);
+
     $services->set('api_platform.doctrine.orm.state.remove_processor', RemoveProcessor::class)
         ->args([service('doctrine')])
         ->tag('api_platform.state_processor', ['priority' => -100, 'key' => 'api_platform.doctrine.orm.state.remove_processor'])

src/Symfony/Bundle/Resources/config/hal.php

@@ -64,6 +64,7 @@
             service('api_platform.metadata.resource.metadata_collection_factory')->ignoreOnInvalid(),
             service('api_platform.security.resource_access_checker')->ignoreOnInvalid(),
             service('api_platform.http_cache.tag_collector')->ignoreOnInvalid(),
+            service('api_platform.serializer.operation_resource_resolver'),
         ])
         ->tag('serializer.normalizer', ['priority' => -890]);
 

src/Symfony/Bundle/Resources/config/jsonapi.php

@@ -72,6 +72,7 @@
             service('api_platform.metadata.resource.metadata_collection_factory'),
             service('api_platform.security.resource_access_checker')->ignoreOnInvalid(),
             service('api_platform.http_cache.tag_collector')->ignoreOnInvalid(),
+            service('api_platform.serializer.operation_resource_resolver'),
         ])
         ->tag('serializer.normalizer', ['priority' => -890]);
 

src/Symfony/Bundle/Resources/config/jsonld.php

@@ -50,6 +50,7 @@
             service('api_platform.security.resource_access_checker')->ignoreOnInvalid(),
             service('api_platform.http_cache.tag_collector')->ignoreOnInvalid(),
             service('api_platform.metadata.operation.metadata_factory')->ignoreOnInvalid(),
+            service('api_platform.serializer.operation_resource_resolver'),
         ])
         ->tag('serializer.normalizer', ['priority' => -890]);