phpstan · rvanvelzen · Jun 14, 2022 · Oct 14, 2022
diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -5169,6 +5169,11 @@ private function exactInstantiation(New_ $node, string $className): ?Type
 				$list[] = $templateType;
 				continue;
 			}
+			$default = $tag->getDefault();
+			if ($default !== null) {
+				$list[] = $default;
+				continue;
+			}
 			$bound = $tag->getBound();
 			if ($bound instanceof MixedType && $bound->isExplicitMixed()) {
 				$bound = new MixedType(false);

diff --git a/src/PhpDoc/PhpDocNodeResolver.php b/src/PhpDoc/PhpDocNodeResolver.php
@@ -282,9 +282,12 @@ public function resolveTemplateTags(PhpDocNode $phpDocNode, NameScope $nameScope
 				}
 			}
 
+			$nameScopeWithoutCurrent = $nameScope->unsetTemplateType($valueNode->name);
+
 			$resolved[$valueNode->name] = new TemplateTag(
 				$valueNode->name,
-				$valueNode->bound !== null ? $this->typeNodeResolver->resolve($valueNode->bound, $nameScope->unsetTemplateType($valueNode->name)) : new MixedType(true),
+				$valueNode->bound !== null ? $this->typeNodeResolver->resolve($valueNode->bound, $nameScopeWithoutCurrent) : new MixedType(true),
+				$valueNode->default !== null ? $this->typeNodeResolver->resolve($valueNode->default, $nameScopeWithoutCurrent) : null,
 				$variance,
 			);
 			$resolvedPrefix[$valueNode->name] = $prefix;

diff --git a/src/PhpDoc/Tag/TemplateTag.php b/src/PhpDoc/Tag/TemplateTag.php
@@ -9,7 +9,7 @@
 class TemplateTag
 {
 
-	public function __construct(private string $name, private Type $bound, private TemplateTypeVariance $variance)
+	public function __construct(private string $name, private Type $bound, private ?Type $default, private TemplateTypeVariance $variance)
 	{
 	}
 
@@ -23,6 +23,11 @@ public function getBound(): Type
 		return $this->bound;
 	}
 
