Merge branch '2.x' into update-dev-deps

Author: mspirkov

src/PseudoTypes/False_.php

@@ -17,8 +17,6 @@
 use phpDocumentor\Reflection\Type;
 use phpDocumentor\Reflection\Types\Boolean;
 
-use function class_alias;
-
 /**
  * Value Object representing the PseudoType 'False', which is a Boolean type.
  *
@@ -36,5 +34,3 @@ public function __toString(): string
         return 'false';
     }
 }
-
-class_alias(False_::class, 'phpDocumentor\Reflection\Types\False_', false);

src/PseudoTypes/GenericTemplate.php

@@ -17,8 +17,6 @@
 use phpDocumentor\Reflection\Type;
 use phpDocumentor\Reflection\Types\Boolean;
 
-use function class_alias;
-
 /**
  * Value Object representing the PseudoType 'False', which is a Boolean type.
  *
@@ -36,5 +34,3 @@ public function __toString(): string
         return 'true';
     }
 }
-
-class_alias(True_::class, 'phpDocumentor\Reflection\Types\True_', false);

src/PseudoTypes/True_.php

@@ -26,7 +26,6 @@
 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;
@@ -467,17 +466,7 @@ private function createFromGeneric(GenericTypeNode $type, Context $context): Typ
                     throw new RuntimeException(sprintf('%s is an unsupported generic', (string) $mainType));
                 }
 
-                $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
-                );
+                $types = $this->createTypesByTypeNodes($type->genericTypes, $context);
 
                 return new Generic($mainType->getFqsen(), $types);
         }

src/TypeResolver.php

@@ -14,7 +14,6 @@
 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,7 +79,7 @@ public function testResolvingCollectionWithKeyType(): void
         $this->assertArrayHasKey(0, $types);
         $this->assertEquals(new Array_(new String_()), $types[0]);
         $this->assertArrayHasKey(1, $types);
-        $this->assertEquals(new GenericTemplate(new Object_(new Fqsen('\\Iterator'))), $types[1]);
+        $this->assertEquals(new Object_(new Fqsen('\\Iterator')), $types[1]);
     }
 
     /**
@@ -192,7 +191,7 @@ public function testResolvingCollectionOfCollection(): void
 
         $nestedGenericTypes = $types[1]->getTypes();
         $this->assertArrayHasKey(0, $nestedGenericTypes);
-        $this->assertEquals(new GenericTemplate(new Object_(new Fqsen('\\DateTime'))), $nestedGenericTypes[0]);
+        $this->assertEquals(new Object_(new Fqsen('\\DateTime')), $nestedGenericTypes[0]);
     }
 
     /**

tests/unit/CollectionResolverTest.php

@@ -40,14 +40,4 @@ public function testFalseStringifyCorrectly(): void
 
         $this->assertSame('false', (string) $false);
     }
-
-    /**
-     * @covers \phpDocumentor\Reflection\PseudoTypes\False_
-     */
-    public function testCanBeInstantiatedUsingDeprecatedFqsen(): void
-    {
-        $false = new \phpDocumentor\Reflection\Types\False_();
-
-        $this->assertSame('false', (string) $false);
-    }
 }

tests/unit/PseudoTypes/FalseTest.php

@@ -70,7 +70,7 @@ public static function provideToStringData(): array
                 new Generic(
                     new Fqsen('\\MyClass'),
                     [
-                        new GenericTemplate(new Object_(new Fqsen('\\T'))),
+                        new Object_(new Fqsen('\\T')),
                         new Object_(new Fqsen('\\SomeClassSecond')),
                         new Object_(new Fqsen('\\SomeClassThird')),
                     ]

tests/unit/PseudoTypes/GenericTemplateTest.php

@@ -28,8 +28,8 @@ public function testCreate(): void
      */
     public function testToString(): void
     {
-        $type = new IntMask(new Compound([new IntegerValue(1), new IntegerValue(5), new IntegerValue(10)]));
+        $type = new IntMaskOf(new Compound([new IntegerValue(1), new IntegerValue(5), new IntegerValue(10)]));
 
-        $this->assertSame('int-mask<1|5|10>', (string) $type);
+        $this->assertSame('int-mask-of<1|5|10>', (string) $type);
     }
 }

tests/unit/PseudoTypes/GenericTest.php

@@ -40,14 +40,4 @@ public function testTrueStringifyCorrectly(): void
 
         $this->assertSame('true', (string) $true);
     }
-
-    /**
-     * @covers \phpDocumentor\Reflection\PseudoTypes\True_
-     */
-    public function testCanBeInstantiatedUsingDeprecatedFqsen(): void
-    {
-        $true = new \phpDocumentor\Reflection\Types\True_();
-
-        $this->assertSame('true', (string) $true);
-    }
 }