Another strategy

Author: VincentLanglet

.claude/worktrees/agent-a624340d

@@ -86,7 +86,6 @@
 use PHPStan\Type\IterableType;
 use PHPStan\Type\KeyOfType;
 use PHPStan\Type\MixedType;
-use PHPStan\Type\NeverType;
 use PHPStan\Type\NewObjectType;
 use PHPStan\Type\NonAcceptingNeverType;
 use PHPStan\Type\NonexistentParentClassType;
@@ -936,23 +935,17 @@ static function (string $variance): TemplateTypeVariance {
 
 			try {
 				if (count($genericTypes) === 1) { // Foo<ValueType>
-					$iterableType = new IterableType(new MixedType(true), $genericTypes[0]);
-					$result = TypeCombinator::intersect($mainType, $iterableType);
-					if (!$result instanceof NeverType) {
-						return $result;
-					}
-
-					return new IntersectionType([$mainType, $iterableType]);
+					return TypeCombinator::intersect(
+						$mainType,
+						new IterableType(new MixedType(true), $genericTypes[0]),
+					);
 				}
 
 				if (count($genericTypes) === 2) { // Foo<KeyType, ValueType>
-					$iterableType = new IterableType($genericTypes[0], $genericTypes[1]);
-					$result = TypeCombinator::intersect($mainType, $iterableType);
-					if (!$result instanceof NeverType) {
-						return $result;
-					}
-
-					return new IntersectionType([$mainType, $iterableType]);
+					return TypeCombinator::intersect(
+						$mainType,
+						new IterableType($genericTypes[0], $genericTypes[1]),
+					);
 				}
 			} finally {
 				if ($mainTypeClassName !== null) {

.claude/worktrees/agent-af2804bc

@@ -1,8 +1,8 @@
 <?php
 
 /**
- * @implements Traversable<array<int|string, mixed>>
- * @implements IteratorAggregate<array<int|string, mixed>>
+ * @implements Traversable<mixed>
+ * @implements IteratorAggregate<mixed>
  * @link https://php.net/manual/en/class.pdostatement.php
  */
 class PDOStatement implements Traversable, IteratorAggregate
@@ -21,7 +21,7 @@ class PDOStatement implements Traversable, IteratorAggregate
     public function getColumnMeta(int $column) {}
 
     /**
-     * @return Iterator<mixed, array<int|string, mixed>>
+     * @return Iterator<mixed, mixed>
      */
     public function getIterator() {}
 }