fix generic alias bare-usage resolution and data-provider parameter signatures

Author: shmax

src/Type/UsefulTypeAliasResolver.php

@@ -114,7 +114,28 @@ private function resolveLocalTypeAlias(string $aliasName, NameScope $nameScope):
 
 		try {
 			$unresolvedAlias = $localTypeAliases[$aliasName];
-			$resolvedAliasType = $unresolvedAlias->resolve($this->typeNodeResolver);
+
+			// For a generic alias used bare (no type args provided), check whether every
+			// declared template param has a default value.  When they all do, we can
+			// resolve immediately to a fully-concrete type by passing an empty args list to
+			// resolveWithArgs() — which then falls back to each param's declared default.
+			// When at least one param has no default, we keep the raw TemplateType
+			// placeholders so that MissingTypehintCheck::getRawGenericTypeAliasesUsage()
+			// can detect the bare-usage error ("does not specify its types: T").
+			if ($unresolvedAlias->isGeneric()) {
+				$allHaveDefaults = true;
+				foreach ($unresolvedAlias->getTemplateTagValueNodes() as $tvn) {
+					if ($tvn->default === null) {
+						$allHaveDefaults = false;
+						break;
+					}
+				}
+				$resolvedAliasType = $allHaveDefaults
+					? $unresolvedAlias->resolveWithArgs($this->typeNodeResolver, [])
+					: $unresolvedAlias->resolve($this->typeNodeResolver);
+			} else {
+				$resolvedAliasType = $unresolvedAlias->resolve($this->typeNodeResolver);
+			}
 		} catch (CircularTypeAliasDefinitionException) {
 			$resolvedAliasType = new CircularTypeAliasErrorType();
 		}

tests/PHPStan/Rules/Methods/OverridingMethodRuleTest.php

@@ -56,7 +56,7 @@ public static function dataOverridingFinalMethod(): array
 	}
 
 	#[DataProvider('dataOverridingFinalMethod')]
-	public function testOverridingFinalMethod(int $phpVersion, string $contravariantMessage): void
+	public function testOverridingFinalMethod(int $phpVersion, string $contravariantMessage, string $covariantMessage): void
 	{
 		$errors = [
 			[
@@ -322,7 +322,7 @@ public function testVariadicParameterIsAlwaysOptional(): void
 	}
 
 	#[DataProvider('dataOverridingFinalMethod')]
-	public function testBug3403(int $phpVersion): void
+	public function testBug3403(int $phpVersion, string $contravariantMessage, string $covariantMessage): void
 	{
 		$this->phpVersionId = $phpVersion;
 		$this->analyse([__DIR__ . '/data/bug-3403.php'], []);