+	public function getDefault(): ?Type
+	{
+		return $this->default;
+	}
+
 	public function getVariance(): TemplateTypeVariance
 	{
 		return $this->variance;

diff --git a/src/PhpDoc/TypeNodeResolver.php b/src/PhpDoc/TypeNodeResolver.php
@@ -63,6 +63,7 @@
 use PHPStan\Type\FloatType;
 use PHPStan\Type\Generic\GenericClassStringType;
 use PHPStan\Type\Generic\GenericObjectType;
+use PHPStan\Type\Generic\TemplateType;
 use PHPStan\Type\IntegerRangeType;
 use PHPStan\Type\IntegerType;
 use PHPStan\Type\IntersectionType;
@@ -92,6 +93,7 @@
 use Traversable;
 use function array_key_exists;
 use function array_map;
+use function array_values;
 use function count;
 use function explode;
 use function get_class;
@@ -683,6 +685,15 @@ private function resolveGenericTypeNode(GenericTypeNode $typeNode, NameScope $na
 
 			$classReflection = $this->getReflectionProvider()->getClass($mainType->getClassName());
 			if ($classReflection->isGeneric()) {
+				$templateTypes = array_values($classReflection->getTemplateTypeMap()->getTypes());
+				for ($i = count($genericTypes), $templateTypesCount = count($templateTypes); $i < $templateTypesCount; $i++) {
+					$templateType = $templateTypes[$i];
+					if (!$templateType instanceof TemplateType || $templateType->getDefault() === null) {
+						continue;
+					}
+					$genericTypes[] = $templateType->getDefault();
+				}
+
 				if (in_array($mainType->getClassName(), [
 					Traversable::class,
 					IteratorAggregate::class,

diff --git a/src/Reflection/ClassReflection.php b/src/Reflection/ClassReflection.php
@@ -1255,7 +1255,7 @@ public function typeMapFromList(array $types): TemplateTypeMap
 		$map = [];
 		$i = 0;
 		foreach ($resolvedPhpDoc->getTemplateTags() as $tag) {
-			$map[$tag->getName()] = $types[$i] ?? new ErrorType();
+			$map[$tag->getName()] = $types[$i] ?? $tag->getDefault() ?? new ErrorType();
 			$i++;
 		}
 
@@ -1272,7 +1272,7 @@ public function typeMapToList(TemplateTypeMap $typeMap): array
 
 		$list = [];
 		foreach ($resolvedPhpDoc->getTemplateTags() as $tag) {
-			$list[] = $typeMap->getType($tag->getName()) ?? $tag->getBound();
+			$list[] = $typeMap->getType($tag->getName()) ?? $tag->getDefault() ?? $tag->getBound();
 		}
 
 		return $list;

diff --git a/src/Rules/FunctionCallParametersCheck.php b/src/Rules/FunctionCallParametersCheck.php
@@ -359,7 +359,7 @@ static function (Type $type, callable $traverse) use (&$returnTemplateTypes): Ty
 							$type = $type->resolve();
 						}
 
-						if ($type instanceof TemplateType) {
+						if ($type instanceof TemplateType && $type->getDefault() === null) {
 							$returnTemplateTypes[$type->getName()] = true;
 							return $type;
 						}

diff --git a/src/Type/Generic/TemplateArrayType.php b/src/Type/Generic/TemplateArrayType.php
@@ -4,6 +4,7 @@
 
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\Traits\UndecidedComparisonCompoundTypeTrait;
+use PHPStan\Type\Type;
 
 /** @api */
 final class TemplateArrayType extends ArrayType implements TemplateType
@@ -19,6 +20,7 @@ public function __construct(
 		TemplateTypeVariance $templateTypeVariance,
 		string $name,
 		ArrayType $bound,
+		?Type $default,
 	)
 	{
 		parent::__construct($bound->getKeyType(), $bound->getItemType());
@@ -27,6 +29,7 @@ public function __construct(
 		$this->variance = $templateTypeVariance;
 		$this->name = $name;
 		$this->bound = $bound;
+		$this->default = $default;
 	}
 
 	protected function shouldGeneralizeInferredType(): bool

diff --git a/src/Type/Generic/TemplateBenevolentUnionType.php b/src/Type/Generic/TemplateBenevolentUnionType.php
@@ -18,6 +18,7 @@ public function __construct(
 		TemplateTypeVariance $templateTypeVariance,
 		string $name,
 		BenevolentUnionType $bound,
+		?Type $default,
 	)
 	{
 		parent::__construct($bound->getTypes());
@@ -27,6 +28,7 @@ public function __construct(
 		$this->variance = $templateTypeVariance;
 		$this->name = $name;
 		$this->bound = $bound;
+		$this->default = $default;
 	}
 
 	/** @param Type[] $types */
@@ -38,6 +40,7 @@ public function withTypes(array $types): self
 			$this->variance,
 			$this->name,
 			new BenevolentUnionType($types),
+			$this->default,
 		);
 	}
 

diff --git a/src/Type/Generic/TemplateBooleanType.php b/src/Type/Generic/TemplateBooleanType.php
@@ -4,6 +4,7 @@
 
 use PHPStan\Type\BooleanType;
 use PHPStan\Type\Traits\UndecidedComparisonCompoundTypeTrait;
+use PHPStan\Type\Type;
 
 /** @api */
 final class TemplateBooleanType extends BooleanType implements TemplateType
@@ -19,6 +20,7 @@ public function __construct(
 		TemplateTypeVariance $templateTypeVariance,
 		string $name,
 		BooleanType $bound,
+		?Type $default,
 	)
 	{
 		parent::__construct();
@@ -27,6 +29,7 @@ public function __construct(
 		$this->variance = $templateTypeVariance;
 		$this->name = $name;
 		$this->bound = $bound;
+		$this->default = $default;
 	}
 
 	protected function shouldGeneralizeInferredType(): bool

diff --git a/src/Type/Generic/TemplateConstantArrayType.php b/src/Type/Generic/TemplateConstantArrayType.php
@@ -4,6 +4,7 @@
 
 use PHPStan\Type\Constant\ConstantArrayType;
 use PHPStan\Type\Traits\UndecidedComparisonCompoundTypeTrait;
+use PHPStan\Type\Type;
 
 /** @api */
 final class TemplateConstantArrayType extends ConstantArrayType implements TemplateType
@@ -19,6 +20,7 @@ public function __construct(
 		TemplateTypeVariance $templateTypeVariance,
 		string $name,
 		ConstantArrayType $bound,
+		?Type $default,
 	)
 	{
 		parent::__construct($bound->getKeyTypes(), $bound->getValueTypes(), $bound->getNextAutoIndexes(), $bound->getOptionalKeys(), $bound->isList()->yes());
@@ -27,6 +29,7 @@ public function __construct(
 		$this->variance = $templateTypeVariance;
 		$this->name = $name;
 		$this->bound = $bound;
+		$this->default = $default;
 	}
 
 	protected function shouldGeneralizeInferredType(): bool

diff --git a/src/Type/Generic/TemplateConstantIntegerType.php b/src/Type/Generic/TemplateConstantIntegerType.php
@@ -4,6 +4,7 @@
 
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\Traits\UndecidedComparisonCompoundTypeTrait;
+use PHPStan\Type\Type;
 
 /** @api */
 final class TemplateConstantIntegerType extends ConstantIntegerType implements TemplateType
@@ -19,6 +20,7 @@ public function __construct(
 		TemplateTypeVariance $templateTypeVariance,
 		string $name,
 		ConstantIntegerType $bound,
+		?Type $default,
 	)
 	{
 		parent::__construct($bound->getValue());
@@ -27,6 +29,7 @@ public function __construct(
 		$this->variance = $templateTypeVariance;
 		$this->name = $name;
 		$this->bound = $bound;
+		$this->default = $default;
 	}
 
 	protected function shouldGeneralizeInferredType(): bool

diff --git a/src/Type/Generic/TemplateConstantStringType.php b/src/Type/Generic/TemplateConstantStringType.php
@@ -4,6 +4,7 @@
 
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\Traits\UndecidedComparisonCompoundTypeTrait;
+use PHPStan\Type\Type;
 
 /** @api */
 final class TemplateConstantStringType extends ConstantStringType implements TemplateType
@@ -19,6 +20,7 @@ public function __construct(
 		TemplateTypeVariance $templateTypeVariance,
 		string $name,
 		ConstantStringType $bound,
+		?Type $default,
 	)
 	{
 		parent::__construct($bound->getValue());
@@ -27,6 +29,7 @@ public function __construct(
 		$this->variance = $templateTypeVariance;
 		$this->name = $name;
 		$this->bound = $bound;
+		$this->default = $default;
 	}
 
 	protected function shouldGeneralizeInferredType(): bool

diff --git a/src/Type/Generic/TemplateFloatType.php b/src/Type/Generic/TemplateFloatType.php
@@ -4,6 +4,7 @@
 
 use PHPStan\Type\FloatType;
 use PHPStan\Type\Traits\UndecidedComparisonCompoundTypeTrait;
+use PHPStan\Type\Type;
 
 /** @api */
 final class TemplateFloatType extends FloatType implements TemplateType
@@ -19,6 +20,7 @@ public function __construct(
 		TemplateTypeVariance $templateTypeVariance,
 		string $name,
 		FloatType $bound,
+		?Type $default,
 	)
 	{
 		parent::__construct();
@@ -27,6 +29,7 @@ public function __construct(
 		$this->variance = $templateTypeVariance;
 		$this->name = $name;
 		$this->bound = $bound;
+		$this->default = $default;
 	}
 
 	protected function shouldGeneralizeInferredType(): bool

diff --git a/src/Type/Generic/TemplateGenericObjectType.php b/src/Type/Generic/TemplateGenericObjectType.php
@@ -19,6 +19,7 @@ public function __construct(
 		TemplateTypeVariance $templateTypeVariance,
 		string $name,
 		GenericObjectType $bound,
+		?Type $default,
 	)
 	{
 		parent::__construct($bound->getClassName(), $bound->getTypes());
@@ -28,6 +29,7 @@ public function __construct(
 		$this->variance = $templateTypeVariance;
 		$this->name = $name;
 		$this->bound = $bound;
+		$this->default = $default;
 	}
 
 	protected function recreate(string $className, array $types, ?Type $subtractedType): GenericObjectType
@@ -38,6 +40,7 @@ protected function recreate(string $className, array $types, ?Type $subtractedTy
 			$this->variance,
 			$this->name,
 			$this->getBound(),
+			$this->default,
 		);
 	}
 

diff --git a/src/Type/Generic/TemplateIntegerType.php b/src/Type/Generic/TemplateIntegerType.php
@@ -4,6 +4,7 @@
 
 use PHPStan\Type\IntegerType;
 use PHPStan\Type\Traits\UndecidedComparisonCompoundTypeTrait;
+use PHPStan\Type\Type;
 
 /** @api */
 final class TemplateIntegerType extends IntegerType implements TemplateType
@@ -19,6 +20,7 @@ public function __construct(
 		TemplateTypeVariance $templateTypeVariance,
 		string $name,
 		IntegerType $bound,
+		?Type $default,
 	)
 	{
 		parent::__construct();
@@ -27,6 +29,7 @@ public function __construct(
 		$this->variance = $templateTypeVariance;
 		$this->name = $name;
 		$this->bound = $bound;
+		$this->default = $default;
 	}
 
 	protected function shouldGeneralizeInferredType(): bool

diff --git a/src/Type/Generic/TemplateIntersectionType.php b/src/Type/Generic/TemplateIntersectionType.php
@@ -3,6 +3,7 @@
 namespace PHPStan\Type\Generic;
 
 use PHPStan\Type\IntersectionType;
+use PHPStan\Type\Type;
 
 /** @api */
 final class TemplateIntersectionType extends IntersectionType implements TemplateType
@@ -17,6 +18,7 @@ public function __construct(
 		TemplateTypeVariance $templateTypeVariance,
 		string $name,
 		IntersectionType $bound,
+		?Type $default,
 	)
 	{
 		parent::__construct($bound->getTypes());
@@ -26,6 +28,7 @@ public function __construct(
 		$this->variance = $templateTypeVariance;
 		$this->name = $name;
 		$this->bound = $bound;
+		$this->default = $default;
 	}
 
 }
diff --git a/src/Type/Generic/TemplateKeyOfType.php b/src/Type/Generic/TemplateKeyOfType.php
@@ -20,6 +20,7 @@ public function __construct(
 		TemplateTypeVariance $templateTypeVariance,
 		string $name,
 		KeyOfType $bound,
+		?Type $default,
 	)
 	{
 		parent::__construct($bound->getType());
@@ -28,6 +29,7 @@ public function __construct(
 		$this->variance = $templateTypeVariance;
 		$this->name = $name;
 		$this->bound = $bound;
+		$this->default = $default;
 	}
 
 	protected function getResult(): Type
@@ -40,6 +42,7 @@ protected function getResult(): Type
 			$result,
 			$this->getVariance(),
 			$this->getStrategy(),
+			$this->getDefault(),
 		);
 	}
 

diff --git a/src/Type/Generic/TemplateMixedType.php b/src/Type/Generic/TemplateMixedType.php
@@ -20,6 +20,7 @@ public function __construct(
 		TemplateTypeVariance $templateTypeVariance,
 		string $name,
 		MixedType $bound,
+		?Type $default,
 	)
 	{
 		parent::__construct(true);
@@ -29,6 +30,7 @@ public function __construct(
 		$this->variance = $templateTypeVariance;
 		$this->name = $name;
 		$this->bound = $bound;
+		$this->default = $default;
 	}
 
 	public function isSuperTypeOfMixed(MixedType $type): TrinaryLogic
@@ -53,6 +55,7 @@ public function toStrictMixedType(): TemplateStrictMixedType
 			$this->variance,
 			$this->name,
 			new StrictMixedType(),
+			$this->default,
 		);
 	}