refactor (#56)

Co-authored-by: Markus Staab <m.staab@complex-it.de>

Author: staabm

src/Extensions/PdoPrepareDynamicReturnTypeExtension.php

@@ -6,6 +6,7 @@
 
 use PDO;
 use PDOStatement;
+use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\MethodCall;
 use PHPStan\Analyser\Scope;
 use PHPStan\Php\PhpVersion;
@@ -54,10 +55,20 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
             return $defaultReturn;
         }
 
+        $resultType = $this->inferType($args[0]->value, $scope);
+        if (null !== $resultType) {
+            return $resultType;
+        }
+
+        return $defaultReturn;
+    }
+
+    private function inferType(Expr $queryExpr, Scope $scope): ?Type
+    {
         $queryReflection = new QueryReflection();
-        $queryString = $queryReflection->resolveQueryString($args[0]->value, $scope);
+        $queryString = $queryReflection->resolveQueryString($queryExpr, $scope);
         if (null === $queryString) {
-            return $defaultReturn;
+            return null;
         }
 
         $reflectionFetchType = QueryReflector::FETCH_TYPE_BOTH;
@@ -66,6 +77,6 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
             return new GenericObjectType(PDOStatement::class, [$resultType]);
         }
 
-        return $defaultReturn;
+        return null;
     }
 }

src/Extensions/PdoQueryDynamicReturnTypeExtension.php

@@ -6,6 +6,7 @@
 
 use PDO;
 use PDOStatement;
+use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\MethodCall;
 use PHPStan\Analyser\Scope;
 use PHPStan\Php\PhpVersion;
@@ -59,11 +60,23 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
             return $defaultReturn;
         }
 
+        $resultType = $this->inferType($methodCall, $args[0]->value, $scope);
+        if (null !== $resultType) {
+            return $resultType;
+        }
+
+        return $defaultReturn;
+    }
+
+    private function inferType(MethodCall $methodCall, Expr $queryExpr, Scope $scope): ?Type
+    {
+        $args = $methodCall->getArgs();
+
         $reflectionFetchType = QueryReflector::FETCH_TYPE_BOTH;
         if (\count($args) >= 2) {
             $fetchModeType = $scope->getType($args[1]->value);
             if (!$fetchModeType instanceof ConstantIntegerType) {
-                return $defaultReturn;
+                return null;
             }
 
             if (PDO::FETCH_ASSOC === $fetchModeType->getValue()) {
@@ -73,21 +86,21 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
             } elseif (PDO::FETCH_BOTH === $fetchModeType->getValue()) {
                 $reflectionFetchType = QueryReflector::FETCH_TYPE_BOTH;
             } else {
-                return $defaultReturn;
+                return null;
             }
         }
 
         $queryReflection = new QueryReflection();
-        $queryString = $queryReflection->resolveQueryString($args[0]->value, $scope);
+        $queryString = $queryReflection->resolveQueryString($queryExpr, $scope);
         if (null === $queryString) {
-            return $defaultReturn;
+            return null;
         }
 
         $resultType = $queryReflection->getResultType($queryString, $reflectionFetchType);
         if ($resultType) {
             return new GenericObjectType(PDOStatement::class, [$resultType]);
         }
 
-        return $defaultReturn;
+        return null;
     }
 }

src/Extensions/PdoQuoteDynamicReturnTypeExtension.php

@@ -56,12 +56,24 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
             return $defaultReturn;
         }
 
+        $stringType = $this->inferType($methodCall, $scope);
+        if (null !== $stringType) {
+            return $stringType;
+        }
+
+        return $defaultReturn;
+    }
+
+    private function inferType(MethodCall $methodCall, Scope $scope): ?Type
+    {
+        $args = $methodCall->getArgs();
+
         if (1 === \count($args)) {
             $type = PDO::PARAM_STR;
         } else {
             $typeType = $scope->getType($args[1]->value);
             if (!$typeType instanceof ConstantIntegerType) {
-                return $defaultReturn;
+                return null;
             }
             $type = $typeType->getValue();
         }
@@ -78,7 +90,7 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
             return $stringType;
         }
 
-        return TypeCombinator::union($stringType, new ConstantBooleanType(false));
+        return TypeCombinator::union($stringType, new ConstantBooleanType(false));;
     }
 
     private function inferStringType(Type $argType): Type