Improve missing iterable value type check in lists

phpstan · Nov 3, 2023 · e705f09 · e705f09
1 parent be4ebac
commit e705f09
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/src/Rules/MissingTypehintCheck.php b/src/Rules/MissingTypehintCheck.php
@@ -85,11 +85,9 @@ public function getIterableTypesWithMissingValueTypehint(Type $type): array
 				if ($iterableValue instanceof MixedType && !$iterableValue->isExplicitMixed()) {
 					$iterablesWithMissingValueTypehint[] = $type;
 				}
-				if (!$type instanceof IntersectionType) {
-					return $traverse($type);
+				if ($type instanceof IntersectionType && !$type->isList()->yes()) {
+					return $type;
 				}
-
-				return $type;
 			}
 			return $traverse($type);
 		});

diff --git a/tests/PHPStan/Rules/Properties/MissingPropertyTypehintRuleTest.php b/tests/PHPStan/Rules/Properties/MissingPropertyTypehintRuleTest.php
@@ -51,6 +51,11 @@ public function testRule(): void
 				'Property MissingPropertyTypehint\CallableSignature::$cb type has no signature specified for callable.',
 				93,
 			],
+			[
+				'Property MissingPropertyTypehint\NestedArrayInProperty::$args type has no value type specified in iterable type array.',
+				103,
+				MissingTypehintCheck::MISSING_ITERABLE_VALUE_TYPE_TIP,
+			],
 		]);
 	}
 

diff --git a/tests/PHPStan/Rules/Properties/data/missing-property-typehint.php b/tests/PHPStan/Rules/Properties/data/missing-property-typehint.php
@@ -93,3 +93,13 @@ class CallableSignature
 	private $cb;
 
 }
+
+class NestedArrayInProperty
+{
+
+	/**
+	 * @var list<array{string, array|self|null, bool}>|null
+	 */
+	public $args;
+
+}