revert introduction of metadata factory

Author: soyuka

src/State/Provider/DeserializeProvider.php

@@ -13,10 +13,8 @@
 
 namespace ApiPlatform\State\Provider;
 
-use ApiPlatform\Metadata\Exception\OperationNotFoundException;
 use ApiPlatform\Metadata\HttpOperation;
 use ApiPlatform\Metadata\Operation;
-use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
 use ApiPlatform\State\ProviderInterface;
 use ApiPlatform\State\SerializerContextBuilderInterface;
 use ApiPlatform\Validator\Exception\ValidationException;
@@ -38,7 +36,6 @@ public function __construct(
         private readonly ?ProviderInterface $decorated,
         private readonly SerializerInterface $serializer,
         private readonly SerializerContextBuilderInterface $serializerContextBuilder,
-        private readonly ResourceMetadataCollectionFactoryInterface $resourceMetadataCollectionFactory,
         private ?TranslatorInterface $translator = null,
     ) {
         if (null === $this->translator) {
@@ -127,16 +124,8 @@ private function normalizeExpectedTypes(?array $expectedTypes = null): array
             $normalizedType = $expectedType;
 
             if (class_exists($expectedType) || interface_exists($expectedType)) {
-                try {
-                    $normalizedType = $this->resourceMetadataCollectionFactory->create($expectedType)->getOperation()->getShortName();
-                } catch (OperationNotFoundException) {
-                    // Do nothing
-                }
-
-                if (null === $normalizedType) {
-                    $classReflection = new \ReflectionClass($expectedType);
-                    $normalizedType = $classReflection->getShortName();
-                }
+                $classReflection = new \ReflectionClass($expectedType);
+                $normalizedType = $classReflection->getShortName();
             }
 
             $normalizedTypes[] = $normalizedType;

src/State/Tests/Provider/DeserializeProviderTest.php

@@ -15,7 +15,6 @@
 
 use ApiPlatform\Metadata\Get;
 use ApiPlatform\Metadata\Post;
-use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
 use ApiPlatform\State\Provider\DeserializeProvider;
 use ApiPlatform\State\ProviderInterface;
 use ApiPlatform\State\SerializerContextBuilderInterface;
@@ -39,9 +38,8 @@ public function testDeserialize(): void
         $serializerContextBuilder->expects($this->once())->method('createFromRequest')->willReturn($serializerContext);
         $serializer = $this->createMock(SerializerInterface::class);
         $serializer->expects($this->once())->method('deserialize')->with('test', 'Test', 'format', ['uri_variables' => ['id' => 1], AbstractNormalizer::OBJECT_TO_POPULATE => $objectToPopulate] + $serializerContext)->willReturn(new \stdClass());
-        $resourceMetadataCollectionFactoryInterface = $this->createMock(ResourceMetadataCollectionFactoryInterface::class);
 
-        $provider = new DeserializeProvider($decorated, $serializer, $serializerContextBuilder, $resourceMetadataCollectionFactoryInterface);
+        $provider = new DeserializeProvider($decorated, $serializer, $serializerContextBuilder);
         $request = new Request(content: 'test');
         $request->headers->set('CONTENT_TYPE', 'ok');
         $request->attributes->set('input_format', 'format');
@@ -57,9 +55,8 @@ public function testDeserializeNoContentType(): void
 
         $serializerContextBuilder = $this->createMock(SerializerContextBuilderInterface::class);
         $serializer = $this->createMock(SerializerInterface::class);
-        $resourceMetadataCollectionFactoryInterface = $this->createMock(ResourceMetadataCollectionFactoryInterface::class);
 
-        $provider = new DeserializeProvider($decorated, $serializer, $serializerContextBuilder, $resourceMetadataCollectionFactoryInterface);
+        $provider = new DeserializeProvider($decorated, $serializer, $serializerContextBuilder);
         $request = new Request(content: 'test');
         $request->attributes->set('input_format', 'format');
         $provider->provide($operation, ['id' => 1], ['request' => $request]);
@@ -74,9 +71,8 @@ public function testDeserializeNoInput(): void
 
         $serializerContextBuilder = $this->createMock(SerializerContextBuilderInterface::class);
         $serializer = $this->createMock(SerializerInterface::class);
-        $resourceMetadataCollectionFactoryInterface = $this->createMock(ResourceMetadataCollectionFactoryInterface::class);
 
-        $provider = new DeserializeProvider($decorated, $serializer, $serializerContextBuilder, $resourceMetadataCollectionFactoryInterface);
+        $provider = new DeserializeProvider($decorated, $serializer, $serializerContextBuilder);
         $request = new Request(content: 'test');
         $request->headers->set('CONTENT_TYPE', 'ok');
         $provider->provide($operation, ['id' => 1], ['request' => $request]);
@@ -93,9 +89,8 @@ public function testDeserializeWithContextClass(): void
         $serializerContextBuilder->expects($this->once())->method('createFromRequest')->willReturn($serializerContext);
         $serializer = $this->createMock(SerializerInterface::class);
         $serializer->expects($this->once())->method('deserialize')->with('test', 'Test', 'format', ['uri_variables' => ['id' => 1]] + $serializerContext)->willReturn(new \stdClass());
-        $resourceMetadataCollectionFactoryInterface = $this->createMock(ResourceMetadataCollectionFactoryInterface::class);
 
-        $provider = new DeserializeProvider($decorated, $serializer, $serializerContextBuilder, $resourceMetadataCollectionFactoryInterface);
+        $provider = new DeserializeProvider($decorated, $serializer, $serializerContextBuilder);
         $request = new Request(content: 'test');
         $request->headers->set('CONTENT_TYPE', 'ok');
         $request->attributes->set('input_format', 'format');
@@ -110,9 +105,8 @@ public function testRequestWithEmptyContentType(): void
 
         $serializer = $this->createStub(SerializerInterface::class);
         $serializerContextBuilder = $this->createStub(SerializerContextBuilderInterface::class);
-        $resourceMetadataCollectionFactoryInterface = $this->createMock(ResourceMetadataCollectionFactoryInterface::class);
 
-        $provider = new DeserializeProvider($decorated, $serializer, $serializerContextBuilder, $resourceMetadataCollectionFactoryInterface);
+        $provider = new DeserializeProvider($decorated, $serializer, $serializerContextBuilder);
 
         // in Symfony (at least up to 7.0.2, 6.4.2, 6.3.11, 5.4.34), a request
         // without a content-type and content-length header will result in the

src/Symfony/Bundle/Resources/config/state/provider.xml

@@ -22,7 +22,6 @@
             <argument type="service" id="api_platform.state_provider.deserialize.inner" />
             <argument type="service" id="api_platform.serializer" />
             <argument type="service" id="api_platform.serializer.context_builder" />
-            <argument type="service" id="api_platform.metadata.resource.metadata_collection_factory" />
             <argument type="service" id="translator" on-invalid="null" />
         </service>
 

src/Symfony/Bundle/Resources/config/symfony/events.xml

@@ -37,7 +37,6 @@
             <argument>null</argument>
             <argument type="service" id="api_platform.serializer" />
             <argument type="service" id="api_platform.serializer.context_builder" />
-            <argument type="service" id="api_platform.metadata.resource.metadata_collection_factory" />
             <argument type="service" id="translator" on-invalid="null" />
         </service>