Cover more situations and add tests

Author: rvanvelzen

src/PhpDoc/TypeNodeResolver.php

@@ -106,6 +106,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;
@@ -792,6 +793,15 @@ static function (string $variance): TemplateTypeVariance {
 
 			$classReflection = $this->getReflectionProvider()->getClass($mainTypeClassName);
 			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($mainTypeClassName, [
 					Traversable::class,
 					IteratorAggregate::class,

src/Type/Generic/TemplateTypeMap.php

@@ -5,6 +5,7 @@
 use PHPStan\Type\NeverType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
+use PHPStan\Type\TypeTraverser;
 use PHPStan\Type\TypeUtils;
 use function array_key_exists;
 use function count;
@@ -211,7 +212,10 @@ public function resolveToBounds(): self
 		if ($this->resolvedToBounds !== null) {
 			return $this->resolvedToBounds;
 		}
-		return $this->resolvedToBounds = $this->map(static fn (string $name, Type $type): Type => TemplateTypeHelper::resolveToBounds($type));
+		return $this->resolvedToBounds = $this->map(static fn (string $name, Type $type): Type => TypeTraverser::map(
+			$type,
+			static fn (Type $type, callable $traverse): Type => $type instanceof TemplateType ? $traverse($type->getDefault() ?? $type->getBound()) : $traverse($type),
+		));
 	}
 
 	/**

tests/PHPStan/Analyser/NodeScopeResolverTest.php

@@ -208,6 +208,7 @@ private static function findTestFiles(): iterable
 		yield __DIR__ . '/../Rules/Classes/data/mixin-trait-use.php';
 
 		yield __DIR__ . '/data/bug-4801.php';
+		yield __DIR__ . '/data/template-default.php';
 	}
 
 	/**

tests/PHPStan/Analyser/data/template-default.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace TemplateDefault;
+
+use function PHPStan\Testing\assertType;
+
+/**
+ * @template T1 = true
+ * @template T2 = true
+ */
+class Test
+{
+}
+
+/**
+ * @param Test<false> $one
+ * @param Test<false, false> $two
+ * @param Test<false, false, false> $three
+ */
+function foo(Test $one, Test $two, Test $three)
+{
+	assertType('TemplateDefault\\Test<false, true>', $one);
+	assertType('TemplateDefault\\Test<false, false>', $two);
+	assertType('TemplateDefault\\Test<false, false, false>', $three);
+}
+
+
+/**
+ * @template S = false
+ * @template T = false
+ */
+class Builder
+{
+    /**
+     * @phpstan-self-out self<true, T>
+     */
+    public function one(): void
+    {
+    }
+
+    /**
+     * @phpstan-self-out self<S, true>
+     */
+    public function two(): void
+    {
+    }
+
+    /**
+     * @return ($this is self<true, true> ? void : never)
+     */
+    public function execute(): void
+    {
+    }
+}
+
+function () {
+	$qb = new Builder();
+	assertType('TemplateDefault\\Builder<false, false>', $qb);
+	$qb->one();
+	assertType('TemplateDefault\\Builder<true, false>', $qb);
+	$qb->two();
+	assertType('TemplateDefault\\Builder<true, true>', $qb);
+	assertType('void', $qb->execute());
+};
+
+function () {
+	$qb = new Builder();
+	assertType('TemplateDefault\\Builder<false, false>', $qb);
+	$qb->two();
+	assertType('TemplateDefault\\Builder<false, true>', $qb);
+	$qb->one();
+	assertType('TemplateDefault\\Builder<true, true>', $qb);
+	assertType('void', $qb->execute());
+};
+
+function () {
+	$qb = new Builder();
+	assertType('TemplateDefault\\Builder<false, false>', $qb);
+	$qb->one();
+	assertType('TemplateDefault\\Builder<true, false>', $qb);
+	assertType('*NEVER*', $qb->execute());
+};