[TypeInfo] Handle collection types properly

mtarld · mtarld · commit 55fc9bf611bd · 2024-04-18T15:06:48.000+02:00
diff --git a/src/Symfony/Component/TypeInfo/Tests/Fixtures/DummyCollection.php b/src/Symfony/Component/TypeInfo/Tests/Fixtures/DummyCollection.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Symfony\Component\TypeInfo\Tests\Fixtures;
+
+final class DummyCollection implements \IteratorAggregate
+{
+    public function getIterator(): \Traversable
+    {
+        return [];
+    }
+}
diff --git a/src/Symfony/Component/TypeInfo/Tests/TypeResolver/StringTypeResolverTest.php b/src/Symfony/Component/TypeInfo/Tests/TypeResolver/StringTypeResolverTest.php
@@ -16,6 +16,7 @@
 use Symfony\Component\TypeInfo\Exception\UnsupportedException;
 use Symfony\Component\TypeInfo\Tests\Fixtures\AbstractDummy;
 use Symfony\Component\TypeInfo\Tests\Fixtures\Dummy;
+use Symfony\Component\TypeInfo\Tests\Fixtures\DummyCollection;
 use Symfony\Component\TypeInfo\Tests\Fixtures\DummyWithTemplates;
 use Symfony\Component\TypeInfo\Type;
 use Symfony\Component\TypeInfo\TypeContext\TypeContext;
@@ -150,6 +151,7 @@ public function resolveDataProvider(): iterable
         yield [Type::collection(Type::object(\IteratorAggregate::class)), \IteratorAggregate::class];
         yield [Type::collection(Type::object(\IteratorAggregate::class), Type::string()), \IteratorAggregate::class.'<string>'];
         yield [Type::collection(Type::object(\IteratorAggregate::class), Type::bool(), Type::string()), \IteratorAggregate::class.'<string, bool>'];
+        yield [Type::collection(Type::object(DummyCollection::class), Type::bool(), Type::string()), DummyCollection::class.'<string, bool>'];
     }
 
     public function testCannotResolveNonStringType()
diff --git a/src/Symfony/Component/TypeInfo/TypeResolver/StringTypeResolver.php b/src/Symfony/Component/TypeInfo/TypeResolver/StringTypeResolver.php
@@ -53,8 +53,6 @@
  */
 final class StringTypeResolver implements TypeResolverInterface
 {
-    private const COLLECTION_CLASS_NAMES = [\Traversable::class, \Iterator::class, \IteratorAggregate::class, \ArrayAccess::class, \Generator::class];
-
     /**
      * @var array<string, bool>
      */
@@ -164,7 +162,7 @@ private function getTypeFromNode(TypeNode $node, ?TypeContext $typeContext): Typ
                 default => $this->resolveCustomIdentifier($node->name, $typeContext),
             };
 
-            if ($type instanceof ObjectType && \in_array($type->getClassName(), self::COLLECTION_CLASS_NAMES, true)) {
+            if ($type instanceof ObjectType && (\is_a($type->getClassName(), \Traversable::class, true) || \is_a($type->getClassName(), \ArrayAccess::class, true))) {
                 return Type::collection($type);
             }
 
