Fix reporting missing iterable value type in intersection types

phpstan · Jun 9, 2021 · 153179e · 153179e
1 parent e9968bd
commit 153179e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/src/Rules/MissingTypehintCheck.php b/src/Rules/MissingTypehintCheck.php
@@ -8,6 +8,7 @@
 use PHPStan\Type\Generic\GenericObjectType;
 use PHPStan\Type\Generic\TemplateType;
 use PHPStan\Type\Generic\TemplateTypeHelper;
+use PHPStan\Type\IntersectionType;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
@@ -94,7 +95,7 @@ public function getIterableTypesWithMissingValueTypehint(Type $type): array
 					}
 					$iterablesWithMissingValueTypehint[] = $type;
 				}
-				if ($this->deepInspectTypes) {
+				if ($this->deepInspectTypes && !$type instanceof IntersectionType) {
 					return $traverse($type);
 				}
 

diff --git a/tests/PHPStan/Rules/Methods/MissingMethodReturnTypehintRuleTest.php b/tests/PHPStan/Rules/Methods/MissingMethodReturnTypehintRuleTest.php
@@ -13,7 +13,7 @@ class MissingMethodReturnTypehintRuleTest extends \PHPStan\Testing\RuleTestCase
 	protected function getRule(): \PHPStan\Rules\Rule
 	{
 		$broker = $this->createReflectionProvider();
-		return new MissingMethodReturnTypehintRule(new MissingTypehintCheck($broker, true, true, true));
+		return new MissingMethodReturnTypehintRule(new MissingTypehintCheck($broker, true, true, true, [], true));
 	}
 
 	public function testRule(): void

diff --git a/tests/PHPStan/Rules/Methods/data/missing-method-return-typehint.php b/tests/PHPStan/Rules/Methods/data/missing-method-return-typehint.php
@@ -102,3 +102,14 @@ public function doFoo(): callable
 	}
 
 }
+
+class IterableIntersection
+{
+
+	/** @return FooInterface[]|\Traversable */
+	public function doFoo(): \Traversable
+	{
+
+	}
+
+}