added doctrine-ObjectTypes (#326)

Co-authored-by: Markus Staab <[email protected]>

Author: staabm

src/DoctrineReflection/DoctrineReflection.php

@@ -4,8 +4,6 @@
 
 namespace staabm\PHPStanDba\DoctrineReflection;
 
-use Doctrine\DBAL\Result;
-use Doctrine\DBAL\Statement;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\Constant\ConstantArrayType;
@@ -42,16 +40,8 @@ public function reduceResultType(MethodReflection $methodReflection, Type $resul
             return TypeCombinator::union(...$resultTypes);
         }
 
-        if ($resultType instanceof GenericObjectType) {
-            $genericTypes = $resultType->getTypes();
-
-            if (1 !== \count($genericTypes)) {
-                return null;
-            }
-
-            $resultRowType = $genericTypes[0];
-
-            return $this->reduceResultType($methodReflection, $resultRowType);
+        if ($resultType instanceof DoctrineResultObjectType) {
+            return $this->reduceResultType($methodReflection, $resultType->getRowType());
         }
 
         $resultRowType = $resultType;
@@ -156,7 +146,7 @@ public function createGenericStatement(iterable $queryStrings, int $reflectionFe
                 return null;
             }
 
-            $genericObjects[] = new GenericObjectType(Statement::class, [$resultType]);
+            $genericObjects[] = new DoctrineStatementObjectType($resultType);
         }
 
         if (\count($genericObjects) > 1) {
@@ -185,7 +175,7 @@ public function createGenericResult(iterable $queryStrings, int $reflectionFetch
                 return null;
             }
 
-            $genericObjects[] = new GenericObjectType(Result::class, [$resultType]);
+            $genericObjects[] = new DoctrineResultObjectType($resultType);
         }
 
         if (\count($genericObjects) > 1) {

src/DoctrineReflection/DoctrineResultObjectType.php

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace staabm\PHPStanDba\DoctrineReflection;
+
+use Doctrine\DBAL\Result;
+use PHPStan\Type\Generic\GenericObjectType;
+use PHPStan\Type\Type;
+
+final class DoctrineResultObjectType extends GenericObjectType
+{
+    public function __construct(Type $rowType)
+    {
+        parent::__construct(Result::class, [$rowType]);
+    }
+
+    public function getRowType(): Type
+    {
+        $genericTypes = $this->getTypes();
+
+        return $genericTypes[0];
+    }
+}

src/DoctrineReflection/DoctrineStatementObjectType.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace staabm\PHPStanDba\DoctrineReflection;
+
+use Doctrine\DBAL\Statement;
+use PHPStan\Type\Generic\GenericObjectType;
+use PHPStan\Type\Type;
+
+final class DoctrineStatementObjectType extends GenericObjectType
+{
+    public function __construct(Type $rowType)
+    {
+        parent::__construct(Statement::class, [$rowType]);
+    }
+}

src/Extensions/DoctrineResultDynamicReturnTypeExtension.php

@@ -15,9 +15,9 @@
 use PHPStan\Type\Constant\ConstantArrayType;
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\DynamicMethodReturnTypeExtension;
-use PHPStan\Type\Generic\GenericObjectType;
 use PHPStan\Type\Type;
 use staabm\PHPStanDba\DoctrineReflection\DoctrineReflection;
+use staabm\PHPStanDba\DoctrineReflection\DoctrineResultObjectType;
 
 final class DoctrineResultDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
 {
@@ -57,12 +57,8 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
 
         $resultType = $scope->getType($methodCall->var);
         if ('columncount' === strtolower($methodReflection->getName())) {
-            if ($resultType instanceof GenericObjectType) {
-                $genericTypes = $resultType->getTypes();
-                if (1 !== \count($genericTypes)) {
-                    return $defaultReturn;
-                }
-                $resultRowType = $genericTypes[0];
+            if ($resultType instanceof DoctrineResultObjectType) {
+                $resultRowType = $resultType->getRowType();
 
                 if ($resultRowType instanceof ConstantArrayType) {
                     $columnCount = \count($resultRowType->getKeyTypes()) / 2;