Fix IntersectionType::isIterableOnce

Author: VincentLanglet

src/Type/IntersectionType.php

@@ -599,7 +599,10 @@ public function isIterable(): TrinaryLogic
 
 	public function isIterableAtLeastOnce(): TrinaryLogic
 	{
-		return $this->intersectResults(static fn (Type $type): TrinaryLogic => $type->isIterableAtLeastOnce());
+		return $this->intersectResults(
+			static fn (Type $type): TrinaryLogic => $type->isIterableAtLeastOnce(),
+			static fn (Type $type): bool => !$type->isIterable()->no(),
+		);
 	}
 
 	public function getArraySize(): Type
@@ -1242,17 +1245,29 @@ public function getFiniteTypes(): array
 	}
 
 	/**
-	 * @param callable(Type $type): TrinaryLogic $getResult
+	 * @param callable(Type $type): TrinaryLogic        $getResult
+	 * @param (callable(Type $type): TrinaryLogic)|null $filter
 	 */
-	private function intersectResults(callable $getResult): TrinaryLogic
-	{
-		return TrinaryLogic::lazyMaxMin($this->types, $getResult);
+	private function intersectResults(
+		callable $getResult,
+		?callable $filter = null,
+	): TrinaryLogic {
+		$types = $this->types;
+		if ($filter !== null) {
+			$types = array_filter($types, $filter);
+		}
+		if (count($types) === 0) {
+			return TrinaryLogic::createNo();
+		}
+
+		return TrinaryLogic::lazyMaxMin($types, $getResult);
 	}
 
 	/**
-	 * @param callable(Type $type): Type $getType
+	 * @param callable(Type $type): Type        $getType
+	 * @param (callable(Type $type): Type)|null $filter
 	 */
-	private function intersectTypes(callable $getType): Type
+	private function intersectTypes(callable $getType, ?callable $filter = null): Type
 	{
 		$operands = array_map($getType, $this->types);
 		return TypeCombinator::intersect(...$operands);

tests/PHPStan/Rules/Arrays/DeadForeachRuleTest.php

@@ -40,4 +40,9 @@ public function testBug8292(): void
 		$this->analyse([__DIR__ . '/data/bug-8292.php'], []);
 	}
 
+	public function testBug13248(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-13248.php'], []);
+	}
+
 }

tests/PHPStan/Rules/Arrays/data/bug-13248.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace Bug13248;
+
+use ArrayIterator;
+use IteratorAggregate;
+use Traversable;
+
+class X
+{
+}
+
+/**
+ * @implements IteratorAggregate<int, string>
+ */
+class Y extends X implements IteratorAggregate
+{
+	/**
+	 * @return ArrayIterator<int<0, 2>, 'a'|'b'|'c'>
+	 */
+	public function getIterator(): Traversable
+	{
+		return new ArrayIterator(['a', 'b', 'c']);
+	}
+}
+
+/**
+ * @return X&Traversable<int, string>
+ */
+function y(): X
+{
+	return new Y();
+}
+
+foreach (y() as $item) { // hm?
+	echo $item . PHP_EOL;
+}