Fix inferring template types on intersection types (#1122)

rvanvelzen · web-flow · commit 367a316e4f96 · 2022-03-28T15:33:02.000+02:00
diff --git a/src/Type/ArrayType.php b/src/Type/ArrayType.php
@@ -363,7 +363,7 @@ public static function castToArrayKeyType(Type $offsetType): Type
 
 	public function inferTemplateTypes(Type $receivedType): TemplateTypeMap
 	{
-		if ($receivedType instanceof UnionType) {
+		if ($receivedType instanceof UnionType || $receivedType instanceof IntersectionType) {
 			return $receivedType->inferTemplateTypesOn($this);
 		}
 
diff --git a/src/Type/CallableType.php b/src/Type/CallableType.php
@@ -222,7 +222,7 @@ public function getReturnType(): Type
 
 	public function inferTemplateTypes(Type $receivedType): TemplateTypeMap
 	{
-		if ($receivedType instanceof UnionType) {
+		if ($receivedType instanceof UnionType || $receivedType instanceof IntersectionType) {
 			return $receivedType->inferTemplateTypesOn($this);
 		}
 
diff --git a/src/Type/ClosureType.php b/src/Type/ClosureType.php
@@ -320,7 +320,7 @@ public function getReturnType(): Type
 
 	public function inferTemplateTypes(Type $receivedType): TemplateTypeMap
 	{
-		if ($receivedType instanceof UnionType) {
+		if ($receivedType instanceof UnionType || $receivedType instanceof IntersectionType) {
 			return $receivedType->inferTemplateTypesOn($this);
 		}
 
diff --git a/src/Type/Constant/ConstantArrayType.php b/src/Type/Constant/ConstantArrayType.php
@@ -21,6 +21,7 @@
 use PHPStan\Type\Generic\TemplateTypeMap;
 use PHPStan\Type\Generic\TemplateTypeVariance;
 use PHPStan\Type\IntegerRangeType;
+use PHPStan\Type\IntersectionType;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\NeverType;
 use PHPStan\Type\ObjectType;
@@ -765,7 +766,7 @@ public function describe(VerbosityLevel $level): string
 
 	public function inferTemplateTypes(Type $receivedType): TemplateTypeMap
 	{
-		if ($receivedType instanceof UnionType) {
+		if ($receivedType instanceof UnionType || $receivedType instanceof IntersectionType) {
 			return $receivedType->inferTemplateTypesOn($this);
 		}
 
diff --git a/src/Type/Generic/GenericClassStringType.php b/src/Type/Generic/GenericClassStringType.php
@@ -6,6 +6,7 @@
 use PHPStan\Type\ClassStringType;
 use PHPStan\Type\CompoundType;
 use PHPStan\Type\Constant\ConstantStringType;
+use PHPStan\Type\IntersectionType;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\ObjectWithoutClassType;
@@ -121,7 +122,7 @@ public function traverse(callable $cb): Type
 
 	public function inferTemplateTypes(Type $receivedType): TemplateTypeMap
 	{
-		if ($receivedType instanceof UnionType) {
+		if ($receivedType instanceof UnionType || $receivedType instanceof IntersectionType) {
 			return $receivedType->inferTemplateTypesOn($this);
 		}
 
diff --git a/src/Type/Generic/GenericObjectType.php b/src/Type/Generic/GenericObjectType.php
@@ -13,6 +13,7 @@
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\CompoundType;
 use PHPStan\Type\ErrorType;
+use PHPStan\Type\IntersectionType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeWithClassName;
@@ -211,7 +212,7 @@ public function getUnresolvedMethodPrototype(string $methodName, ClassMemberAcce
 
 	public function inferTemplateTypes(Type $receivedType): TemplateTypeMap
 	{
-		if ($receivedType instanceof UnionType) {
+		if ($receivedType instanceof UnionType || $receivedType instanceof IntersectionType) {
 			return $receivedType->inferTemplateTypesOn($this);
 		}
 
diff --git a/src/Type/Generic/TemplateTypeTrait.php b/src/Type/Generic/TemplateTypeTrait.php
@@ -236,10 +236,6 @@ public function isSubTypeOf(Type $type): TrinaryLogic
 
 	public function inferTemplateTypes(Type $receivedType): TemplateTypeMap
 	{
-		if (!$receivedType instanceof TemplateType && $receivedType instanceof UnionType) {
-			return $receivedType->inferTemplateTypesOn($this);
-		}
-
 		if (
 			$receivedType instanceof TemplateType
 			&& $this->getBound()->isSuperTypeOf($receivedType->getBound())->yes()
diff --git a/src/Type/IterableType.php b/src/Type/IterableType.php
@@ -256,7 +256,7 @@ public function isLiteralString(): TrinaryLogic
 
 	public function inferTemplateTypes(Type $receivedType): TemplateTypeMap
 	{
-		if ($receivedType instanceof UnionType) {
+		if ($receivedType instanceof UnionType || $receivedType instanceof IntersectionType) {
 			return $receivedType->inferTemplateTypesOn($this);
 		}
 
diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -824,6 +824,12 @@ public function dataFileAsserts(): iterable
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6889.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6891.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/simplexml.php');
+
+		if (PHP_VERSION_ID >= 80100) {
+			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6904.php');
+		}
+
+		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6917.php');
 	}
 
 	/**
diff --git a/tests/PHPStan/Analyser/data/bug-6904.php b/tests/PHPStan/Analyser/data/bug-6904.php
@@ -0,0 +1,48 @@
+<?php declare(strict_types = 1);
+
+namespace Bug6904;
+
+use stdClass;
+use function PHPStan\Testing\assertType;
+
+/**
+ * @template T
+ */
+interface Collection
+{
+}
+
+
+/**
+ * @template T
+ */
+interface Selectable
+{
+	/** @return T */
+	public function first();
+}
+
+
+class HelloWorld
+{
+	/**
+     * @var Collection<stdClass>&Selectable<stdClass>
+     */
+    public Collection&Selectable $items;
+
+	/**
+     * @param Selectable<TValue> $selectable
+     * @return TValue
+     *
+     * @template TValue
+     */
+    private function matchOne(Selectable $selectable)
+    {
+		return $selectable->first();
+    }
+
+	public function run(): void
+    {
+        assertType('stdClass', $this->matchOne($this->items));
+    }
+}
diff --git a/tests/PHPStan/Analyser/data/bug-6917.php b/tests/PHPStan/Analyser/data/bug-6917.php
@@ -0,0 +1,48 @@
+<?php declare(strict_types = 1);
+
+namespace Bug6917;
+
+use stdClass;
+use function PHPStan\Testing\assertType;
+
+/** @phpstan-template T of object */
+interface AdminInterface
+{
+	/** @phpstan-return T */
+	public function getObject(): object;
+}
+
+interface HelloInterface
+{
+	/**
+	 * @phpstan-template T of object
+	 * @phpstan-param AdminInterface<T> $admin
+	 * @phpstan-return T
+	 */
+	public function setAdmin(AdminInterface $admin): object;
+}
+
+class Hello implements HelloInterface
+{
+	/** @inheritdoc */
+	public function setAdmin(AdminInterface $admin): object
+	{
+		return $admin->getObject();
+	}
+}
+
+class MockObject {}
+
+class Foo
+{
+	/**
+     * @var MockObject&AdminInterface<stdClass>
+     */
+    public $admin;
+
+	public function test(): void
+	{
+		$hello = new Hello();
+		assertType('stdClass', $hello->setAdmin($this->admin));
+	}
+}
diff --git a/tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php b/tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php
@@ -2480,4 +2480,28 @@ public function testGenericsInferCollectionLevel8(): void
 		]);
 	}
 
+
+	public function testBug6904(): void
+	{
+		if (PHP_VERSION_ID < 80100) {
+			$this->markTestSkipped('Test requires PHP 8.1');
+		}
+
+		$this->checkThisOnly = false;
+		$this->checkNullables = true;
+		$this->checkUnionTypes = true;
+		$this->checkExplicitMixed = true;
+		$this->analyse([__DIR__ . '/data/bug-6904.php'], []);
+	}
+
+
+	public function testBug6917(): void
+	{
+		$this->checkThisOnly = false;
+		$this->checkNullables = true;
+		$this->checkUnionTypes = true;
+		$this->checkExplicitMixed = true;
+		$this->analyse([__DIR__ . '/data/bug-6917.php'], []);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Methods/data/bug-6904.php b/tests/PHPStan/Rules/Methods/data/bug-6904.php
@@ -0,0 +1,48 @@
+<?php declare(strict_types = 1);
+
+namespace Bug6904Rule;
+
+use stdClass;
+use function PHPStan\Testing\assertType;
+
+/**
+ * @template T
+ */
+interface Collection
+{
+}
+
+
+/**
+ * @template T
+ */
+interface Selectable
+{
+	/** @return T */
+	public function first();
+}
+
+
+class HelloWorld
+{
+	/**
+     * @var Collection<stdClass>&Selectable<stdClass>
+     */
+    public Collection&Selectable $items;
+
+	/**
+     * @param Selectable<TValue> $selectable
+     * @return TValue
+     *
+     * @template TValue
+     */
+    private function matchOne(Selectable $selectable)
+    {
+		return $selectable->first();
+    }
+
+	public function run(): void
+    {
+        assertType('stdClass', $this->matchOne($this->items));
+    }
+}
diff --git a/tests/PHPStan/Rules/Methods/data/bug-6917.php b/tests/PHPStan/Rules/Methods/data/bug-6917.php
@@ -0,0 +1,48 @@
+<?php declare(strict_types = 1);
+
+namespace Bug6917Rule;
+
+use stdClass;
+use function PHPStan\Testing\assertType;
+
+/** @phpstan-template T of object */
+interface AdminInterface
+{
+	/** @phpstan-return T */
+	public function getObject(): object;
+}
+
+interface HelloInterface
+{
+	/**
+	 * @phpstan-template T of object
+	 * @phpstan-param AdminInterface<T> $admin
+	 * @phpstan-return T
+	 */
+	public function setAdmin(AdminInterface $admin): object;
+}
+
+class Hello implements HelloInterface
+{
+	/** @inheritdoc */
+	public function setAdmin(AdminInterface $admin): object
+	{
+		return $admin->getObject();
+	}
+}
+
+class MockObject {}
+
+class Foo
+{
+	/**
+     * @var MockObject&AdminInterface<stdClass>
+     */
+    public $admin;
+
+	public function test(): void
+	{
+		$hello = new Hello();
+		assertType('stdClass', $hello->setAdmin($this->admin));
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -363,7 +363,7 @@ public static function castToArrayKeyType(Type $offsetType): Type`
`363`	`363`
`364`	`364`	`public function inferTemplateTypes(Type $receivedType): TemplateTypeMap`
`365`	`365`	`{`
`366`		`- if ($receivedType instanceof UnionType) {`
	`366`	`+ if ($receivedType instanceof UnionType \|\| $receivedType instanceof IntersectionType) {`
`367`	`367`	`return $receivedType->inferTemplateTypesOn($this);`
`368`	`368`	`}`
`369`	`369`
Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ public function getReturnType(): Type`
`222`	`222`
`223`	`223`	`public function inferTemplateTypes(Type $receivedType): TemplateTypeMap`
`224`	`224`	`{`
`225`		`- if ($receivedType instanceof UnionType) {`
	`225`	`+ if ($receivedType instanceof UnionType \|\| $receivedType instanceof IntersectionType) {`
`226`	`226`	`return $receivedType->inferTemplateTypesOn($this);`
`227`	`227`	`}`
`228`	`228`
Original file line number	Diff line number	Diff line change
`@@ -320,7 +320,7 @@ public function getReturnType(): Type`
`320`	`320`
`321`	`321`	`public function inferTemplateTypes(Type $receivedType): TemplateTypeMap`
`322`	`322`	`{`
`323`		`- if ($receivedType instanceof UnionType) {`
	`323`	`+ if ($receivedType instanceof UnionType \|\| $receivedType instanceof IntersectionType) {`
`324`	`324`	`return $receivedType->inferTemplateTypesOn($this);`
`325`	`325`	`}`
`326`	`326`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`use PHPStan\Type\Generic\TemplateTypeMap;`
`22`	`22`	`use PHPStan\Type\Generic\TemplateTypeVariance;`
`23`	`23`	`use PHPStan\Type\IntegerRangeType;`
	`24`	`+use PHPStan\Type\IntersectionType;`
`24`	`25`	`use PHPStan\Type\MixedType;`
`25`	`26`	`use PHPStan\Type\NeverType;`
`26`	`27`	`use PHPStan\Type\ObjectType;`
`@@ -765,7 +766,7 @@ public function describe(VerbosityLevel $level): string`
`765`	`766`
`766`	`767`	`public function inferTemplateTypes(Type $receivedType): TemplateTypeMap`
`767`	`768`	`{`
`768`		`- if ($receivedType instanceof UnionType) {`
	`769`	`+ if ($receivedType instanceof UnionType \|\| $receivedType instanceof IntersectionType) {`
`769`	`770`	`return $receivedType->inferTemplateTypesOn($this);`
`770`	`771`	`}`
`771`	`772`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`use PHPStan\Type\ClassStringType;`
`7`	`7`	`use PHPStan\Type\CompoundType;`
`8`	`8`	`use PHPStan\Type\Constant\ConstantStringType;`
	`9`	`+use PHPStan\Type\IntersectionType;`
`9`	`10`	`use PHPStan\Type\MixedType;`
`10`	`11`	`use PHPStan\Type\ObjectType;`
`11`	`12`	`use PHPStan\Type\ObjectWithoutClassType;`
`@@ -121,7 +122,7 @@ public function traverse(callable $cb): Type`
`121`	`122`
`122`	`123`	`public function inferTemplateTypes(Type $receivedType): TemplateTypeMap`
`123`	`124`	`{`
`124`		`- if ($receivedType instanceof UnionType) {`
	`125`	`+ if ($receivedType instanceof UnionType \|\| $receivedType instanceof IntersectionType) {`
`125`	`126`	`return $receivedType->inferTemplateTypesOn($this);`
`126`	`127`	`}`
`127`	`128`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`use PHPStan\TrinaryLogic;`
`14`	`14`	`use PHPStan\Type\CompoundType;`
`15`	`15`	`use PHPStan\Type\ErrorType;`
	`16`	`+use PHPStan\Type\IntersectionType;`
`16`	`17`	`use PHPStan\Type\ObjectType;`
`17`	`18`	`use PHPStan\Type\Type;`
`18`	`19`	`use PHPStan\Type\TypeWithClassName;`
`@@ -211,7 +212,7 @@ public function getUnresolvedMethodPrototype(string $methodName, ClassMemberAcce`
`211`	`212`
`212`	`213`	`public function inferTemplateTypes(Type $receivedType): TemplateTypeMap`
`213`	`214`	`{`
`214`		`- if ($receivedType instanceof UnionType) {`
	`215`	`+ if ($receivedType instanceof UnionType \|\| $receivedType instanceof IntersectionType) {`
`215`	`216`	`return $receivedType->inferTemplateTypesOn($this);`
`216`	`217`	`}`
`217`	`218`
Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ public function isLiteralString(): TrinaryLogic`
`256`	`256`
`257`	`257`	`public function inferTemplateTypes(Type $receivedType): TemplateTypeMap`
`258`	`258`	`{`
`259`		`- if ($receivedType instanceof UnionType) {`
	`259`	`+ if ($receivedType instanceof UnionType \|\| $receivedType instanceof IntersectionType) {`
`260`	`260`	`return $receivedType->inferTemplateTypesOn($this);`
`261`	`261`	`}`
`262`	`262`