prs got merged

Author: soyuka

src/Metadata/Property/Factory/SerializerPropertyMetadataFactory.php

@@ -65,7 +65,7 @@ public function create(string $resourceClass, string $property, array $options =
         $propertyMetadata = $this->transformReadWrite($propertyMetadata, $resourceClass, $property, $normalizationGroups, $denormalizationGroups, $ignoredAttributes);
 
         $type = $propertyMetadata->getPhpType();
-        if (null !== $type && !$this->isResourceClass($resourceClass) && TypeHelper::isSatisfiedBy($type, static fn (Type $t): bool => $t instanceof CollectionType)) {
+        if (null !== $type && !$this->isResourceClass($resourceClass) && $type->isSatisfiedBy(static fn (Type $t): bool => $t instanceof CollectionType)) {
             return $propertyMetadata->withReadableLink(true)->withWritableLink(true);
         }
 

src/Metadata/UriVariablesConverter.php

@@ -16,7 +16,6 @@
 use ApiPlatform\Metadata\Exception\InvalidUriVariableException;
 use ApiPlatform\Metadata\Property\Factory\PropertyMetadataFactoryInterface;
 use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
-use ApiPlatform\Metadata\Util\TypeHelper;
 use Symfony\Component\TypeInfo\Type\CompositeTypeInterface;
 use Symfony\Component\TypeInfo\Type\WrappingTypeInterface;
 
@@ -91,7 +90,7 @@ private function getIdentifierTypeStrings(string $resourceClass, array $properti
                 continue;
             }
 
-            foreach (TypeHelper::traverse($type) as $t) {
+            foreach ($type->traverse() as $t) {
                 if (!$t instanceof CompositeTypeInterface && !$t instanceof WrappingTypeInterface) {
                     $typeStrings[] = (string) $t;
                 }

src/Metadata/Util/TypeHelper.php

@@ -15,9 +15,7 @@
 
 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;
 
 /**
  * @internal
@@ -30,50 +28,9 @@ private function __construct()
     {
     }
 
-    /**
-     * https://github.com/symfony/symfony/pull/59845.
-     *
-     * @return iterable<Type>
-     */
-    public static function traverse(Type $type, bool $traverseComposite = true, bool $traverseWrapped = true): iterable
-    {
-        yield $type;
-
-        if ($type instanceof CompositeTypeInterface && $traverseComposite) {
-            foreach ($type->getTypes() as $t) {
-                yield $t;
-            }
-
-            // prevent yielding twice when having a type that is both composite and wrapped
-            return;
-        }
-
-        if ($type instanceof WrappingTypeInterface && $traverseWrapped) {
-            yield $type->getWrappedType();
-        }
-    }
-
-    /**
-     * https://github.com/symfony/symfony/pull/59844.
-     *
-     * @param callable(Type): bool $specification
-     */
-    public static function isSatisfiedBy(Type $type, callable $specification): bool
-    {
-        if ($type instanceof WrappingTypeInterface && $type->wrappedTypeIsSatisfiedBy($specification)) {
-            return true;
-        }
-
-        if ($type instanceof CompositeTypeInterface && $type->composedTypesAreSatisfiedBy($specification)) {
-            return true;
-        }
-
-        return $specification($type);
-    }
-
     public static function getCollectionValueType(Type $type): ?Type
     {
-        foreach (self::traverse($type) as $t) {
+        foreach ($type->traverse() as $t) {
             if ($t instanceof CollectionType) {
                 return $t->getCollectionValueType();
             }
@@ -87,7 +44,7 @@ public static function getCollectionValueType(Type $type): ?Type
      */
     public static function getClassName(Type $type): ?string
     {
-        foreach (self::traverse($type) as $t) {
+        foreach ($type->traverse() as $t) {
             if ($t instanceof ObjectType) {
                 return $t->getClassName();
             }