refactored PdoStatementReflection (#264)

Author: staabm

src/Extensions/PdoQueryDynamicReturnTypeExtension.php

@@ -13,12 +13,12 @@
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Type\Constant\ConstantBooleanType;
-use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\DynamicMethodReturnTypeExtension;
 use PHPStan\Type\Generic\GenericObjectType;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
+use staabm\PHPStanDba\PdoReflection\PdoStatementReflection;
 use staabm\PHPStanDba\QueryReflection\QueryReflection;
 use staabm\PHPStanDba\QueryReflection\QueryReflector;
 
@@ -76,21 +76,14 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
     private function inferType(MethodCall $methodCall, Expr $queryExpr, Scope $scope): ?Type
     {
         $args = $methodCall->getArgs();
+        $pdoStatementReflection = new PdoStatementReflection();
 
         $reflectionFetchType = QueryReflector::FETCH_TYPE_BOTH;
         if (\count($args) >= 2) {
             $fetchModeType = $scope->getType($args[1]->value);
-            if (!$fetchModeType instanceof ConstantIntegerType) {
-                return null;
-            }
 
-            if (PDO::FETCH_ASSOC === $fetchModeType->getValue()) {
-                $reflectionFetchType = QueryReflector::FETCH_TYPE_ASSOC;
-            } elseif (PDO::FETCH_NUM === $fetchModeType->getValue()) {
-                $reflectionFetchType = QueryReflector::FETCH_TYPE_NUMERIC;
-            } elseif (PDO::FETCH_BOTH === $fetchModeType->getValue()) {
-                $reflectionFetchType = QueryReflector::FETCH_TYPE_BOTH;
-            } else {
+            $reflectionFetchType = $pdoStatementReflection->getFetchType($fetchModeType);
+            if (null === $reflectionFetchType) {
                 return null;
             }
         }

src/Extensions/PdoStatementFetchDynamicReturnTypeExtension.php

@@ -4,7 +4,6 @@
 
 namespace staabm\PHPStanDba\Extensions;
 
-use PDO;
 use PDOStatement;
 use PhpParser\Node\Expr\MethodCall;
 use PHPStan\Analyser\Scope;
@@ -13,7 +12,6 @@
 use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\Constant\ConstantBooleanType;
-use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\DynamicMethodReturnTypeExtension;
 use PHPStan\Type\IntegerType;
 use PHPStan\Type\MixedType;
@@ -22,6 +20,7 @@
 use PHPStan\Type\UnionType;
 use staabm\PHPStanDba\PdoReflection\PdoStatementReflection;
 use staabm\PHPStanDba\QueryReflection\QueryReflection;
+use staabm\PHPStanDba\QueryReflection\QueryReflector;
 
 final class PdoStatementFetchDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
 {
@@ -64,22 +63,20 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
     private function inferType(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): ?Type
     {
         $args = $methodCall->getArgs();
+        $pdoStatementReflection = new PdoStatementReflection();
+
         $statementType = $scope->getType($methodCall->var);
 
-        $fetchType = PDO::FETCH_BOTH;
+        $fetchType = QueryReflector::FETCH_TYPE_BOTH;
         if (\count($args) > 0) {
             $fetchModeType = $scope->getType($args[0]->value);
-            if (!$fetchModeType instanceof ConstantIntegerType) {
-                return null;
-            }
-            $fetchType = $fetchModeType->getValue();
+            $fetchType = $pdoStatementReflection->getFetchType($fetchModeType);
 
-            if (!\in_array($fetchType, [PDO::FETCH_ASSOC, PDO::FETCH_NUM, PDO::FETCH_BOTH], true)) {
+            if (null === $fetchType) {
                 return null;
             }
         }
 
-        $pdoStatementReflection = new PdoStatementReflection();
         $resultType = $pdoStatementReflection->getStatementResultType($statementType, $fetchType);
         if (null === $resultType) {
             return null;

src/PdoReflection/PdoStatementReflection.php

@@ -14,6 +14,7 @@
 use PHPStan\Type\Generic\GenericObjectType;
 use PHPStan\Type\Type;
 use staabm\PHPStanDba\QueryReflection\ExpressionFinder;
+use staabm\PHPStanDba\QueryReflection\QueryReflector;
 
 final class PdoStatementReflection
 {
@@ -33,7 +34,27 @@ public function findPrepareQueryStringExpression(MethodCall $methodCall): ?Expr
     }
 
     /**
-     * @param PDO::FETCH* $fetchType
+     * @return QueryReflector::FETCH_TYPE*|null
+     */
+    public function getFetchType(Type $fetchModeType): ?int
+    {
+        if (!$fetchModeType instanceof ConstantIntegerType) {
+            return null;
+        }
+
+        if (PDO::FETCH_ASSOC === $fetchModeType->getValue()) {
+            return QueryReflector::FETCH_TYPE_ASSOC;
+        } elseif (PDO::FETCH_NUM === $fetchModeType->getValue()) {
+            return QueryReflector::FETCH_TYPE_NUMERIC;
+        } elseif (PDO::FETCH_BOTH === $fetchModeType->getValue()) {
+            return QueryReflector::FETCH_TYPE_BOTH;
+        }
+
+        return null;
+    }
+
+    /**
+     * @param QueryReflector::FETCH_TYPE* $fetchType
      */
     public function getStatementResultType(Type $statementType, int $fetchType): ?Type
     {
@@ -47,17 +68,17 @@ public function getStatementResultType(Type $statementType, int $fetchType): ?Ty
         }
 
         $resultType = $genericTypes[0];
-        if ((PDO::FETCH_NUM === $fetchType || PDO::FETCH_ASSOC === $fetchType) &&
+        if ((QueryReflector::FETCH_TYPE_NUMERIC === $fetchType || QueryReflector::FETCH_TYPE_ASSOC === $fetchType) &&
             $resultType instanceof ConstantArrayType && \count($resultType->getValueTypes()) > 0) {
             $builder = ConstantArrayTypeBuilder::createEmpty();
 
             $keyTypes = $resultType->getKeyTypes();
             $valueTypes = $resultType->getValueTypes();
 
             foreach ($keyTypes as $i => $keyType) {
-                if (PDO::FETCH_NUM === $fetchType && $keyType instanceof ConstantIntegerType) {
+                if (QueryReflector::FETCH_TYPE_NUMERIC === $fetchType && $keyType instanceof ConstantIntegerType) {
                     $builder->setOffsetValueType($keyType, $valueTypes[$i]);
-                } elseif (PDO::FETCH_ASSOC === $fetchType && $keyType instanceof ConstantStringType) {
+                } elseif (QueryReflector::FETCH_TYPE_ASSOC === $fetchType && $keyType instanceof ConstantStringType) {
                     $builder->setOffsetValueType($keyType, $valueTypes[$i]);
                 }
             }