Fix ClassAncestorsRule for nested generics

ondrejmirtes · ondrejmirtes · commit e1fa4b3ae9a3 · 2021-02-28T19:22:22.000+01:00
diff --git a/src/Rules/Generics/GenericObjectTypeCheck.php b/src/Rules/Generics/GenericObjectTypeCheck.php
@@ -64,17 +64,27 @@ public function check(
 				))->build();
 			}
 
-			foreach ($templateTypes as $i => $templateType) {
+			$templateTypesCount = count($templateTypes);
+			for ($i = 0; $i < $templateTypesCount; $i++) {
 				if (!isset($genericTypeTypes[$i])) {
 					continue;
 				}
 
-				$boundType = $templateType;
-				if ($templateType instanceof TemplateType) {
-					$boundType = $templateType->getBound();
-				}
+				$templateType = $templateTypes[$i];
+				$boundType = TemplateTypeHelper::resolveToBounds($templateType);
 				$genericTypeType = $genericTypeTypes[$i];
 				if ($boundType->isSuperTypeOf($genericTypeType)->yes()) {
+					if (!$templateType instanceof TemplateType) {
+						continue;
+					}
+					$map = $templateType->inferTemplateTypes($genericTypeType);
+					for ($j = 0; $j < $templateTypesCount; $j++) {
+						if ($i === $j) {
+							continue;
+						}
+
+						$templateTypes[$j] = TemplateTypeHelper::resolveTemplateTypes($templateTypes[$j], $map);
+					}
 					continue;
 				}
 
diff --git a/tests/PHPStan/Analyser/AnalyserIntegrationTest.php b/tests/PHPStan/Analyser/AnalyserIntegrationTest.php
@@ -327,7 +327,7 @@ public function testBug3769(): void
 	public function testBug3922(): void
 	{
 		$errors = $this->runAnalyse(__DIR__ . '/data/bug-3922-integration.php');
-		$this->assertCount(1, $errors); // expected 0
+		$this->assertCount(0, $errors);
 	}
 
 	/**
diff --git a/tests/PHPStan/Rules/Generics/ClassAncestorsRuleTest.php b/tests/PHPStan/Rules/Generics/ClassAncestorsRuleTest.php
@@ -187,16 +187,18 @@ public function testRuleImplements(): void
 	public function testBug3922(): void
 	{
 		$this->analyse([__DIR__ . '/data/bug-3922-ancestors.php'], [
-			/*[
+			[
 				'Type Bug3922Ancestors\BarQuery in generic type Bug3922Ancestors\QueryHandlerInterface<string, Bug3922Ancestors\BarQuery> in PHPDoc tag @implements is not subtype of template type TQuery of Bug3922Ancestors\QueryInterface<string> of interface Bug3922Ancestors\QueryHandlerInterface.',
 				54,
-			],*/
-			[
-				'Type Bug3922Ancestors\FooQuery in generic type Bug3922Ancestors\QueryHandlerInterface<string, Bug3922Ancestors\FooQuery> in PHPDoc tag @implements is not subtype of template type TQuery of Bug3922Ancestors\QueryInterface<TResult> of interface Bug3922Ancestors\QueryHandlerInterface.',
-				43,
 			],
+		]);
+	}
+
+	public function testBug3922Reversed(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-3922-ancestors-reversed.php'], [
 			[
-				'Type Bug3922Ancestors\BarQuery in generic type Bug3922Ancestors\QueryHandlerInterface<string, Bug3922Ancestors\BarQuery> in PHPDoc tag @implements is not subtype of template type TQuery of Bug3922Ancestors\QueryInterface<TResult> of interface Bug3922Ancestors\QueryHandlerInterface.',
+				'Type string in generic type Bug3922AncestorsReversed\QueryHandlerInterface<Bug3922AncestorsReversed\BarQuery, string> in PHPDoc tag @implements is not subtype of template type int of interface Bug3922AncestorsReversed\QueryHandlerInterface.',
 				54,
 			],
 		]);
diff --git a/tests/PHPStan/Rules/Generics/data/bug-3922-ancestors-reversed.php b/tests/PHPStan/Rules/Generics/data/bug-3922-ancestors-reversed.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Bug3922AncestorsReversed;
+
+/**
+ * @template TQuery of QueryInterface<TResult>
+ * @template TResult
+ */
+interface QueryHandlerInterface
+{
+	/**
+	 * @param TQuery $query
+	 *
+	 * @return TResult
+	 */
+	public function handle(QueryInterface $query);
+}
+
+/**
+ * @template TResult
+ */
+interface QueryInterface
+{
+}
+
+/**
+ * @template-implements QueryInterface<string>
+ */
+final class FooQuery implements QueryInterface
+{
+}
+
+/**
+ * @template-implements QueryInterface<int>
+ */
+final class BarQuery implements QueryInterface
+{
+}
+
+/**
+ * @template-implements QueryHandlerInterface<FooQuery, string>
+ */
+final class FooQueryHandler implements QueryHandlerInterface
+{
+	public function handle(QueryInterface $query): string
+	{
+		return 'foo';
+	}
+}
+
+/**
+ * @template-implements QueryHandlerInterface<BarQuery, string>
+ */
+final class BarQueryHandler implements QueryHandlerInterface
+{
+	public function handle(QueryInterface $query): int
+	{
+		return 10;
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,7 @@ public function testBug3769(): void`
`327`	`327`	`public function testBug3922(): void`
`328`	`328`	`{`
`329`	`329`	`$errors = $this->runAnalyse(__DIR__ . '/data/bug-3922-integration.php');`
`330`		`- $this->assertCount(1, $errors); // expected 0`
	`330`	`+ $this->assertCount(0, $errors);`
`331`	`331`	`}`
`332`	`332`
`333`	`333`	`/**`