refactor

Author: Maxcastel

src/Metadata/Resource/Factory/ParameterResourceMetadataCollectionFactory.php

@@ -27,8 +27,7 @@
 use ApiPlatform\Metadata\Property\Factory\PropertyMetadataFactoryInterface;
 use ApiPlatform\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface;
 use ApiPlatform\Metadata\Resource\ResourceMetadataCollection;
-use ApiPlatform\Metadata\ResourceClassResolverInterface;
-use ApiPlatform\Metadata\Util\TypeHelper;
+use ApiPlatform\Metadata\Util\ResourceClassInfoTrait;
 use ApiPlatform\OpenApi\Model\Parameter as OpenApiParameter;
 use ApiPlatform\Serializer\Filter\FilterInterface as SerializerFilterInterface;
 use ApiPlatform\State\Parameter\ValueCaster;
@@ -44,6 +43,7 @@
  */
 final class ParameterResourceMetadataCollectionFactory implements ResourceMetadataCollectionFactoryInterface
 {
+    use ResourceClassInfoTrait;
     use StateOptionsTrait;
 
     private array $localPropertyCache = [];
@@ -55,7 +55,6 @@ public function __construct(
         private readonly ?ContainerInterface $filterLocator = null,
         private readonly ?NameConverterInterface $nameConverter = null,
         private readonly ?LoggerInterface $logger = null,
-        private readonly ?ResourceClassResolverInterface $resourceClassResolver = null,
     ) {
     }
 
@@ -121,7 +120,7 @@ private function getProperties(string $resourceClass, ?Parameter $parameter = nu
                     }
 
                     if (!$isLastPart) {
-                        $nextClass = $this->getClassFromProperty($propertyMetadata);
+                        $nextClass = $this->getClassNameFromProperty($propertyMetadata);
 
                         if (!$nextClass) {
                             break;
@@ -167,30 +166,6 @@ private function getProperties(string $resourceClass, ?Parameter $parameter = nu
         return $this->localPropertyCache[$k];
     }
 
-    private function getClassFromProperty(ApiProperty $propertyMetadata): ?string
-    {
-        if (!($type = $propertyMetadata->getNativeType())) {
-            return null;
-        }
-
-        $className = $this->extractClassNameFromType($type);
-
-        if ($className && $this->resourceClassResolver?->isResourceClass($className)) {
-            return $className;
-        }
-
-        return null;
-    }
-
-    private function extractClassNameFromType(Type $type): ?string
-    {
-        if ($collectionValueType = TypeHelper::getCollectionValueType($type)) {
-            return TypeHelper::getClassName($collectionValueType);
-        }
-
-        return TypeHelper::getClassName($type);
-    }
-
     private function getDefaultParameters(Operation $operation, string $resourceClass, int &$internalPriority): Parameters
     {
         $propertyNames = $properties = [];

src/Metadata/Util/ResourceClassInfoTrait.php

@@ -13,8 +13,10 @@
 
 namespace ApiPlatform\Metadata\Util;
 
+use ApiPlatform\Metadata\ApiProperty;
 use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
 use ApiPlatform\Metadata\ResourceClassResolverInterface;
+use Symfony\Component\TypeInfo\Type;
 
 /**
  * Retrieves information about a resource class.
@@ -63,4 +65,28 @@ private function isResourceClass(string $class): bool
         // assume that it's a resource class
         return true;
     }
+
+    private function getTypeFromProperty(ApiProperty $propertyMetadata): ?Type
+    {
+        return $propertyMetadata->getNativeType();
+    }
+
+    private function extractClassNameFromType(Type $type): ?string
+    {
+        return TypeHelper::getClassName(TypeHelper::getCollectionValueType($type) ?? $type);
+    }
+
+    /**
+     * Gets the class name from a property metadata if it's a resource class.
+     */
+    protected function getClassNameFromProperty(ApiProperty $propertyMetadata): ?string
+    {
+        if (!($type = $this->getTypeFromProperty($propertyMetadata))) {
+            return null;
+        }
+
+        $className = $this->extractClassNameFromType($type);
+
+        return $className && $this->isResourceClass($className) ? $className : null;
+    }
 }

src/Symfony/Bundle/Resources/config/metadata/resource.php

@@ -151,7 +151,6 @@
             service('api_platform.filter_locator')->ignoreOnInvalid(),
             service('api_platform.name_converter')->ignoreOnInvalid(),
             service('logger')->ignoreOnInvalid(),
-            service('api_platform.resource_class_resolver')->ignoreOnInvalid(),
         ]);
 
     $services->set('api_platform.metadata.resource.metadata_collection_factory.cached', CachedResourceMetadataCollectionFactory::class)