Update PdoStatementObjectType.php

Author: staabm

src/PdoReflection/PdoStatementObjectType.php

@@ -5,6 +5,7 @@
 namespace staabm\PHPStanDba\PdoReflection;
 
 use PDOStatement;
+use PHPStan\ShouldNotHappenException;
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\BenevolentUnionType;
 use PHPStan\Type\Constant\ConstantArrayTypeBuilder;
@@ -21,43 +22,48 @@
 use PHPStan\Type\UnionType;
 use staabm\PHPStanDba\QueryReflection\QueryReflector;
 
-class PdoStatementObjectType extends GenericObjectType
+class PdoStatementObjectType extends ObjectType
 {
-    /**
-     * @var Type
-     */
-    private $bothType;
+    private ?Type $bothType;
 
     /**
-     * @param QueryReflector::FETCH_TYPE* $fetchType
+     * @var null|QueryReflector::FETCH_TYPE*
      */
-    public function __construct(Type $bothType, int $fetchType)
-    {
-        $this->bothType = $bothType;
-
-        $rowTypeInFetchMode = $this->reduceBothType($bothType, $fetchType);
-
-        parent::__construct(PDOStatement::class, [$rowTypeInFetchMode]);
-    }
+    private ?int $fetchType;
 
     public function getRowType(): Type
     {
-        $genericTypes = $this->getTypes();
-
-        return $genericTypes[0];
+        if ($this->bothType === null || $this->fetchType === null) {
+            throw new ShouldNotHappenException();
+        }
+        return $this->reduceBothType($this->bothType, $this->fetchType);
     }
 
     public function getIterableValueType(): Type
     {
         return $this->getRowType();
     }
 
+    /**
+     * @param QueryReflector::FETCH_TYPE* $fetchType
+     */
+    static public function newWithBothAndFetchType(Type $bothType, int $fetchType): self
+    {
+        $new = new self(PDOStatement::class);
+        $new->bothType = $bothType;
+        $new->fetchType = $fetchType;
+        return $new;
+    }
+
     /**
      * @param QueryReflector::FETCH_TYPE* $fetchType
      */
     public function newWithFetchType(int $fetchType): self
     {
-        return new self($this->bothType, $fetchType);
+        $new = new self($this->getClassName(), $this->getSubtractedType());
+        $new->bothType = $this->bothType;
+        $new->fetchType = $fetchType;
+        return $new;
     }
 
     /**
@@ -121,23 +127,23 @@ public static function createDefaultType(int $fetchType): Type
 
         switch ($fetchType) {
             case QueryReflector::FETCH_TYPE_CLASS:
-                return new GenericObjectType(PDOStatement::class, [new ObjectType('stdClass')]);
+                return self::newWithBothAndFetchType(new ObjectType('stdClass'), $fetchType);
             case QueryReflector::FETCH_TYPE_KEY_VALUE:
                 $arrayBuilder = ConstantArrayTypeBuilder::createEmpty();
                 $arrayBuilder->setOffsetValueType(new ConstantIntegerType(0), new MixedType());
                 $arrayBuilder->setOffsetValueType(new ConstantIntegerType(1), new MixedType());
 
-                return new GenericObjectType(PDOStatement::class, [$arrayBuilder->getArray()]);
+                return self::newWithBothAndFetchType($arrayBuilder->getArray(), $fetchType);
             case QueryReflector::FETCH_TYPE_NUMERIC:
-                return new GenericObjectType(PDOStatement::class, [new ArrayType(IntegerRangeType::fromInterval(0, null), $pdoScalar)]);
+                return self::newWithBothAndFetchType(new ArrayType(IntegerRangeType::fromInterval(0, null), $pdoScalar), $fetchType);
             case QueryReflector::FETCH_TYPE_ASSOC:
-                return new GenericObjectType(PDOStatement::class, [new ArrayType(new StringType(), $pdoScalar)]);
+                return self::newWithBothAndFetchType(new ArrayType(new StringType(), $pdoScalar), $fetchType);
             case QueryReflector::FETCH_TYPE_BOTH:
-                return new GenericObjectType(PDOStatement::class, [new ArrayType($arrayKey, $pdoScalar)]);
+                return self::newWithBothAndFetchType(new ArrayType($arrayKey, $pdoScalar), $fetchType);
             case QueryReflector::FETCH_TYPE_COLUMN:
-                return new GenericObjectType(PDOStatement::class, [$pdoScalar]);
+                return self::newWithBothAndFetchType($pdoScalar, $fetchType);
         }
 
-        return new GenericObjectType(PDOStatement::class, [new MixedType()]);
+        return self::newWithBothAndFetchType(new MixedType(), $fetchType);
     }
 }