Support spread operator in prepared statement parameter expressions (#750)

* Support syntax-error detection with spread-operator values * more tests * Update bug-749.php * fix * Update SyntaxErrorInPreparedStatementMethodRuleTest.php * cs * record * Use QueryReflection->resolveParameterTypes() everywhere * Update QueryReflection.php * fix * fix * Update SyntaxErrorInPreparedStatementMethodRule.php * Update QueryReflection.php * Update QueryReflection.php * simplify * inference with spread * Update .phpunit-phpstan-dba-mysqli.cache * record

Author: staabm

.phpstan-dba-mysqli.cache

@@ -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);
  }
 

.phpstan-dba-pdo-mysql.cache

@@ -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/DoctrineConnectionExecuteQueryDynamicReturnTypeExtension.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/DoctrineConnectionFetchDynamicReturnTypeExtension.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();