Do not apply heuristics of Collection<...>|Foo[] being resolved to Collection of Foo

ondrejmirtes · ondrejmirtes · commit fff8f095988a · 2024-09-30T17:41:47.000+02:00
Closes phpstan/phpstan#6228
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -180,6 +180,11 @@ parameters:
 			count: 1
 			path: src/PhpDoc/TypeNodeResolver.php
 
+		-
+			message: "#^Doing instanceof PHPStan\\\\Type\\\\Generic\\\\GenericObjectType is error\\-prone and deprecated\\.$#"
+			count: 1
+			path: src/PhpDoc/TypeNodeResolver.php
+
 		-
 			message: "#^Doing instanceof PHPStan\\\\Type\\\\IterableType is error\\-prone and deprecated\\. Use Type\\:\\:isIterable\\(\\) instead\\.$#"
 			count: 1
diff --git a/src/PhpDoc/TypeNodeResolver.php b/src/PhpDoc/TypeNodeResolver.php
@@ -568,7 +568,7 @@ private function resolveUnionTypeNode(UnionTypeNode $typeNode, NameScope $nameSc
 					continue;
 				}
 
-				if ($type instanceof ObjectType) {
+				if ($type instanceof ObjectType && !$type instanceof GenericObjectType) {
 					$type = new IntersectionType([$type, new IterableType(new MixedType(), $arrayTypeType)]);
 				} elseif ($type instanceof ArrayType) {
 					$type = new ArrayType(new MixedType(), $arrayTypeType);
diff --git a/tests/PHPStan/Analyser/data/bug-4715.php b/tests/PHPStan/Analyser/data/bug-4715.php
@@ -30,7 +30,7 @@ class Administration {}
 class Company
 {
 	/**
-	 * @var Collection<int, Administration>|Administration[]
+	 * @var Collection<int, Administration>
 	 */
 	protected Collection $administrations;
 
@@ -40,7 +40,7 @@ public function __construct()
 	}
 
 	/**
-	 * @return Collection<int, Administration>|Administration[]
+	 * @return Collection<int, Administration>
 	 */
 	public function getAdministrations() : Collection
 	{
diff --git a/tests/PHPStan/Analyser/nsrt/bug-6228.php b/tests/PHPStan/Analyser/nsrt/bug-6228.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Bug6228;
+
+use function PHPStan\Testing\assertType;
+
+class Bar
+{
+	/**
+	 * @param \DOMNodeList<\DOMNode>|\DOMNode|\DOMNode[]|string|null $node
+	 */
+	public function __construct($node)
+	{
+		assertType('array<DOMNode>|DOMNode|DOMNodeList<DOMNode>|string|null', $node);
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -568,7 +568,7 @@ private function resolveUnionTypeNode(UnionTypeNode $typeNode, NameScope $nameSc`
`568`	`568`	`continue;`
`569`	`569`	`}`
`570`	`570`
`571`		`- if ($type instanceof ObjectType) {`
	`571`	`+ if ($type instanceof ObjectType && !$type instanceof GenericObjectType) {`
`572`	`572`	`$type = new IntersectionType([$type, new IterableType(new MixedType(), $arrayTypeType)]);`
`573`	`573`	`} elseif ($type instanceof ArrayType) {`
`574`	`574`	`$type = new ArrayType(new MixedType(), $arrayTypeType);`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ class Administration {}`
`30`	`30`	`class Company`
`31`	`31`	`{`
`32`	`32`	`/**`
`33`		`- * @var Collection<int, Administration>\|Administration[]`
	`33`	`+ * @var Collection<int, Administration>`
`34`	`34`	`*/`
`35`	`35`	`protected Collection $administrations;`
`36`	`36`
`@@ -40,7 +40,7 @@ public function __construct()`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`/**`
`43`		`- * @return Collection<int, Administration>\|Administration[]`
	`43`	`+ * @return Collection<int, Administration>`
`44`	`44`	`*/`
`45`	`45`	`public function getAdministrations() : Collection`
`46`	`46`	`{`