fix

Author: staabm

phpstan-baseline.neon

@@ -23,16 +23,6 @@ parameters:
 			count: 2
 			path: src/Extensions/DibiConnectionFetchDynamicReturnTypeExtension.php
 
-		-
-			message: "#^Doing instanceof PHPStan\\\\Type\\\\Constant\\\\ConstantArrayType is error\\-prone and deprecated\\. Use Type\\:\\:getConstantArrays\\(\\) instead\\.$#"
-			count: 1
-			path: src/Extensions/DoctrineResultDynamicReturnTypeExtension.php
-
-		-
-			message: "#^Doing instanceof PHPStan\\\\Type\\\\Constant\\\\ConstantArrayType is error\\-prone and deprecated\\. Use Type\\:\\:getConstantArrays\\(\\) instead\\.$#"
-			count: 1
-			path: src/Extensions/PdoStatementColumnCountDynamicReturnTypeExtension.php
-
 		-
 			message: "#^Doing instanceof PHPStan\\\\Type\\\\Constant\\\\ConstantStringType is error\\-prone and deprecated\\. Use Type\\:\\:getConstantStrings\\(\\) instead\\.$#"
 			count: 1

src/Extensions/DoctrineResultDynamicReturnTypeExtension.php

@@ -67,9 +67,10 @@ private function inferType(MethodReflection $methodReflection, MethodCall $metho
         $resultType = $scope->getType($methodCall->var);
         if ('columncount' === strtolower($methodReflection->getName())) {
             if ($resultType instanceof DoctrineResultObjectType) {
-                $resultRowType = $resultType->getRowType();
+                $arrays = $resultType->getRowType()->getConstantArrays();
+                if (count($arrays) === 1) {
+                    $resultRowType = $arrays[0];
 
-                if ($resultRowType instanceof ConstantArrayType) {
                     $columnCount = \count($resultRowType->getKeyTypes()) / 2;
                     if (! \is_int($columnCount)) {
                         throw new ShouldNotHappenException();

src/Extensions/PdoStatementColumnCountDynamicReturnTypeExtension.php

@@ -32,8 +32,9 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
         $statementType = $scope->getType($methodCall->var);
 
         if ($statementType instanceof PdoStatementObjectType) {
-            $rowType = $statementType->newWithFetchType(QueryReflector::FETCH_TYPE_NUMERIC)->getRowType();
-            if ($rowType instanceof ConstantArrayType) {
+            $arrays = $statementType->newWithFetchType(QueryReflector::FETCH_TYPE_NUMERIC)->getRowType()->getConstantArrays();
+            if (count($arrays) === 1) {
+                $rowType = $arrays[0];
                 return new ConstantIntegerType(\count($rowType->getKeyTypes()));
             }
         }