Fix type when using \PDO::FETCH_OBJ on iteration (#751)

* Fix type when using \PDO::FETCH_OBJ on iteration * fix * Update PdoStatementObjectType.php

Author: staabm

src/PdoReflection/PdoStatementObjectType.php

@@ -13,9 +13,11 @@
 use PHPStan\Type\FloatType;
 use PHPStan\Type\IntegerRangeType;
 use PHPStan\Type\IntegerType;
+use PHPStan\Type\IntersectionType;
 use PHPStan\Type\IsSuperTypeOfResult;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\NullType;
+use PHPStan\Type\ObjectShapeType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
@@ -102,7 +104,21 @@ private function reduceBothType(Type $bothType, int $fetchType): Type
  }
 
  if (QueryReflector::FETCH_TYPE_CLASS === $fetchType) {
- return new ArrayType(new IntegerType(), new ObjectType('stdClass'));
+ $keyTypes = $bothType->getKeyTypes();
+ $valueTypes = $bothType->getValueTypes();
+
+ $properties = [];
+ foreach ($keyTypes as $i => $keyType) {
+ if (! $keyType->isString()->yes()) {
+ continue;
+ }
+ $properties[(string) $keyType->getValue()] = $valueTypes[$i];
+ }
+
+ return new IntersectionType([
+ new ObjectType(\stdClass::class),
+ new ObjectShapeType($properties, []),
+ ]);
  }
 
  // both types contains numeric and string keys, therefore the count is doubled

tests/default/data/pdo-fetch-types.php

@@ -32,7 +32,7 @@ public function supportedFetchTypes(PDO $pdo)
 
  $stmt = $pdo->query('SELECT email, adaid FROM ada', PDO::FETCH_OBJ);
  foreach ($stmt as $row) {
- assertType('array<int, stdClass>', $row);
+ assertType('object{email: string, adaid: int<-32768, 32767>}&stdClass', $row);
  }
  }