refactor placeholder validation to ease re-use (#139)

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

Author: staabm

src/QueryReflection/PlaceholderValidation.php

@@ -4,21 +4,19 @@
 
 namespace staabm\PHPStanDba\QueryReflection;
 
-use PhpParser\Node\Expr\MethodCall;
-use PHPStan\Analyser\Scope;
-
 final class PlaceholderValidation
 {
     /**
+     * @param array<string|int, scalar|null> $parameters
+     *
      * @return iterable<string>
      */
-    public function checkErrors(string $queryString, MethodCall $methodCall, Scope $scope): iterable
+    public function checkErrors(string $queryString, array $parameters): iterable
     {
         $queryReflection = new QueryReflection();
-        $args = $methodCall->getArgs();
         $placeholderCount = $queryReflection->countPlaceholders($queryString);
 
-        if (0 === \count($args)) {
+        if (0 === \count($parameters)) {
             if (0 === $placeholderCount) {
                 return;
             }
@@ -33,22 +31,18 @@ public function checkErrors(string $queryString, MethodCall $methodCall, Scope $
             return;
         }
 
-        yield from $this->checkParameterValues($methodCall, $scope, $queryString, $placeholderCount);
+        yield from $this->checkParameterValues($queryString, $parameters, $placeholderCount);
     }
 
     /**
+     * @param array<string|int, scalar|null> $parameters
+     *
      * @return iterable<string>
      */
-    private function checkParameterValues(MethodCall $methodCall, Scope $scope, string $queryString, int $placeholderCount): iterable
+    private function checkParameterValues(string $queryString, array $parameters, int $placeholderCount): iterable
     {
         $queryReflection = new QueryReflection();
-        $args = $methodCall->getArgs();
 
-        $parameterTypes = $scope->getType($args[0]->value);
-        $parameters = $queryReflection->resolveParameters($parameterTypes);
-        if (null === $parameters) {
-            return;
-        }
         $parameterCount = \count($parameters);
 
         if ($parameterCount !== $placeholderCount) {

src/QueryReflection/QueryReflection.php

@@ -156,7 +156,7 @@ private function getQueryType(string $query): ?string
     }
 
     /**
-     * @return array<string|int, scalar|null>
+     * @return array<string|int, scalar|null>|null
      */
     public function resolveParameters(Type $parameterTypes): ?array
     {

src/Rules/PdoStatementExecuteMethodRule.php

@@ -55,18 +55,26 @@ public function processNode(Node $methodCall, Scope $scope): array
      */
     private function checkErrors(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): array
     {
+        $queryReflection = new QueryReflection();
         $stmtReflection = new PdoStatementReflection();
         $queryExpr = $stmtReflection->findPrepareQueryStringExpression($methodReflection, $methodCall);
 
         if (null === $queryExpr) {
             return [];
         }
 
+        $args = $methodCall->getArgs();
+        if (\count($args) < 1) {
+            $parameters = [];
+        } else {
+            $parameterTypes = $scope->getType($args[0]->value);
+            $parameters = $queryReflection->resolveParameters($parameterTypes) ?? [];
+        }
+
         $errors = [];
-        $queryReflection = new QueryReflection();
         $placeholderReflection = new PlaceholderValidation();
         foreach ($queryReflection->resolveQueryStrings($queryExpr, $scope) as $queryString) {
-            foreach ($placeholderReflection->checkErrors($queryString, $methodCall, $scope) as $error) {
+            foreach ($placeholderReflection->checkErrors($queryString, $parameters) as $error) {
                 // make error messages unique
                 $errors[$error] = $error;
             }