fix

Author: staabm

src/DoctrineReflection/DoctrineReflection.php

@@ -144,7 +144,7 @@ public function createGenericStatement(iterable $queryStrings, int $reflectionFe
                 return null;
             }
 
-            $genericObjects[] = new DoctrineStatementObjectType($resultType);
+            $genericObjects[] = DoctrineStatementObjectType::newWithRowType($resultType);
         }
 
         if (\count($genericObjects) > 1) {
@@ -173,7 +173,7 @@ public function createGenericResult(iterable $queryStrings, int $reflectionFetch
                 return null;
             }
 
-            $genericObjects[] = new DoctrineResultObjectType($resultType);
+            $genericObjects[] = DoctrineResultObjectType::newWithRowType($resultType);
         }
 
         if (\count($genericObjects) > 1) {

src/DoctrineReflection/DoctrineResultObjectType.php

@@ -4,21 +4,63 @@
 
 namespace staabm\PHPStanDba\DoctrineReflection;
 
-use Doctrine\DBAL\Result;
-use PHPStan\Type\Generic\GenericObjectType;
+use PHPStan\ShouldNotHappenException;
+use PHPStan\TrinaryLogic;
+use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 
-final class DoctrineResultObjectType extends GenericObjectType
+final class DoctrineResultObjectType extends ObjectType
 {
-    public function __construct(Type $rowType)
+    private ?Type $rowType;
+
+    public static function newWithRowType(Type $rowType): self
     {
-        parent::__construct(Result::class, [$rowType]);
+        $new = new self(Result::class);
+        $new->rowType = $rowType;
+        return $new;
     }
 
     public function getRowType(): Type
     {
-        $genericTypes = $this->getTypes();
+        if ($this->rowType === null) {
+            throw new ShouldNotHappenException();
+        }
+
+        return $this->rowType;
+    }
+
+    public function getIterableValueType(): Type
+    {
+        return $this->getRowType();
+    }
+
+    // differentiate objects based on the local properties,
+    // to make sure TypeCombinator::union() will not normalize separate objects away.
+    // this means we need to implement equals() and isSuperTypeOf().
+    public function equals(Type $type): bool
+    {
+        if ($type instanceof self
+        ) {
+            return
+                $type->rowType !== null
+                && $this->rowType !== null
+                && $type->rowType === $this->rowType
+                && $type->rowType->equals($this->rowType);
+        }
+
+        return parent::equals($type);
+    }
+
+    public function isSuperTypeOf(Type $type): TrinaryLogic
+    {
+        if ($type instanceof self) {
+            return TrinaryLogic::createFromBoolean(
+                $type->rowType !== null
+                && $this->rowType !== null
+                && $type->rowType->equals($this->rowType)
+            );
+        }
 
-        return $genericTypes[0];
+        return parent::isSuperTypeOf($type);
     }
 }

src/DoctrineReflection/DoctrineStatementObjectType.php

@@ -5,13 +5,63 @@
 namespace staabm\PHPStanDba\DoctrineReflection;
 
 use Doctrine\DBAL\Statement;
+use PHPStan\ShouldNotHappenException;
+use PHPStan\TrinaryLogic;
 use PHPStan\Type\Generic\GenericObjectType;
 use PHPStan\Type\Type;
 
 final class DoctrineStatementObjectType extends GenericObjectType
 {
-    public function __construct(Type $rowType)
+    private ?Type $rowType;
+
+    public static function newWithRowType(Type $rowType): self
+    {
+        $new = new self(Statement::class);
+        $new->rowType = $rowType;
+        return $new;
+    }
+
+    public function getRowType(): Type
+    {
+        if ($this->rowType === null) {
+            throw new ShouldNotHappenException();
+        }
+
+        return $this->rowType;
+    }
+
+    public function getIterableValueType(): Type
     {
-        parent::__construct(Statement::class, [$rowType]);
+        return $this->getRowType();
+    }
+
+    // differentiate objects based on the local properties,
+    // to make sure TypeCombinator::union() will not normalize separate objects away.
+    // this means we need to implement equals() and isSuperTypeOf().
+    public function equals(Type $type): bool
+    {
+        if ($type instanceof self
+        ) {
+            return
+                $type->rowType !== null
+                && $this->rowType !== null
+                && $type->rowType === $this->rowType
+                && $type->rowType->equals($this->rowType);
+        }
+
+        return parent::equals($type);
+    }
+
+    public function isSuperTypeOf(Type $type): TrinaryLogic
+    {
+        if ($type instanceof self) {
+            return TrinaryLogic::createFromBoolean(
+                $type->rowType !== null
+                && $this->rowType !== null
+                && $type->rowType->equals($this->rowType)
+            );
+        }
+
+        return parent::isSuperTypeOf($type);
     }
 }