Use ObjectType instead of GenericObjectType

Author: staabm

src/Extensions/MysqliQueryDynamicReturnTypeExtension.php

@@ -121,22 +121,25 @@ private function inferResultType(Expr $queryExpr, Scope $scope): ?Type
         $queryReflection = new QueryReflection();
         $queryStrings = $queryReflection->resolveQueryStrings($queryExpr, $scope);
 
-        $genericObjects = [];
+        $objects = [];
         foreach ($queryStrings as $queryString) {
             $resultType = $queryReflection->getResultType($queryString, QueryReflector::FETCH_TYPE_ASSOC);
 
             if (null === $resultType) {
                 return null;
             }
 
-            $genericObjects[] = new MysqliResultObjectType($resultType);
+            $resultObjectType =  new MysqliResultObjectType(\mysqli_result::class);
+            $resultObjectType->setRowType($resultType);
+
+            $objects[] = $resultObjectType;
         }
 
-        if (0 === \count($genericObjects)) {
+        if (0 === \count($objects)) {
             return null;
         }
 
-        $resultType = TypeCombinator::union(...$genericObjects);
+        $resultType = TypeCombinator::union(...$objects);
 
         if (! QueryReflection::getRuntimeConfiguration()->throwsMysqliExceptions($this->phpVersion)) {
             return TypeCombinator::union(

src/MysqliReflection/MysqliResultObjectType.php

@@ -4,14 +4,32 @@
 
 namespace staabm\PHPStanDba\MysqliReflection;
 
-use mysqli_result;
-use PHPStan\Type\Generic\GenericObjectType;
+use PHPStan\ShouldNotHappenException;
+use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 
-final class MysqliResultObjectType extends GenericObjectType
+final class MysqliResultObjectType extends ObjectType
 {
-    public function __construct(Type $rowType)
+    private Type $rowType;
+
+    public function __construct(
+        string $className,
+        ?Type $subtractedType = null
+    )
     {
-        parent::__construct(mysqli_result::class, [$rowType]);
+        parent::__construct($className, $subtractedType);
+    }
+
+    public function setRowType(Type $rowType): void {
+        $this->rowType = $rowType;
+    }
+
+    public function getRowType(): Type
+    {
+        if ($this->rowType === null) {
+            throw new ShouldNotHappenException();
+        }
+
+        return $this->rowType;
     }
 }