Use QueryReflection->resolveParameterTypes() everywhere

Author: staabm

src/Extensions/DoctrineConnectionExecuteQueryDynamicReturnTypeExtension.php

@@ -68,9 +68,8 @@ private function inferType(Expr $queryExpr, ?Expr $paramsExpr, Scope $scope): ?T
             $queryReflection = new QueryReflection();
             $queryStrings = $queryReflection->resolveQueryStrings($queryExpr, $scope);
         } else {
-            $parameterTypes = $scope->getType($paramsExpr);
-
             $queryReflection = new QueryReflection();
+            $parameterTypes = $queryReflection->resolveParameterTypes($paramsExpr, $scope);
             $queryStrings = $queryReflection->resolvePreparedQueryStrings($queryExpr, $parameterTypes, $scope);
         }
 

src/Extensions/DoctrineConnectionFetchDynamicReturnTypeExtension.php

@@ -83,7 +83,7 @@ private function inferType(MethodReflection $methodReflection, Expr $queryExpr,
         if (null === $paramsExpr) {
             $queryStrings = $queryReflection->resolveQueryStrings($queryExpr, $scope);
         } else {
-            $parameterTypes = $scope->getType($paramsExpr);
+            $parameterTypes = $queryReflection->resolveParameterTypes($paramsExpr, $scope);
             $queryStrings = $queryReflection->resolvePreparedQueryStrings($queryExpr, $parameterTypes, $scope);
         }
 

src/Extensions/DoctrineStatementExecuteDynamicReturnTypeExtension.php

@@ -56,16 +56,15 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
     private function inferType(MethodReflection $methodReflection, MethodCall $methodCall, Expr $paramsExpr, Scope $scope): ?Type
     {
         $doctrineReflection = new DoctrineReflection();
-
-        $parameterTypes = $scope->getType($paramsExpr);
-
         $stmtReflection = new PdoStatementReflection();
+
         $queryExpr = $stmtReflection->findPrepareQueryStringExpression($methodCall);
         if (null === $queryExpr) {
             return null;
         }
 
         $queryReflection = new QueryReflection();
+        $parameterTypes = $queryReflection->resolveParameterTypes($paramsExpr, $scope);
         $queryStrings = $queryReflection->resolvePreparedQueryStrings($queryExpr, $parameterTypes, $scope);
 
         return $doctrineReflection->createGenericResult($queryStrings, QueryReflector::FETCH_TYPE_BOTH);

src/Extensions/PdoStatementExecuteTypeSpecifyingExtension.php

@@ -72,9 +72,8 @@ private function inferStatementType(MethodReflection $methodReflection, MethodCa
             return null;
         }
 
-        $parameterTypes = $scope->getType($args[0]->value);
-
         $queryReflection = new QueryReflection();
+        $parameterTypes = $queryReflection->resolveParameterTypes($args[0]->value, $scope);
         $queryStrings = $queryReflection->resolvePreparedQueryStrings($queryExpr, $parameterTypes, $scope);
 
         $reflectionFetchType = QueryReflection::getRuntimeConfiguration()->getDefaultFetchMode();

src/Rules/PdoStatementExecuteMethodRule.php

@@ -90,7 +90,7 @@ private function checkErrors(MethodReflection $methodReflection, MethodCall $met
 
             $parameterTypes = new ConstantArrayType($parameterKeys, $parameterValues);
         } else {
-            $parameterTypes = $scope->getType($args[0]->value);
+            $parameterTypes = $queryReflection->resolveParameterTypes($args[0]->value, $scope);
         }
 
         try {

src/Rules/QueryPlanAnalyzerRule.php

@@ -123,7 +123,7 @@ private function analyze(CallLike $callLike, Scope $scope): array
 
         $parameterTypes = null;
         if (\count($args) > 1) {
-            $parameterTypes = $scope->getType($args[1]->value);
+            $parameterTypes = $queryReflection->resolveParameterTypes($args[1]->value, $scope);
         }
 
         $ruleErrors = [];