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

…llection of Foo Closes phpstan/phpstan#6228
phpstan · Sep 30, 2024 · fff8f09 · fff8f09
1 parent fc66c24
commit fff8f09
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 3 deletions.
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);
+	}
+}