Avoid internal error with T<X> where T bound consist of intersection type

ondrejmirtes · ondrejmirtes · commit 778b56999967 · 2024-01-30T18:15:35.000+01:00
diff --git a/src/PhpDoc/TypeNodeResolver.php b/src/PhpDoc/TypeNodeResolver.php
@@ -65,6 +65,7 @@
 use PHPStan\Type\FloatType;
 use PHPStan\Type\Generic\GenericClassStringType;
 use PHPStan\Type\Generic\GenericObjectType;
+use PHPStan\Type\Generic\TemplateType;
 use PHPStan\Type\Generic\TemplateTypeVariance;
 use PHPStan\Type\Helper\GetTemplateTypeType;
 use PHPStan\Type\IntegerRangeType;
@@ -749,6 +750,9 @@ static function (string $variance): TemplateTypeVariance {
 		$mainType = $this->resolveIdentifierTypeNode($typeNode->type, $nameScope);
 		$mainTypeObjectClassNames = $mainType->getObjectClassNames();
 		if (count($mainTypeObjectClassNames) > 1) {
+			if ($mainType instanceof TemplateType) {
+				return new ErrorType();
+			}
 			throw new ShouldNotHappenException();
 		}
 		$mainTypeClassName = $mainTypeObjectClassNames[0] ?? null;
diff --git a/tests/PHPStan/Analyser/AnalyserIntegrationTest.php b/tests/PHPStan/Analyser/AnalyserIntegrationTest.php
@@ -1286,6 +1286,14 @@ public function testBug10302(): void
 		$this->assertNoErrors($errors);
 	}
 
+	public function testBug10509(): void
+	{
+		$errors = $this->runAnalyse(__DIR__ . '/data/bug-10509.php');
+		$this->assertCount(2, $errors);
+		$this->assertSame('Method Bug10509\Foo::doFoo() has no return type specified.', $errors[0]->getMessage());
+		$this->assertSame('PHPDoc tag @return contains unresolvable type.', $errors[1]->getMessage());
+	}
+
 	/**
 	 * @param string[]|null $allAnalysedFiles
 	 * @return Error[]
diff --git a/tests/PHPStan/Analyser/data/bug-10509.php b/tests/PHPStan/Analyser/data/bug-10509.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Bug10509;
+
+/** @template T */
+interface One
+{
+
+}
+
+/** @template T */
+interface Two
+{
+
+}
+
+/**
+ * @template T of One&Two
+ */
+class Foo
+{
+
+	/**
+	 * @return T<int>
+	 */
+	public function doFoo()
+	{
+
+	}
+
+}
