simplify PdoStatementColumnCountDynamicReturnTypeExtension (#325)

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

Author: staabm

src/Extensions/PdoStatementColumnCountDynamicReturnTypeExtension.php

@@ -12,9 +12,8 @@
 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\PdoReflection\PdoStatementReflection;
+use staabm\PHPStanDba\PdoReflection\PdoStatementObjectType;
 use staabm\PHPStanDba\QueryReflection\QueryReflector;
 
 final class PdoStatementColumnCountDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
@@ -31,13 +30,12 @@ public function isMethodSupported(MethodReflection $methodReflection): bool
 
     public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type
     {
-        $pdoStatementReflection = new PdoStatementReflection();
         $defaultReturn = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
 
         $statementType = $scope->getType($methodCall->var);
 
-        if ($statementType instanceof GenericObjectType) {
-            $rowType = $pdoStatementReflection->getRowType($statementType, QueryReflector::FETCH_TYPE_NUMERIC);
+        if ($statementType instanceof PdoStatementObjectType) {
+            $rowType = $statementType->newWithFetchType(QueryReflector::FETCH_TYPE_NUMERIC)->getRowType();
             if ($rowType instanceof ConstantArrayType) {
                 return new ConstantIntegerType(\count($rowType->getKeyTypes()));
             }