[LiveComponent] Remove conflict with symfony/type-info:<7.3, add compatibility layer

Author: Kocal

src/LiveComponent/composer.json

@@ -57,7 +57,6 @@
     },
     "conflict": {
         "symfony/config": "<5.4.0",
-        "symfony/type-info": "<7.3",
         "symfony/property-info": "~7.0.0"
     },
     "config": {

src/LiveComponent/src/LiveComponentHydrator.php

@@ -37,6 +37,7 @@
 use Symfony\UX\LiveComponent\Metadata\LiveComponentMetadataFactory;
 use Symfony\UX\LiveComponent\Metadata\LivePropMetadata;
 use Symfony\UX\LiveComponent\Util\DehydratedProps;
+use Symfony\UX\LiveComponent\Util\TypeHelper;
 use Symfony\UX\TwigComponent\ComponentAttributes;
 use Twig\Environment;
 use Twig\Runtime\EscaperRuntime;
@@ -314,7 +315,7 @@ public function hydrateValue(mixed $value, LivePropMetadata|LegacyLivePropMetada
                 }
 
                 $isCollection = false;
-                foreach ($type->traverse() as $t) {
+                foreach (TypeHelper::traverse($type) as $t) {
                     if ($isCollection = $type instanceof CollectionType) {
                         $isCollection = true;
                         $type = $type->getCollectionValueType();
@@ -363,7 +364,7 @@ public function hydrateValue(mixed $value, LivePropMetadata|LegacyLivePropMetada
             return $this->hydrateObjectValue($value, $propMetadata->getType(), $propMetadata->allowsNull(), $propMetadata->getFormat(), $parentObject::class, $propMetadata->getName(), $parentObject);
         } else {
             $collectionValueType = null;
-            foreach ($type->traverse() as $t) {
+            foreach (TypeHelper::traverse($type) as $t) {
                 if ($t instanceof CollectionType) {
                     $collectionValueType = $t->getCollectionValueType();
 
@@ -372,7 +373,7 @@ public function hydrateValue(mixed $value, LivePropMetadata|LegacyLivePropMetada
             }
 
             if ($collectionValueType) {
-                foreach ($collectionValueType->traverse() as $t) {
+                foreach (TypeHelper::traverse($collectionValueType) as $t) {
                     if ($t instanceof ObjectType) {
                         foreach ($value as $key => $objectItem) {
                             $value[$key] = $this->hydrateObjectValue($objectItem, $t->getClassName(), true, $propMetadata->getFormat(), $parentObject::class, \sprintf('%s.%s', $propMetadata->getName(), $key), $parentObject);
@@ -387,7 +388,7 @@ public function hydrateValue(mixed $value, LivePropMetadata|LegacyLivePropMetada
                 return self::coerceStringValue($value, $type, $type->isNullable());
             }
 
-            foreach ($type->traverse() as $t) {
+            foreach (TypeHelper::traverse($type) as $t) {
                 if ($t instanceof ObjectType) {
                     return $this->hydrateObjectValue($value, $t->getClassName(), $type->isNullable(), $propMetadata->getFormat(), $parentObject::class, $propMetadata->getName(), $parentObject);
                 }
@@ -573,15 +574,15 @@ private function dehydrateValue(mixed $value, LivePropMetadata|LegacyLivePropMet
             } else {
                 $collectionValueType = null;
 
-                foreach ($propMetadata->getType()?->traverse() ?? [] as $t) {
+                foreach ($propMetadata->getType() ? TypeHelper::traverse($propMetadata->getType()) : [] as $t) {
                     if ($t instanceof CollectionType) {
                         $collectionValueType = $t->getCollectionValueType();
 
                         break;
                     }
                 }
 
-                foreach ($collectionValueType?->traverse() ?? [] as $t) {
+                foreach ($collectionValueType ? TypeHelper::traverse($collectionValueType) : [] as $t) {
                     if ($t instanceof ObjectType) {
                         foreach ($value as $key => $objectItem) {
                             if (!$t->accepts($objectItem)) {
@@ -618,7 +619,7 @@ private function dehydrateValue(mixed $value, LivePropMetadata|LegacyLivePropMet
 
             return $this->dehydrateObjectValue($value, $propMetadata->getType(), $propMetadata->getFormat(), $parentObject);
         } else {
-            foreach ($propMetadata->getType()?->traverse() ?? [] as $t) {
+            foreach ($propMetadata->getType() ? TypeHelper::traverse($propMetadata->getType()) : [] as $t) {
                 if ($t instanceof ObjectType) {
                     return $this->dehydrateObjectValue($value, $t->getClassName(), $propMetadata->getFormat(), $parentObject);
                 }

src/LiveComponent/src/Util/TypeHelper.php

@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\UX\LiveComponent\Util;
+
+use Symfony\Component\TypeInfo\Type;
+use Symfony\Component\TypeInfo\Type\CompositeTypeInterface;
+use Symfony\Component\TypeInfo\Type\WrappingTypeInterface;
+
+/**
+ * @author Hugo Alliaume <[email protected]>
+ *
+ * @internal
+ */
+final class TypeHelper
+{
+    /**
+     * TODO: To remove when supporting symfony/type-info >=7.3 only.
+     *
+     * Traverses the whole type tree.
+     *
+     * @return iterable<Type>
+     */
+    public static function traverse(Type $type, bool $traverseComposite = true, bool $traverseWrapped = true): iterable
+    {
+        if (method_exists($type, 'traverse')) {
+            yield from $type->traverse($traverseComposite, $traverseWrapped);
+        } else {
+            yield $type;
+
+            if ($type instanceof CompositeTypeInterface && $traverseComposite) {
+                foreach ($type->getTypes() as $innerType) {
+                    yield $innerType;
+                }
+
+                // prevent yielding twice when having a type that is both composite and wrapped
+                return;
+            }
+
+            if ($type instanceof WrappingTypeInterface && $traverseWrapped) {
+                yield $type->getWrappedType();
+            }
+        }
+    }
+}