refactor: detect collection type using TypeHelper

Author: soyuka

src/Hal/Serializer/ItemNormalizer.php

@@ -21,6 +21,7 @@
 use ApiPlatform\Metadata\ResourceClassResolverInterface;
 use ApiPlatform\Metadata\UrlGeneratorInterface;
 use ApiPlatform\Metadata\Util\ClassInfoTrait;
+use ApiPlatform\Metadata\Util\TypeHelper;
 use ApiPlatform\Serializer\AbstractItemNormalizer;
 use ApiPlatform\Serializer\CacheKeyTrait;
 use ApiPlatform\Serializer\ContextTrait;
@@ -39,7 +40,6 @@
 use Symfony\Component\TypeInfo\Type\CollectionType;
 use Symfony\Component\TypeInfo\Type\CompositeTypeInterface;
 use Symfony\Component\TypeInfo\Type\ObjectType;
-use Symfony\Component\TypeInfo\Type\WrappingTypeInterface;
 
 /**
  * Converts between objects and array including HAL metadata.
@@ -212,17 +212,8 @@ private function getComponents(object $object, ?string $format, array $context):
                         $isOne = $className && $this->resourceClassResolver->isResourceClass($className);
                     }
                 } elseif ($type instanceof Type) {
-                    $typeIsCollection = function (Type $type) use (&$typeIsCollection, &$valueType): bool {
-                        return match (true) {
-                            $type instanceof CollectionType => null !== $valueType = $type->getCollectionValueType(),
-                            $type instanceof WrappingTypeInterface => $type->wrappedTypeIsSatisfiedBy($typeIsCollection),
-                            $type instanceof CompositeTypeInterface => $type->composedTypesAreSatisfiedBy($typeIsCollection),
-                            default => false,
-                        };
-                    };
-
-                    if ($type->isSatisfiedBy($typeIsCollection)) {
-                        $isMany = $valueType->isSatisfiedBy($typeIsResourceClass);
+                    if ($type->isSatisfiedBy(fn ($t) => $t instanceof CollectionType)) {
+                        $isMany = TypeHelper::getCollectionValueType($type)?->isSatisfiedBy($typeIsResourceClass);
                     } else {
                         $isOne = $type->isSatisfiedBy($typeIsResourceClass);
                     }

src/Hydra/Serializer/DocumentationNormalizer.php

@@ -29,16 +29,15 @@
 use ApiPlatform\Metadata\Resource\ResourceMetadataCollection;
 use ApiPlatform\Metadata\ResourceClassResolverInterface;
 use ApiPlatform\Metadata\UrlGeneratorInterface;
+use ApiPlatform\Metadata\Util\TypeHelper;
 use Symfony\Component\PropertyInfo\PropertyInfoExtractor;
 use Symfony\Component\PropertyInfo\Type as LegacyType;
 use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Component\TypeInfo\Type;
 use Symfony\Component\TypeInfo\Type\CollectionType;
-use Symfony\Component\TypeInfo\Type\CompositeTypeInterface;
 use Symfony\Component\TypeInfo\Type\ObjectType;
-use Symfony\Component\TypeInfo\Type\WrappingTypeInterface;
 use Symfony\Component\TypeInfo\TypeIdentifier;
 
 use const ApiPlatform\JsonLd\HYDRA_CONTEXT;
@@ -371,19 +370,8 @@ private function getRange(ApiProperty $propertyMetadata): array|string|null
                 return null;
             }
 
-            /** @var Type|null $collectionValueType */
-            $collectionValueType = null;
-            $typeIsCollection = static function (Type $type) use (&$typeIsCollection, &$collectionValueType): bool {
-                return match (true) {
-                    $type instanceof CollectionType => null !== $collectionValueType = $type->getCollectionValueType(),
-                    $type instanceof WrappingTypeInterface => $type->wrappedTypeIsSatisfiedBy($typeIsCollection),
-                    $type instanceof CompositeTypeInterface => $type->composedTypesAreSatisfiedBy($typeIsCollection),
-                    default => false,
-                };
-            };
-
-            if ($nativeType->isSatisfiedBy($typeIsCollection)) {
-                $nativeType = $collectionValueType;
+            if ($nativeType->isSatisfiedBy(fn ($t) => $t instanceof CollectionType)) {
+                $nativeType = TypeHelper::getCollectionValueType($nativeType);
             }
 
             // Check for specific types after potentially unwrapping the collection

src/JsonApi/Serializer/ConstraintViolationListNormalizer.php

@@ -17,10 +17,7 @@
 use Symfony\Component\PropertyInfo\PropertyInfoExtractor;
 use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
-use Symfony\Component\TypeInfo\Type;
-use Symfony\Component\TypeInfo\Type\CompositeTypeInterface;
 use Symfony\Component\TypeInfo\Type\ObjectType;
-use Symfony\Component\TypeInfo\Type\WrappingTypeInterface;
 use Symfony\Component\Validator\ConstraintViolationInterface;
 use Symfony\Component\Validator\ConstraintViolationListInterface;
 
@@ -94,15 +91,7 @@ private function getSourcePointerFromViolation(ConstraintViolationInterface $vio
                 return "data/relationships/$fieldName";
             }
         } else {
-            $typeIsObject = static function (Type $type) use (&$typeIsObject): bool {
-                return match (true) {
-                    $type instanceof WrappingTypeInterface => $type->wrappedTypeIsSatisfiedBy($typeIsObject),
-                    $type instanceof CompositeTypeInterface => $type->composedTypesAreSatisfiedBy($typeIsObject),
-                    default => $type instanceof ObjectType,
-                };
-            };
-
-            if ($propertyMetadata->getNativeType()?->isSatisfiedBy($typeIsObject)) {
+            if ($propertyMetadata->getNativeType()?->isSatisfiedBy(fn ($t) => $t instanceof ObjectType)) {
                 return "data/relationships/$fieldName";
             }
         }

src/JsonSchema/SchemaFactory.php

@@ -22,14 +22,14 @@
 use ApiPlatform\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface;
 use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
 use ApiPlatform\Metadata\ResourceClassResolverInterface;
+use ApiPlatform\Metadata\Util\TypeHelper;
 use Symfony\Component\PropertyInfo\PropertyInfoExtractor;
 use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\TypeInfo\Type\BuiltinType;
 use Symfony\Component\TypeInfo\Type\CollectionType;
 use Symfony\Component\TypeInfo\Type\CompositeTypeInterface;
 use Symfony\Component\TypeInfo\Type\ObjectType;
-use Symfony\Component\TypeInfo\Type\WrappingTypeInterface;
 use Symfony\Component\TypeInfo\TypeIdentifier;
 
 /**
@@ -331,11 +331,7 @@ private function buildPropertySchema(Schema $schema, string $definitionName, str
                 $isCollection = $t instanceof CollectionType;
 
                 if ($isCollection) {
-                    $valueType = $t->getCollectionValueType();
-                }
-
-                while ($valueType instanceof WrappingTypeInterface) {
-                    $valueType = $valueType->getWrappedType();
+                    $valueType = TypeHelper::getCollectionValueType($t);
                 }
 
                 if (!$valueType instanceof ObjectType) {