fix: remove deprecations when bc flag is false

Author: soyuka

src/Core/Api/IdentifiersExtractor.php

@@ -34,9 +34,8 @@ final class IdentifiersExtractor implements IdentifiersExtractorInterface
     private $propertyMetadataFactory;
     private $propertyAccessor;
 
-    public function __construct(PropertyNameCollectionFactoryInterface $propertyNameCollectionFactory, PropertyMetadataFactoryInterface $propertyMetadataFactory, PropertyAccessorInterface $propertyAccessor = null, ResourceClassResolverInterface $resourceClassResolver = null)
+    public function __construct(PropertyNameCollectionFactoryInterface $propertyNameCollectionFactory, PropertyMetadataFactoryInterface $propertyMetadataFactory, PropertyAccessorInterface $propertyAccessor = null, ResourceClassResolverInterface $resourceClassResolver = null, bool $metadataBackwardCompatibilityLayer = null)
     {
-        trigger_deprecation('api-platform/core', '2.7', sprintf('The service "%s" is deprecated, use %s instead.', self::class, NewIdentifiersExtractor::class));
         $this->propertyNameCollectionFactory = $propertyNameCollectionFactory;
         $this->propertyMetadataFactory = $propertyMetadataFactory;
         $this->propertyAccessor = $propertyAccessor ?? PropertyAccess::createPropertyAccessor();
@@ -45,6 +44,10 @@ public function __construct(PropertyNameCollectionFactoryInterface $propertyName
         if (null === $this->resourceClassResolver) {
             @trigger_error(sprintf('Not injecting %s in the IdentifiersExtractor might introduce cache issues with object identifiers.', ResourceClassResolverInterface::class), \E_USER_DEPRECATED);
         }
+
+        if ($metadataBackwardCompatibilityLayer) {
+            trigger_deprecation('api-platform/core', '2.7', sprintf('The service "%s" is deprecated, use %s instead.', self::class, NewIdentifiersExtractor::class));
+        }
     }
 
     /**

src/Core/EventListener/ReadListener.php

@@ -49,8 +49,9 @@ final class ReadListener
     public const OPERATION_ATTRIBUTE_KEY = 'read';
 
     private $serializerContextBuilder;
+    private $metadataBackwardCompatibilityLayer;
 
-    public function __construct(CollectionDataProviderInterface $collectionDataProvider, ItemDataProviderInterface $itemDataProvider, SubresourceDataProviderInterface $subresourceDataProvider = null, SerializerContextBuilderInterface $serializerContextBuilder = null, IdentifierConverterInterface $identifierConverter = null, ResourceMetadataFactoryInterface $resourceMetadataFactory = null, ResourceMetadataCollectionFactoryInterface $resourceMetadataCollectionFactory = null)
+    public function __construct(CollectionDataProviderInterface $collectionDataProvider, ItemDataProviderInterface $itemDataProvider, SubresourceDataProviderInterface $subresourceDataProvider = null, SerializerContextBuilderInterface $serializerContextBuilder = null, IdentifierConverterInterface $identifierConverter = null, ResourceMetadataFactoryInterface $resourceMetadataFactory = null, ResourceMetadataCollectionFactoryInterface $resourceMetadataCollectionFactory = null, bool $metadataBackwardCompatibilityLayer = null)
     {
         $this->collectionDataProvider = $collectionDataProvider;
         $this->itemDataProvider = $itemDataProvider;
@@ -59,7 +60,11 @@ public function __construct(CollectionDataProviderInterface $collectionDataProvi
         $this->identifierConverter = $identifierConverter;
         $this->resourceMetadataFactory = $resourceMetadataFactory;
         $this->resourceMetadataCollectionFactory = $resourceMetadataCollectionFactory;
-        trigger_deprecation('api-platform/core', '2.7', sprintf('The listener "%s" is deprecated and will be replaced by "%s" in 3.0.', __CLASS__, SymfonyReadListener::class));
+        $this->metadataBackwardCompatibilityLayer = $metadataBackwardCompatibilityLayer;
+
+        if ($metadataBackwardCompatibilityLayer || null === $metadataBackwardCompatibilityLayer) {
+            trigger_deprecation('api-platform/core', '2.7', sprintf('The listener "%s" is deprecated and will be replaced by "%s" in 3.0.', __CLASS__, SymfonyReadListener::class));
+        }
     }
 
     /**
@@ -82,6 +87,10 @@ public function onKernelRequest(RequestEvent $event): void
             return;
         }
 
+        if (false === $this->metadataBackwardCompatibilityLayer) {
+            trigger_deprecation('api-platform/core', '2.7', 'The operation you requested uses legacy metadata, switch to #[ApiPlatform\Metadata\ApiResource].');
+        }
+
         if (null === $filters = $request->attributes->get('_api_filters')) {
             $queryString = RequestParser::getQueryString($request);
             $filters = $queryString ? RequestParser::parseRequestParams($queryString) : null;

src/Core/EventListener/WriteListener.php

@@ -45,16 +45,20 @@ final class WriteListener
     private $dataPersister;
     /** @var IriConverterLegacyInterface|IriConverterInterface|null */
     private $iriConverter;
+    private $metadataBackwardCompatibilityLayer;
 
-    public function __construct(DataPersisterInterface $dataPersister, $iriConverter = null, ResourceMetadataFactoryInterface $resourceMetadataFactory = null, ResourceClassResolverInterface $resourceClassResolver = null, ResourceMetadataCollectionFactoryInterface $resourceMetadataCollectionFactory = null)
+    public function __construct(DataPersisterInterface $dataPersister, $iriConverter = null, ResourceMetadataFactoryInterface $resourceMetadataFactory = null, ResourceClassResolverInterface $resourceClassResolver = null, ResourceMetadataCollectionFactoryInterface $resourceMetadataCollectionFactory = null, bool $metadataBackwardCompatibilityLayer = null)
     {
         $this->dataPersister = $dataPersister;
         $this->iriConverter = $iriConverter;
         $this->resourceMetadataFactory = $resourceMetadataFactory;
         $this->resourceClassResolver = $resourceClassResolver;
         $this->resourceMetadataCollectionFactory = $resourceMetadataCollectionFactory;
+        $this->metadataBackwardCompatibilityLayer = $metadataBackwardCompatibilityLayer;
 
-        trigger_deprecation('api-platform/core', '2.7', sprintf('The listener "%s" is deprecated and will be removed in 3.0, use "%s" instead', __CLASS__, \ApiPlatform\Symfony\EventListener\WriteListener::class));
+        if ($metadataBackwardCompatibilityLayer || null === $metadataBackwardCompatibilityLayer) {
+            trigger_deprecation('api-platform/core', '2.7', sprintf('The listener "%s" is deprecated and will be removed in 3.0, use "%s" instead', __CLASS__, \ApiPlatform\Symfony\EventListener\WriteListener::class));
+        }
     }
 
     /**
@@ -77,6 +81,10 @@ public function onKernelView(ViewEvent $event): void
             return;
         }
 
+        if (false === $this->metadataBackwardCompatibilityLayer) {
+            trigger_deprecation('api-platform/core', '2.7', 'The operation you requested uses legacy metadata, switch to #[ApiPlatform\Metadata\ApiResource].');
+        }
+
         if (!$this->dataPersister->supports($controllerResult, $attributes)) {
             return;
         }

src/Core/Operation/Factory/SubresourceOperationFactory.php

@@ -38,7 +38,6 @@ final class SubresourceOperationFactory implements SubresourceOperationFactoryIn
 
     public function __construct(ResourceMetadataFactoryInterface $resourceMetadataFactory, PropertyNameCollectionFactoryInterface $propertyNameCollectionFactory, PropertyMetadataFactoryInterface $propertyMetadataFactory, PathSegmentNameGeneratorInterface $pathSegmentNameGenerator, IdentifiersExtractorInterface $identifiersExtractor = null)
     {
-        trigger_deprecation('api-platform/core', '2.7', 'Subresources are deprecated, use alternate URLs instead.');
         $this->resourceMetadataFactory = $resourceMetadataFactory;
         $this->propertyNameCollectionFactory = $propertyNameCollectionFactory;
         $this->propertyMetadataFactory = $propertyMetadataFactory;
@@ -51,7 +50,10 @@ public function __construct(ResourceMetadataFactoryInterface $resourceMetadataFa
      */
     public function create(string $resourceClass): array
     {
+        trigger_deprecation('api-platform/core', '2.7', 'Subresources are deprecated, use alternate URLs instead.');
+
         $tree = [];
+
         try {
             $this->computeSubresourceOperations($resourceClass, $tree);
         } catch (ResourceClassNotFoundException $e) {

src/Symfony/Bundle/Resources/config/legacy/identifiers.xml

@@ -9,6 +9,7 @@
             <argument type="service" id="api_platform.metadata.property.metadata_factory.legacy" />
             <argument type="service" id="api_platform.property_accessor" />
             <argument type="service" id="api_platform.resource_class_resolver" />
+            <argument>%api_platform.metadata_backward_compatibility_layer%</argument>
         </service>
 
         <service id="api_platform.identifiers_extractor.cached" class="ApiPlatform\Core\Api\CachedIdentifiersExtractor" decorates="api_platform.identifiers_extractor.legacy" public="false">

src/Symfony/Bundle/Resources/config/v3/backward_compatibility.xml

@@ -49,6 +49,8 @@
             <argument type="service" id="api_platform.serializer.context_builder" />
             <argument type="service" id="api_platform.identifier.converter" />
             <argument type="service" id="api_platform.metadata.resource.metadata_factory" />
+            <argument>null</argument>
+            <argument>%api_platform.metadata_backward_compatibility_layer%</argument>
 
             <tag name="kernel.event_listener" event="kernel.request" method="onKernelRequest" priority="4" />
         </service>