fix: unwanted deprecations

src/Core/Api/OperationType.php

@@ -13,10 +13,6 @@
 
 namespace ApiPlatform\Core\Api;
 
-use ApiPlatform\Metadata\Operation;
-
-trigger_deprecation('api-platform', '2.7', sprintf('%s is deprecated, an operation can be a collection using the %s::collection property.', OperationType::class, Operation::class));
-
 final class OperationType
 {
     public const ITEM = 'item';

src/Core/Bridge/Symfony/Messenger/DataPersister.php

@@ -19,6 +19,7 @@
 use ApiPlatform\Exception\OperationNotFoundException;
 use ApiPlatform\Exception\ResourceClassNotFoundException;
 use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
+use ApiPlatform\Symfony\Messenger\DispatchTrait;
 use ApiPlatform\Util\ClassInfoTrait;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\MessageBusInterface;

src/Core/Metadata/Property/Factory/AnnotationPropertyMetadataFactory.php

@@ -40,6 +40,10 @@ public function __construct(Reader $reader = null, PropertyMetadataFactoryInterf
      */
     public function create(string $resourceClass, string $property, array $options = []): PropertyMetadata
     {
+        if (false === ($options['deprecate'] ?? null)) {
+            trigger_deprecation('api-platform/core', '2.7', sprintf('Decorating the legacy %s is deprecated, use %s instead.', PropertyMetadataFactoryInterface::class, \ApiPlatform\Metadata\Property\Factory\PropertyMetadataFactoryInterface::class));
+        }
+
         $parentPropertyMetadata = null;
         if ($this->decorated) {
             try {

src/Core/Metadata/Property/Factory/AnnotationSubresourceMetadataFactory.php

@@ -36,8 +36,6 @@ public function __construct(Reader $reader, PropertyMetadataFactoryInterface $de
     {
         $this->reader = $reader;
         $this->decorated = $decorated;
-
-        trigger_deprecation('api-platform/core', '2.7', 'Use alternate urls instead of declaring subresources on properties.');
     }
 
     /**
@@ -62,6 +60,8 @@ public function create(string $resourceClass, string $property, array $options =
 
             $annotation = $this->reader->getPropertyAnnotation($reflectionProperty, ApiSubresource::class);
             if ($annotation instanceof ApiSubresource) {
+                trigger_deprecation('api-platform/core', '2.7', sprintf('Declare a new resource instead of using ApiSubresource on the property "%s".', $property));
+
                 return $this->updateMetadata($annotation, $propertyMetadata, $resourceClass, $property);
             }
         }

src/Core/Metadata/Property/Factory/SerializerPropertyMetadataFactory.php

@@ -16,8 +16,8 @@
 use ApiPlatform\Core\Api\ResourceClassResolverInterface;
 use ApiPlatform\Core\Metadata\Property\PropertyMetadata;
 use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface;
-use ApiPlatform\Core\Util\ResourceClassInfoTrait;
 use ApiPlatform\Exception\ResourceClassNotFoundException;
+use ApiPlatform\Util\ResourceClassInfoTrait;
 use Symfony\Component\PropertyInfo\Type;
 use Symfony\Component\Serializer\Mapping\AttributeMetadataInterface;
 use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface as SerializerClassMetadataFactoryInterface;

src/Core/Swagger/Serializer/DocumentationNormalizer.php

@@ -13,8 +13,8 @@
 
 namespace ApiPlatform\Core\Swagger\Serializer;
 
+use ApiPlatform\Api\FilterLocatorTrait;
 use ApiPlatform\Core\Api\FilterCollection;
-use ApiPlatform\Core\Api\FilterLocatorTrait;
 use ApiPlatform\Core\Api\FormatsProviderInterface;
 use ApiPlatform\Core\Api\IdentifiersExtractorInterface;
 use ApiPlatform\Core\Api\OperationAwareFormatsProviderInterface;
@@ -38,6 +38,7 @@
 use ApiPlatform\JsonSchema\TypeFactoryInterface;
 use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
 use ApiPlatform\OpenApi\OpenApi;
+use ApiPlatform\OpenApi\Serializer\ApiGatewayNormalizer;
 use ApiPlatform\PathResolver\OperationPathResolverInterface;
 use Psr\Container\ContainerInterface;
 use Symfony\Component\PropertyInfo\Type;

src/Doctrine/Common/State/Processor.php

@@ -31,7 +31,7 @@ public function __construct(ManagerRegistry $managerRegistry)
         $this->managerRegistry = $managerRegistry;
     }
 
-    public function supports($data, array $identifiers = [], ?string $operationName = null, array $context = []): bool
+    public function supports($data, array $uriVariables = [], ?string $operationName = null, array $context = []): bool
     {
         return null !== $this->getManager($data);
     }
@@ -62,7 +62,7 @@ private function remove($data, array $context = [])
         $manager->flush();
     }
 
-    public function process($data, array $identifiers = [], ?string $operationName = null, array $context = [])
+    public function process($data, array $uriVariables = [], ?string $operationName = null, array $context = [])
     {
         if (\array_key_exists('operation', $context) && $context['operation']->isDelete()) {
             return $this->remove($data);

src/Doctrine/Odm/State/CollectionProvider.php

@@ -46,7 +46,7 @@ public function __construct(ResourceMetadataCollectionFactoryInterface $resource
         $this->collectionExtensions = $collectionExtensions;
     }
 
-    public function provide(string $resourceClass, array $identifiers = [], ?string $operationName = null, array $context = [])
+    public function provide(string $resourceClass, array $uriVariables = [], ?string $operationName = null, array $context = [])
     {
         /** @var DocumentManager $manager */
         $manager = $this->managerRegistry->getManagerForClass($resourceClass);
@@ -59,7 +59,7 @@ public function provide(string $resourceClass, array $identifiers = [], ?string
 
         $aggregationBuilder = $repository->createAggregationBuilder();
 
-        $this->handleLinks($aggregationBuilder, $identifiers, $context, $resourceClass, $operationName);
+        $this->handleLinks($aggregationBuilder, $uriVariables, $context, $resourceClass, $operationName);
 
         foreach ($this->collectionExtensions as $extension) {
             $extension->applyToCollection($aggregationBuilder, $resourceClass, $operationName, $context);
@@ -81,7 +81,7 @@ public function provide(string $resourceClass, array $identifiers = [], ?string
         return $aggregationBuilder->hydrate($resourceClass)->execute($executeOptions);
     }
 
-    public function supports(string $resourceClass, array $identifiers = [], ?string $operationName = null, array $context = []): bool
+    public function supports(string $resourceClass, array $uriVariables = [], ?string $operationName = null, array $context = []): bool
     {
         if (!$this->managerRegistry->getManagerForClass($resourceClass) instanceof DocumentManager) {
             return false;

src/Doctrine/Odm/State/ItemProvider.php

@@ -48,14 +48,14 @@ public function __construct(ResourceMetadataCollectionFactoryInterface $resource
         $this->itemExtensions = $itemExtensions;
     }
 
-    public function provide(string $resourceClass, array $identifiers = [], ?string $operationName = null, array $context = [])
+    public function provide(string $resourceClass, array $uriVariables = [], ?string $operationName = null, array $context = [])
     {
         /** @var DocumentManager $manager */
         $manager = $this->managerRegistry->getManagerForClass($resourceClass);
 
         $fetchData = $context['fetch_data'] ?? true;
         if (!$fetchData) {
-            return $manager->getReference($resourceClass, reset($identifiers));
+            return $manager->getReference($resourceClass, reset($uriVariables));
         }
 
         /** @var ObjectRepository $repository */
@@ -66,10 +66,10 @@ public function provide(string $resourceClass, array $identifiers = [], ?string
 
         $aggregationBuilder = $repository->createAggregationBuilder();
 
-        $this->handleLinks($aggregationBuilder, $identifiers, $context, $resourceClass, $operationName);
+        $this->handleLinks($aggregationBuilder, $uriVariables, $context, $resourceClass, $operationName);
 
         foreach ($this->itemExtensions as $extension) {
-            $extension->applyToItem($aggregationBuilder, $resourceClass, $identifiers, $operationName, $context);
+            $extension->applyToItem($aggregationBuilder, $resourceClass, $uriVariables, $operationName, $context);
 
             if ($extension instanceof AggregationResultItemExtensionInterface && $extension->supportsResult($resourceClass, $operationName, $context)) {
                 return $extension->getResult($aggregationBuilder, $resourceClass, $operationName, $context);
@@ -87,7 +87,7 @@ public function provide(string $resourceClass, array $identifiers = [], ?string
         return $aggregationBuilder->hydrate($resourceClass)->execute($executeOptions)->current() ?: null;
     }
 
-    public function supports(string $resourceClass, array $identifiers = [], ?string $operationName = null, array $context = []): bool
+    public function supports(string $resourceClass, array $uriVariables = [], ?string $operationName = null, array $context = []): bool
     {
         if (!$this->managerRegistry->getManagerForClass($resourceClass) instanceof DocumentManager) {
             return false;

src/Doctrine/Orm/State/CollectionProvider.php

@@ -48,7 +48,7 @@ public function __construct(ResourceMetadataCollectionFactoryInterface $resource
         $this->collectionExtensions = $collectionExtensions;
     }
 
-    public function provide(string $resourceClass, array $identifiers = [], ?string $operationName = null, array $context = [])
+    public function provide(string $resourceClass, array $uriVariables = [], ?string $operationName = null, array $context = [])
     {
         /** @var EntityManagerInterface $manager */
         $manager = $this->managerRegistry->getManagerForClass($resourceClass);
@@ -62,7 +62,7 @@ public function provide(string $resourceClass, array $identifiers = [], ?string
         $queryBuilder = $repository->createQueryBuilder('o');
         $queryNameGenerator = new QueryNameGenerator();
 
-        $this->handleLinks($queryBuilder, $identifiers, $queryNameGenerator, $context, $resourceClass, $operationName);
+        $this->handleLinks($queryBuilder, $uriVariables, $queryNameGenerator, $context, $resourceClass, $operationName);
 
         foreach ($this->collectionExtensions as $extension) {
             $extension->applyToCollection($queryBuilder, $queryNameGenerator, $resourceClass, $operationName, $context);
@@ -75,7 +75,7 @@ public function provide(string $resourceClass, array $identifiers = [], ?string
         return $queryBuilder->getQuery()->getResult();
     }
 
-    public function supports(string $resourceClass, array $identifiers = [], ?string $operationName = null, array $context = []): bool
+    public function supports(string $resourceClass, array $uriVariables = [], ?string $operationName = null, array $context = []): bool
     {
         if (!$this->managerRegistry->getManagerForClass($resourceClass) instanceof EntityManagerInterface) {
             return false;

src/Doctrine/Orm/State/ItemProvider.php

@@ -47,14 +47,14 @@ public function __construct(ResourceMetadataCollectionFactoryInterface $resource
         $this->itemExtensions = $itemExtensions;
     }
 
-    public function provide(string $resourceClass, array $identifiers = [], ?string $operationName = null, array $context = [])
+    public function provide(string $resourceClass, array $uriVariables = [], ?string $operationName = null, array $context = [])
     {
         /** @var EntityManagerInterface $manager */
         $manager = $this->managerRegistry->getManagerForClass($resourceClass);
 
         $fetchData = $context['fetch_data'] ?? true;
         if (!$fetchData) {
-            return $manager->getReference($resourceClass, $identifiers);
+            return $manager->getReference($resourceClass, $uriVariables);
         }
 
         /** @var EntityRepository $repository */
@@ -66,10 +66,10 @@ public function provide(string $resourceClass, array $identifiers = [], ?string
         $queryBuilder = $repository->createQueryBuilder('o');
         $queryNameGenerator = new QueryNameGenerator();
 
-        $this->handleLinks($queryBuilder, $identifiers, $queryNameGenerator, $context, $resourceClass, $operationName);
+        $this->handleLinks($queryBuilder, $uriVariables, $queryNameGenerator, $context, $resourceClass, $operationName);
 
         foreach ($this->itemExtensions as $extension) {
-            $extension->applyToItem($queryBuilder, $queryNameGenerator, $resourceClass, $identifiers, $operationName, $context);
+            $extension->applyToItem($queryBuilder, $queryNameGenerator, $resourceClass, $uriVariables, $operationName, $context);
 
             if ($extension instanceof QueryResultItemExtensionInterface && $extension->supportsResult($resourceClass, $operationName, $context)) {
                 return $extension->getResult($queryBuilder, $resourceClass, $operationName, $context);
@@ -79,7 +79,7 @@ public function provide(string $resourceClass, array $identifiers = [], ?string
         return $queryBuilder->getQuery()->getOneOrNullResult();
     }
 
-    public function supports(string $resourceClass, array $identifiers = [], ?string $operationName = null, array $context = []): bool
+    public function supports(string $resourceClass, array $uriVariables = [], ?string $operationName = null, array $context = []): bool
     {
         if (!$this->managerRegistry->getManagerForClass($resourceClass) instanceof EntityManagerInterface) {
             return false;

src/Elasticsearch/State/CollectionProvider.php

@@ -59,7 +59,7 @@ public function __construct(Client $client, DocumentMetadataFactoryInterface $do
     /**
      * {@inheritdoc}
      */
-    public function supports(string $resourceClass, array $identifiers = [], ?string $operationName = null, array $context = []): bool
+    public function supports(string $resourceClass, array $uriVariables = [], ?string $operationName = null, array $context = []): bool
     {
         try {
             $resourceMetadata = $this->resourceMetadataCollectionFactory->create($resourceClass);
@@ -83,7 +83,7 @@ public function supports(string $resourceClass, array $identifiers = [], ?string
     /**
      * {@inheritdoc}
      */
-    public function provide(string $resourceClass, array $identifiers = [], ?string $operationName = null, array $context = [])
+    public function provide(string $resourceClass, array $uriVariables = [], ?string $operationName = null, array $context = [])
     {
         $documentMetadata = $this->documentMetadataFactory->create($resourceClass);
         $body = [];

src/Elasticsearch/State/ItemProvider.php

@@ -50,7 +50,7 @@ public function __construct(Client $client, DocumentMetadataFactoryInterface $do
     /**
      * {@inheritdoc}
      */
-    public function supports(string $resourceClass, array $identifiers = [], ?string $operationName = null, array $context = []): bool
+    public function supports(string $resourceClass, array $uriVariables = [], ?string $operationName = null, array $context = []): bool
     {
         try {
             $resourceMetadata = $this->resourceMetadataCollectionFactory->create($resourceClass);
@@ -74,15 +74,15 @@ public function supports(string $resourceClass, array $identifiers = [], ?string
     /**
      * {@inheritdoc}
      */
-    public function provide(string $resourceClass, array $identifiers = [], ?string $operationName = null, array $context = [])
+    public function provide(string $resourceClass, array $uriVariables = [], ?string $operationName = null, array $context = [])
     {
         $documentMetadata = $this->documentMetadataFactory->create($resourceClass);
 
         try {
             $document = $this->client->get([
                 'index' => $documentMetadata->getIndex(),
                 'type' => $documentMetadata->getType(),
-                'id' => (string) reset($identifiers),
+                'id' => (string) reset($uriVariables),
             ]);
         } catch (Missing404Exception $e) {
             return null;

src/GraphQl/Resolver/Stage/ReadStage.php

@@ -93,7 +93,7 @@ public function __invoke(?string $resourceClass, ?string $rootClass, string $ope
             return [];
         }
 
-        $identifiers = [];
+        $uriVariables = [];
         $normalizationContext['filters'] = $this->getNormalizedFilters($args);
 
         if (!$operation && $resourceClass) {
@@ -106,11 +106,11 @@ public function __invoke(?string $resourceClass, ?string $rootClass, string $ope
         /** @var ResolveInfo $info */
         $info = $context['info'];
         if (isset($source[$info->fieldName], $source[ItemNormalizer::ITEM_IDENTIFIERS_KEY], $source[ItemNormalizer::ITEM_RESOURCE_CLASS_KEY])) {
-            $identifiers = $source[ItemNormalizer::ITEM_IDENTIFIERS_KEY];
+            $uriVariables = $source[ItemNormalizer::ITEM_IDENTIFIERS_KEY];
             $normalizationContext['linkClass'] = $source[ItemNormalizer::ITEM_RESOURCE_CLASS_KEY];
         }
 
-        return $this->provider->provide($resourceClass, $identifiers, $operationName, $normalizationContext);
+        return $this->provider->provide($resourceClass, $uriVariables, $operationName, $normalizationContext);
     }
 
     /**

src/HttpCache/EventListener/AddTagsListener.php

@@ -74,8 +74,8 @@ public function onKernelResponse(ResponseEvent $event): void
         $resources = $request->attributes->get('_resources');
         if (isset($attributes['collection_operation_name']) || ($attributes['subresource_context']['collection'] ?? false) || ($operation && $operation->isCollection())) {
             // Allows to purge collections
-            $identifiers = $this->getOperationIdentifiers($operation, $request->attributes->all(), $attributes['resource_class']);
-            $iri = $this->iriConverter instanceof IriConverterInterface ? $this->iriConverter->getIriFromResourceClass($attributes['resource_class'], $attributes['operation_name'] ?? null, UrlGeneratorInterface::ABS_PATH, ['identifiers_values' => $identifiers]) : $this->iriConverter->getIriFromResourceClass($attributes['resource_class'], UrlGeneratorInterface::ABS_PATH);
+            $uriVariables = $this->getOperationUriVariables($operation, $request->attributes->all(), $attributes['resource_class']);
+            $iri = $this->iriConverter instanceof IriConverterInterface ? $this->iriConverter->getIriFromResourceClass($attributes['resource_class'], $attributes['operation_name'] ?? null, UrlGeneratorInterface::ABS_PATH, ['identifiers_values' => $uriVariables]) : $this->iriConverter->getIriFromResourceClass($attributes['resource_class'], UrlGeneratorInterface::ABS_PATH);
             $resources[$iri] = $iri;
         }
 

src/Hydra/Serializer/ErrorNormalizer.php

@@ -14,7 +14,7 @@
 namespace ApiPlatform\Hydra\Serializer;
 
 use ApiPlatform\Api\UrlGeneratorInterface;
-use ApiPlatform\Core\Problem\Serializer\ErrorNormalizerTrait;
+use ApiPlatform\Problem\Serializer\ErrorNormalizerTrait;
 use Symfony\Component\Debug\Exception\FlattenException as LegacyFlattenException;
 use Symfony\Component\ErrorHandler\Exception\FlattenException;
 use Symfony\Component\Serializer\Normalizer\CacheableSupportsMethodInterface;

src/JsonApi/Serializer/ErrorNormalizer.php

@@ -13,7 +13,7 @@
 
 namespace ApiPlatform\JsonApi\Serializer;
 
-use ApiPlatform\Core\Problem\Serializer\ErrorNormalizerTrait;
+use ApiPlatform\Problem\Serializer\ErrorNormalizerTrait;
 use Symfony\Component\Debug\Exception\FlattenException as LegacyFlattenException;
 use Symfony\Component\ErrorHandler\Exception\FlattenException;
 use Symfony\Component\Serializer\Normalizer\CacheableSupportsMethodInterface;

src/Metadata/Property/Factory/LegacyPropertyMetadataFactory.php

@@ -13,9 +13,9 @@
 
 namespace ApiPlatform\Metadata\Property\Factory;
 
-use ApiPlatform\Core\Exception\ResourceClassNotFoundException;
 use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface as LegacyPropertyMetadataFactoryInterface;
 use ApiPlatform\Exception\PropertyNotFoundException;
+use ApiPlatform\Exception\ResourceClassNotFoundException;
 use ApiPlatform\Metadata\ApiProperty;
 use ApiPlatform\Metadata\Property\DeprecationMetadataTrait;
 
@@ -48,7 +48,7 @@ public function create(string $resourceClass, string $property, array $options =
         }
 
         try {
-            $legacyPropertyMetadata = $this->legacyPropertyMetadataFactory->create($resourceClass, $property, $options);
+            $legacyPropertyMetadata = $this->legacyPropertyMetadataFactory->create($resourceClass, $property, ['deprecate' => false] + $options);
         } catch (PropertyNotFoundException|ResourceClassNotFoundException $propertyNotFoundException) {
             return $propertyMetadata;
         }