Fix @template name clash from different scopes

ondrejmirtes · ondrejmirtes · commit 527269a28ff5 · 2021-02-19T14:12:15.000+01:00
diff --git a/src/Type/Generic/GenericObjectType.php b/src/Type/Generic/GenericObjectType.php
@@ -187,20 +187,32 @@ public function getClassReflection(): ?ClassReflection
 	public function getProperty(string $propertyName, ClassMemberAccessAnswerer $scope): PropertyReflection
 	{
 		$reflection = parent::getProperty($propertyName, $scope);
+		$ancestor = $this->getAncestorWithClassName($reflection->getDeclaringClass()->getName());
+		if ($ancestor === null) {
+			$classReflection = $reflection->getDeclaringClass();
+		} else {
+			$classReflection = $ancestor->getClassReflection();
+		}
 
 		return new ResolvedPropertyReflection(
 			$reflection,
-			$this->getClassReflection()->getActiveTemplateTypeMap()
+			$classReflection->getActiveTemplateTypeMap()
 		);
 	}
 
 	public function getMethod(string $methodName, ClassMemberAccessAnswerer $scope): MethodReflection
 	{
 		$reflection = parent::getMethod($methodName, $scope);
+		$ancestor = $this->getAncestorWithClassName($reflection->getDeclaringClass()->getName());
+		if ($ancestor === null) {
+			$classReflection = $reflection->getDeclaringClass();
+		} else {
+			$classReflection = $ancestor->getClassReflection();
+		}
 
 		return new ResolvedMethodReflection(
 			$reflection,
-			$this->getClassReflection()->getActiveTemplateTypeMap()
+			$classReflection->getActiveTemplateTypeMap()
 		);
 	}
 
diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -10837,6 +10837,11 @@ public function dataBug4558(): array
 		return $this->gatherAssertTypes(__DIR__ . '/data/bug-4558.php');
 	}
 
+	public function dataBug4557(): array
+	{
+		return $this->gatherAssertTypes(__DIR__ . '/data/bug-4557.php');
+	}
+
 	/**
 	 * @param string $file
 	 * @return array<string, mixed[]>
@@ -11066,6 +11071,7 @@ private function gatherAssertTypes(string $file): array
 	 * @dataProvider dataBug1801
 	 * @dataProvider dataBug2927
 	 * @dataProvider dataBug4558
+	 * @dataProvider dataBug4557
 	 * @param string $assertType
 	 * @param string $file
 	 * @param mixed ...$args
diff --git a/tests/PHPStan/Analyser/data/bug-4557.php b/tests/PHPStan/Analyser/data/bug-4557.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace Bug4557;
+
+use function PHPStan\Analyser\assertType;
+
+class Lorem
+{
+}
+
+class Ipsum extends Lorem
+{
+}
+
+interface MockObject
+{
+}
+
+class Foo
+{
+
+	/**
+	 * @template T
+	 * @param class-string<T> $class
+	 * @return T&MockObject
+	 */
+	public function createMock($class)
+	{
+	}
+
+}
+
+/**
+ * @template T of Lorem
+ */
+class Bar extends Foo
+{
+
+	public function doBar(): void
+	{
+		$mock = $this->createMock(\stdClass::class);
+		assertType('Bug4557\\MockObject&stdClass', $mock);
+	}
+
+	/** @return T */
+	public function doBaz()
+	{
+
+	}
+
+}
+
+class Baz
+{
+
+	/**
+	 * @param Bar<Lorem> $barLorem
+	 * @param Bar<Ipsum> $barIpsum
+	 */
+	public function doFoo(Bar $barLorem, Bar $barIpsum): void
+	{
+		assertType('Bug4557\\Lorem', $barLorem->doBaz());
+		assertType('Bug4557\\Ipsum', $barIpsum->doBaz());
+	}
+
+}
diff --git a/tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php b/tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php
@@ -1818,4 +1818,12 @@ public function testBug3534(): void
 		$this->analyse([__DIR__ . '/data/bug-3534.php'], []);
 	}
 
+	public function testBug4557(): void
+	{
+		$this->checkThisOnly = false;
+		$this->checkNullables = true;
+		$this->checkUnionTypes = true;
+		$this->analyse([__DIR__ . '/../../Analyser/data/bug-4557.php'], []);
+	}
+
 }

Original file line number	Diff line number	Diff line change
`@@ -1818,4 +1818,12 @@ public function testBug3534(): void`
`1818`	`1818`	`$this->analyse([__DIR__ . '/data/bug-3534.php'], []);`
`1819`	`1819`	`}`
`1820`	`1820`
	`1821`	`+ public function testBug4557(): void`
	`1822`	`+ {`
	`1823`	`+ $this->checkThisOnly = false;`
	`1824`	`+ $this->checkNullables = true;`
	`1825`	`+ $this->checkUnionTypes = true;`
	`1826`	`+ $this->analyse([__DIR__ . '/../../Analyser/data/bug-4557.php'], []);`
	`1827`	`+ }`
	`1828`	`+`
`1821`	`1829`	`}`