refactor PlaceholderValidation (#183)

Co-authored-by: Markus Staab <[email protected]>

Author: staabm

.phpunit-phpstan-dba.cache

@@ -4,14 +4,33 @@
 
 namespace staabm\PHPStanDba\QueryReflection;
 
+use PhpParser\Node\Expr;
+use PHPStan\Analyser\Scope;
+
 final class PlaceholderValidation
 {
     /**
      * @param array<string|int, Parameter> $parameters
      *
      * @return iterable<string>
      */
-    public function checkErrors(string $queryString, array $parameters): iterable
+    public function checkQuery(Expr $queryExpr, Scope $scope, array $parameters): iterable
+    {
+        $queryReflection = new QueryReflection();
+
+        foreach ($queryReflection->resolveQueryStrings($queryExpr, $scope) as $queryString) {
+            foreach ($this->checkErrors($queryString, $parameters) as $error) {
+                yield $error;
+            }
+        }
+    }
+
+    /**
+     * @param array<string|int, Parameter> $parameters
+     *
+     * @return iterable<string>
+     */
+    private function checkErrors(string $queryString, array $parameters): iterable
     {
         if ('SELECT' !== QueryReflection::getQueryType($queryString)) {
             return;

src/QueryReflection/PlaceholderValidation.php

@@ -85,11 +85,9 @@ private function checkErrors(MethodReflection $methodReflection, MethodCall $met
         try {
             $errors = [];
             $placeholderReflection = new PlaceholderValidation();
-            foreach ($queryReflection->resolveQueryStrings($queryExpr, $scope) as $queryString) {
-                foreach ($placeholderReflection->checkErrors($queryString, $parameters) as $error) {
-                    // make error messages unique
-                    $errors[$error] = $error;
-                }
+            foreach ($placeholderReflection->checkQuery($queryExpr, $scope, $parameters) as $error) {
+                // make error messages unique
+                $errors[$error] = $error;
             }
         } catch (UnresolvableQueryException $exception) {
             return [

src/Rules/PdoStatementExecuteMethodRule.php

@@ -122,10 +122,9 @@ private function checkErrors(CallLike $callLike, Scope $scope): array
                 }
             }
 
-            foreach ($queryReflection->resolveQueryStrings($queryExpr, $scope) as $queryString) {
-                foreach ($placeholderReflection->checkErrors($queryString, $parameters) as $error) {
-                    $errors[$error] = $error;
-                }
+            foreach ($placeholderReflection->checkQuery($queryExpr, $scope, $parameters) as $error) {
+                // make error messages unique
+                $errors[$error] = $error;
             }
 
             $ruleErrors = [];