Replace Collection with GenericType

src/TypeResolver.php

@@ -56,11 +56,11 @@
 use phpDocumentor\Reflection\Types\Callable_;
 use phpDocumentor\Reflection\Types\CallableParameter;
 use phpDocumentor\Reflection\Types\ClassString;
-use phpDocumentor\Reflection\Types\Collection;
 use phpDocumentor\Reflection\Types\Compound;
 use phpDocumentor\Reflection\Types\Context;
 use phpDocumentor\Reflection\Types\Expression;
 use phpDocumentor\Reflection\Types\Float_;
+use phpDocumentor\Reflection\Types\GenericType;
 use phpDocumentor\Reflection\Types\Integer;
 use phpDocumentor\Reflection\Types\InterfaceString;
 use phpDocumentor\Reflection\Types\Intersection;
@@ -460,15 +460,14 @@ private function createFromGeneric(GenericTypeNode $type, Context $context): Typ
                 return new Self_(...$this->createTypesByTypeNodes($type->genericTypes, $context));
 
             default:
-                $collectionType = $this->createType($type->type, $context);
-                if ($collectionType instanceof Object_ === false) {
-                    throw new RuntimeException(sprintf('%s is not a collection', (string) $collectionType));
+                $mainType = $this->createType($type->type, $context);
+                if ($mainType instanceof Object_ === false) {
+                    throw new RuntimeException(sprintf('%s is an unsupported generic', (string) $mainType));
                 }
 
-                return new Collection(
-                    $collectionType->getFqsen(),
-                    ...array_reverse($this->createTypesByTypeNodes($type->genericTypes, $context))
-                );
+                $types = $this->createTypesByTypeNodes($type->genericTypes, $context);
+
+                return new GenericType($mainType->getFqsen(), $types);
         }
     }
 

src/Types/AbstractList.php

@@ -16,7 +16,7 @@
 use phpDocumentor\Reflection\Type;
 
 /**
- * Represents a list of values. This is an abstract class for Array_ and Collection.
+ * Represents a list of values. This is an abstract class for Array_ and List_.
  *
  * @psalm-immutable
  */

src/Types/GenericType.php

@@ -0,0 +1,62 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\Types;
+
+use phpDocumentor\Reflection\Fqsen;
+use phpDocumentor\Reflection\Type;
+
+use function implode;
+
+/**
+ * Value Object representing a type with generics.
+ *
+ * @psalm-immutable
+ */
+final class GenericType implements Type
+{
+    /** @var Fqsen|null */
+    private $fqsen;
+
+    /** @var Type[] */
+    private $types;
+
+    /**
+     * @param Type[] $types
+     */
+    public function __construct(?Fqsen $fqsen, array $types)
+    {
+        $this->fqsen = $fqsen;
+        $this->types = $types;
+    }
+
+    public function getFqsen(): ?Fqsen
+    {
+        return $this->fqsen;
+    }
+
+    /**
+     * @return Type[]
+     */
+    public function getTypes(): array
+    {
+        return $this->types;
+    }
+
+    public function __toString(): string
+    {
+        $objectType = (string) ($this->fqsen ?? 'object');
+
+        return $objectType . '<' . implode(', ', $this->types) . '>';
+    }
+}

tests/unit/CollectionResolverTest.php

@@ -16,10 +16,10 @@
 use phpDocumentor\Reflection\PseudoTypes\List_;
 use phpDocumentor\Reflection\PseudoTypes\NonEmptyList;
 use phpDocumentor\Reflection\Types\Array_;
-use phpDocumentor\Reflection\Types\Collection;
 use phpDocumentor\Reflection\Types\Compound;
 use phpDocumentor\Reflection\Types\Context;
 use phpDocumentor\Reflection\Types\Float_;
+use phpDocumentor\Reflection\Types\GenericType;
 use phpDocumentor\Reflection\Types\Integer;
 use phpDocumentor\Reflection\Types\Nullable;
 use phpDocumentor\Reflection\Types\Object_;
