Add GenericTemplate

Author: mspirkov

src/PseudoTypes/GenericTemplate.php

@@ -0,0 +1,43 @@
+<?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\PseudoTypes;
+
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\Types\Object_;
+
+/**
+ * Value Object representing the wrapper over the generic.
+ *
+ * @psalm-immutable
+ */
+final class GenericTemplate implements Type
+{
+    /** @var Object_ */
+    private $resolvedType;
+
+    public function __construct(Object_ $resolvedType)
+    {
+        $this->resolvedType = $resolvedType;
+    }
+
+    public function getResolvedType(): Object_
+    {
+        return $this->resolvedType;
+    }
+
+    public function __toString(): string
+    {
+        return (string) $this->resolvedType;
+    }
+}

src/TypeResolver.php

@@ -24,6 +24,7 @@
 use phpDocumentor\Reflection\PseudoTypes\False_;
 use phpDocumentor\Reflection\PseudoTypes\FloatValue;
 use phpDocumentor\Reflection\PseudoTypes\Generic;
+use phpDocumentor\Reflection\PseudoTypes\GenericTemplate;
 use phpDocumentor\Reflection\PseudoTypes\HtmlEscapedString;
 use phpDocumentor\Reflection\PseudoTypes\IntegerRange;
 use phpDocumentor\Reflection\PseudoTypes\IntegerValue;
@@ -465,7 +466,17 @@ private function createFromGeneric(GenericTypeNode $type, Context $context): Typ
                     throw new RuntimeException(sprintf('%s is an unsupported generic', (string) $mainType));
                 }
 
-                $types = $this->createTypesByTypeNodes($type->genericTypes, $context);
+                $types = array_map(
+                    function (TypeNode $node) use ($context): Type {
+                        $innerType = $this->createType($node, $context);
+                        if ($innerType instanceof Object_ && $innerType instanceof Generic === false) {
+                            return new GenericTemplate($innerType);
+                        }
+
+                        return $innerType;
+                    },
+                    $type->genericTypes
+                );
 
                 return new Generic($mainType->getFqsen(), $types);
         }

tests/unit/CollectionResolverTest.php

@@ -14,6 +14,7 @@
 namespace phpDocumentor\Reflection;
 
 use phpDocumentor\Reflection\PseudoTypes\Generic;
+use phpDocumentor\Reflection\PseudoTypes\GenericTemplate;
 use phpDocumentor\Reflection\PseudoTypes\List_;
 use phpDocumentor\Reflection\PseudoTypes\NonEmptyList;
 use phpDocumentor\Reflection\Types\Array_;
@@ -80,8 +81,7 @@ public function testResolvingCollectionWithKeyType(): void
         $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());
+        $this->assertEquals(new GenericTemplate(new Object_(new Fqsen('\\Iterator'))), $types[1]);
     }
 
     /**
@@ -193,7 +193,7 @@ public function testResolvingCollectionOfCollection(): void
 
         $nestedGenericTypes = $types[1]->getTypes();
         $this->assertArrayHasKey(0, $nestedGenericTypes);
-        $this->assertEquals(new Object_(new Fqsen('\\DateTime')), $nestedGenericTypes[0]);
+        $this->assertEquals(new GenericTemplate(new Object_(new Fqsen('\\DateTime'))), $nestedGenericTypes[0]);
     }
 
     /**

tests/unit/PseudoTypes/GenericTemplateTest.php

@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection\PseudoTypes;
+
+use phpDocumentor\Reflection\Fqsen;
+use phpDocumentor\Reflection\Types\Object_;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @coversDefaultClass \phpDocumentor\Reflection\PseudoTypes\GenericTemplate
+ */
+class GenericTemplateTest extends TestCase
+{
+    /**
+     * @covers ::getResolvedType
+     */
+    public function testCreate(): void
+    {
+        $resolvedType = new Object_(new Fqsen('\\Foo\\SomeClass'));
+        $type = new GenericTemplate($resolvedType);
+
+        $this->assertSame($resolvedType, $type->getResolvedType());
+    }
+
+    /**
+     * @covers ::__toString
+     */
+    public function testToString(): void
+    {
+        $type = new GenericTemplate(new Object_(new Fqsen('\\Foo\\SomeClass')));
+        $this->assertSame('\\Foo\\SomeClass', (string) $type);
+    }
+}

tests/unit/PseudoTypes/GenericTest.php

@@ -12,7 +12,7 @@
 use PHPUnit\Framework\TestCase;
 
 /**
- * @coversDefaultClass \phpDocumentor\Reflection\Types\Generic
+ * @coversDefaultClass \phpDocumentor\Reflection\PseudoTypes\Generic
  */
 class GenericTest extends TestCase
 {
@@ -66,11 +66,11 @@ public static function provideToStringData(): array
                 ),
             ],
             'more than two generics' => [
-                '\\MyClass<\\SomeClassFirst, \\SomeClassSecond, \\SomeClassThird>',
+                '\\MyClass<\\T, \\SomeClassSecond, \\SomeClassThird>',
                 new Generic(
                     new Fqsen('\\MyClass'),
                     [
-                        new Object_(new Fqsen('\\SomeClassFirst')),
+                        new GenericTemplate(new Object_(new Fqsen('\\T'))),
                         new Object_(new Fqsen('\\SomeClassSecond')),
                         new Object_(new Fqsen('\\SomeClassThird')),
                     ]