moved countPlaceholders() and extractNamedPlaceholders() into QueryReflection (#118)

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

Author: staabm

src/QueryReflection/QueryReflection.php

@@ -7,6 +7,7 @@
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\BinaryOp\Concat;
 use PHPStan\Analyser\Scope;
+use PHPStan\ShouldNotHappenException;
 use PHPStan\Type\Constant\ConstantArrayType;
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\Constant\ConstantStringType;
@@ -16,6 +17,8 @@
 
 final class QueryReflection
 {
+    public const REGEX_PLACEHOLDER = '{:[a-zA-Z0-9_]+}';
+
     /**
      * @var QueryReflector|null
      */
@@ -182,4 +185,42 @@ public static function getRuntimeConfiguration(): RuntimeConfiguration
 
         return self::$runtimeConfiguration;
     }
+
+    /**
+     * @return 0|positive-int
+     */
+    public function countPlaceholders(string $queryString): int
+    {
+        $numPlaceholders = substr_count($queryString, '?');
+
+        if (0 !== $numPlaceholders) {
+            return $numPlaceholders;
+        }
+
+        $numPlaceholders = preg_match_all(self::REGEX_PLACEHOLDER, $queryString);
+        if (false === $numPlaceholders || $numPlaceholders < 0) {
+            throw new ShouldNotHappenException();
+        }
+
+        return $numPlaceholders;
+    }
+
+    /**
+     * @return list<string>
+     */
+    public function extractNamedPlaceholders(string $queryString): array
+    {
+        // pdo does not support mixing of named and '?' placeholders
+        $numPlaceholders = substr_count($queryString, '?');
+
+        if (0 !== $numPlaceholders) {
+            return [];
+        }
+
+        if (preg_match_all(self::REGEX_PLACEHOLDER, $queryString, $matches) > 0) {
+            return $matches[0];
+        }
+
+        return [];
+    }
 }

src/Rules/PdoStatementExecuteMethodRule.php

@@ -23,8 +23,6 @@
  */
 final class PdoStatementExecuteMethodRule implements Rule
 {
-    public const REGEX_PLACEHOLDER = '{:[a-zA-Z0-9_]+}';
-
     public function getNodeType(): string
     {
         return MethodCall::class;
@@ -71,7 +69,7 @@ private function checkErrors(MethodReflection $methodReflection, MethodCall $met
         }
 
         $args = $methodCall->getArgs();
-        $placeholderCount = $this->countPlaceholders($queryString);
+        $placeholderCount = $queryReflection->countPlaceholders($queryString);
 
         if (0 === \count($args)) {
             if (0 === $placeholderCount) {
@@ -123,7 +121,7 @@ private function checkParameterValues(MethodCall $methodCall, Scope $scope, stri
         }
 
         $errors = [];
-        $namedPlaceholders = $this->extractNamedPlaceholders($queryString);
+        $namedPlaceholders = $queryReflection->extractNamedPlaceholders($queryString);
         if (\count($namedPlaceholders) > 0) {
             foreach ($namedPlaceholders as $namedPlaceholder) {
                 if (!\array_key_exists($namedPlaceholder, $parameters)) {
@@ -140,42 +138,4 @@ private function checkParameterValues(MethodCall $methodCall, Scope $scope, stri
 
         return $errors;
     }
-
-    /**
-     * @return 0|positive-int
-     */
-    private function countPlaceholders(string $queryString): int
-    {
-        $numPlaceholders = substr_count($queryString, '?');
-
-        if (0 !== $numPlaceholders) {
-            return $numPlaceholders;
-        }
-
-        $numPlaceholders = preg_match_all(self::REGEX_PLACEHOLDER, $queryString);
-        if (false === $numPlaceholders || $numPlaceholders < 0) {
-            throw new ShouldNotHappenException();
-        }
-
-        return $numPlaceholders;
-    }
-
-    /**
-     * @return list<string>
-     */
-    private function extractNamedPlaceholders(string $queryString): array
-    {
-        // pdo does not support mixing of named and '?' placeholders
-        $numPlaceholders = substr_count($queryString, '?');
-
-        if (0 !== $numPlaceholders) {
-            return [];
-        }
-
-        if (preg_match_all(self::REGEX_PLACEHOLDER, $queryString, $matches) > 0) {
-            return $matches[0];
-        }
-
-        return [];
-    }
 }