@@ -36,7 +36,7 @@ class CollectionResolverTest extends TestCase
     /**
      * @uses \phpDocumentor\Reflection\Types\Context
      * @uses \phpDocumentor\Reflection\Types\Compound
-     * @uses \phpDocumentor\Reflection\Types\Collection
+     * @uses \phpDocumentor\Reflection\Types\GenericType
      * @uses \phpDocumentor\Reflection\Types\String_
      *
      * @covers ::resolve
@@ -49,23 +49,16 @@ public function testResolvingCollection(): void
 
         $resolvedType = $fixture->resolve('ArrayObject<string>', new Context(''));
 
-        $this->assertInstanceOf(Collection::class, $resolvedType);
+        $this->assertInstanceOf(GenericType::class, $resolvedType);
         $this->assertSame('\\ArrayObject<string>', (string) $resolvedType);
-
-        $this->assertEquals('\\ArrayObject', (string) $resolvedType->getFqsen());
-
-        $valueType = $resolvedType->getValueType();
-
-        $keyType = $resolvedType->getKeyType();
-
-        $this->assertInstanceOf(String_::class, $valueType);
-        $this->assertInstanceOf(Compound::class, $keyType);
+        $this->assertSame('\\ArrayObject', (string) $resolvedType->getFqsen());
+        $this->assertEquals([new String_()], $resolvedType->getTypes());
     }
 
     /**
      * @uses \phpDocumentor\Reflection\Types\Context
      * @uses \phpDocumentor\Reflection\Types\Compound
-     * @uses \phpDocumentor\Reflection\Types\Collection
+     * @uses \phpDocumentor\Reflection\Types\GenericType
      * @uses \phpDocumentor\Reflection\Types\String_
      *
      * @covers ::__construct
@@ -78,25 +71,22 @@ public function testResolvingCollectionWithKeyType(): void
 
         $resolvedType = $fixture->resolve('ArrayObject<string[],Iterator>', new Context(''));
 
-        $this->assertInstanceOf(Collection::class, $resolvedType);
-        $this->assertSame('\\ArrayObject<string[],\\Iterator>', (string) $resolvedType);
+        $this->assertInstanceOf(GenericType::class, $resolvedType);
+        $this->assertSame('\\ArrayObject<string[], \\Iterator>', (string) $resolvedType);
+        $this->assertSame('\\ArrayObject', (string) $resolvedType->getFqsen());
 
-        $this->assertEquals('\\ArrayObject', (string) $resolvedType->getFqsen());
+        $types = $resolvedType->getTypes();
 
-        $valueType = $resolvedType->getValueType();
-
-        $keyType = $resolvedType->getKeyType();
-
-        $this->assertInstanceOf(Object_::class, $valueType);
-        $this->assertEquals('\\Iterator', (string) $valueType->getFqsen());
-        $this->assertInstanceOf(Array_::class, $keyType);
-        $this->assertInstanceOf(String_::class, $keyType->getValueType());
+        $this->assertArrayHasKey(0, $types);
+        $this->assertEquals(new Array_(new String_()), $types[0]);
+        $this->assertArrayHasKey(1, $types);
+        $this->assertInstanceOf(Object_::class, $types[1]);
+        $this->assertSame('\\Iterator', (string) $types[1]->getFqsen());
     }
 
     /**
      * @uses \phpDocumentor\Reflection\Types\Context
      * @uses \phpDocumentor\Reflection\Types\Compound
-     * @uses \phpDocumentor\Reflection\Types\Collection
      * @uses \phpDocumentor\Reflection\Types\String_
      *
      * @covers ::__construct
@@ -123,7 +113,6 @@ public function testResolvingArrayCollection(): void
     /**
      * @uses \phpDocumentor\Reflection\Types\Context
      * @uses \phpDocumentor\Reflection\Types\Compound
-     * @uses \phpDocumentor\Reflection\Types\Collection
      * @uses \phpDocumentor\Reflection\Types\String_
      *
      * @covers ::__construct
@@ -150,7 +139,6 @@ public function testResolvingArrayCollectionWithKey(): void
     /**
      * @uses \phpDocumentor\Reflection\Types\Context
      * @uses \phpDocumentor\Reflection\Types\Compound
-     * @uses \phpDocumentor\Reflection\Types\Collection
      * @uses \phpDocumentor\Reflection\Types\String_
 
      * @covers ::__construct
@@ -177,7 +165,7 @@ public function testResolvingArrayCollectionWithKeyAndWhitespace(): void
     /**
      * @uses \phpDocumentor\Reflection\Types\Context
      * @uses \phpDocumentor\Reflection\Types\Compound
-     * @uses \phpDocumentor\Reflection\Types\Collection
+     * @uses \phpDocumentor\Reflection\Types\GenericType
      * @uses \phpDocumentor\Reflection\Types\String_
      *
      * @covers ::__construct
@@ -190,25 +178,22 @@ public function testResolvingCollectionOfCollection(): void
 
         $resolvedType = $fixture->resolve('ArrayObject<string|integer|double,ArrayObject<DateTime>>', new Context(''));
 
-        $this->assertInstanceOf(Collection::class, $resolvedType);
-        $this->assertSame('\\ArrayObject<string|int|float,\\ArrayObject<\\DateTime>>', (string) $resolvedType);
+        $this->assertInstanceOf(GenericType::class, $resolvedType);
+        $this->assertSame('\\ArrayObject<string|int|float, \\ArrayObject<\\DateTime>>', (string) $resolvedType);
+        $this->assertSame('\\ArrayObject', (string) $resolvedType->getFqsen());
 
-        $this->assertEquals('\\ArrayObject', (string) $resolvedType->getFqsen());
+        $types = $resolvedType->getTypes();
 
-        $valueType = $resolvedType->getValueType();
-        $this->assertInstanceOf(Collection::class, $valueType);
-        $collectionValueType = $valueType->getValueType();
+        $this->assertArrayHasKey(0, $types);
+        $this->assertEquals(new Compound([new String_(), new Integer(), new Float_()]), $types[0]);
 
-        $this->assertInstanceOf(Object_::class, $valueType->getValueType());
-        $this->assertEquals('\\ArrayObject', (string) $valueType->getFqsen());
-        $this->assertInstanceOf(Object_::class, $collectionValueType);
-        $this->assertEquals('\\DateTime', (string) $collectionValueType->getFqsen());
+        $this->assertArrayHasKey(0, $types);
+        $this->assertInstanceOf(GenericType::class, $types[1]);
+        $this->assertSame('\\ArrayObject', (string) $types[1]->getFqsen());
 
-        $keyType = $resolvedType->getKeyType();
-        $this->assertInstanceOf(Compound::class, $keyType);
-        $this->assertInstanceOf(String_::class, $keyType->get(0));
-        $this->assertInstanceOf(Integer::class, $keyType->get(1));
-        $this->assertInstanceOf(Float_::class, $keyType->get(2));
+        $nestedGenericTypes = $types[1]->getTypes();
+        $this->assertArrayHasKey(0, $nestedGenericTypes);
+        $this->assertEquals(new Object_(new Fqsen('\\DateTime')), $nestedGenericTypes[0]);
     }
 
     /**
@@ -278,15 +263,14 @@ public function testMissingEndCollection(): void
     public function testBadCollectionClass(): void
     {
         $this->expectException(RuntimeException::class);
-        $this->expectExceptionMessage('string is not a collection');
+        $this->expectExceptionMessage('string is an unsupported generic');
         $fixture = new TypeResolver();
         $fixture->resolve('string<integer>', new Context(''));
     }
 
     /**
      * @uses \phpDocumentor\Reflection\Types\Context
      * @uses \phpDocumentor\Reflection\Types\Compound
-     * @uses \phpDocumentor\Reflection\Types\Collection
      * @uses \phpDocumentor\Reflection\Types\String_
      *
      * @covers ::__construct

tests/unit/IntegerRangeResolverTest.php

@@ -27,7 +27,6 @@ class IntegerRangeResolverTest extends TestCase
     /**
      * @uses \phpDocumentor\Reflection\Types\Context
      * @uses \phpDocumentor\Reflection\Types\Compound
-     * @uses \phpDocumentor\Reflection\Types\Collection
      * @uses \phpDocumentor\Reflection\Types\String_
      *
      * @covers ::__construct
@@ -53,7 +52,6 @@ public function testResolvingIntRange(): void
     /**
      * @uses \phpDocumentor\Reflection\Types\Context
      * @uses \phpDocumentor\Reflection\Types\Compound
-     * @uses \phpDocumentor\Reflection\Types\Collection
      * @uses \phpDocumentor\Reflection\Types\String_
      *
      * @covers ::__construct
@@ -79,7 +77,6 @@ public function testResolvingIntRangeWithKeywords(): void
     /**
      * @uses \phpDocumentor\Reflection\Types\Context
      * @uses \phpDocumentor\Reflection\Types\Compound
-     * @uses \phpDocumentor\Reflection\Types\Collection
      * @uses \phpDocumentor\Reflection\Types\String_
      *
      * @covers ::__construct
@@ -98,7 +95,6 @@ public function testResolvingIntRangeErrorMissingMaxValue(): void
     /**
      * @uses \phpDocumentor\Reflection\Types\Context
      * @uses \phpDocumentor\Reflection\Types\Compound
-     * @uses \phpDocumentor\Reflection\Types\Collection
      * @uses \phpDocumentor\Reflection\Types\String_
      *
      * @covers ::__construct
@@ -117,7 +113,6 @@ public function testResolvingIntRangeErrorMisingMinValue(): void
     /**
      * @uses \phpDocumentor\Reflection\Types\Context
      * @uses \phpDocumentor\Reflection\Types\Compound
-     * @uses \phpDocumentor\Reflection\Types\Collection
      * @uses \phpDocumentor\Reflection\Types\String_
      *
      * @covers ::__construct
@@ -136,7 +131,6 @@ public function testResolvingIntRangeErrorMisingComma(): void
     /**
      * @uses \phpDocumentor\Reflection\Types\Context
      * @uses \phpDocumentor\Reflection\Types\Compound
-     * @uses \phpDocumentor\Reflection\Types\Collection
      * @uses \phpDocumentor\Reflection\Types\String_
      *
      * @covers ::__construct

tests/unit/NumericResolverTest.php

@@ -28,7 +28,6 @@ class NumericResolverTest extends TestCase
     /**
      * @uses \phpDocumentor\Reflection\Types\Context
      * @uses \phpDocumentor\Reflection\Types\Compound
-     * @uses \phpDocumentor\Reflection\Types\Collection
      * @uses \phpDocumentor\Reflection\Types\String_
      *
      * @covers ::__construct