validate parameter count only with unnamed placeholders (#220)

Author: staabm

src/QueryReflection/PlaceholderValidation.php

@@ -37,20 +37,23 @@ private function checkErrors(string $queryString, array $parameters): iterable
         }
 
         $queryReflection = new QueryReflection();
-        $placeholderCount = $queryReflection->countPlaceholders($queryString);
+        if ($queryReflection->containsNamedPlaceholders($queryString, $parameters)) {
+            yield from $this->validateNamedPlaceholders($queryString, $parameters);
 
-        yield from $this->checkParameterValues($queryString, $parameters, $placeholderCount);
+            return;
+        }
+
+        $placeholderCount = $queryReflection->countPlaceholders($queryString);
+        yield from $this->validateUnnamedPlaceholders($parameters, $placeholderCount);
     }
 
     /**
      * @param array<string|int, Parameter> $parameters
      *
      * @return iterable<string>
      */
-    private function checkParameterValues(string $queryString, array $parameters, int $placeholderCount): iterable
+    private function validateUnnamedPlaceholders(array $parameters, int $placeholderCount): iterable
     {
-        $queryReflection = new QueryReflection();
-
         $parameterCount = \count($parameters);
         $minParameterCount = 0;
         foreach ($parameters as $parameter) {
@@ -82,11 +85,19 @@ private function checkParameterValues(string $queryString, array $parameters, in
             }
 
             yield $placeholderExpectation.', '.$parameterActual.'.';
-
-            return;
         }
+    }
 
+    /**
+     * @param array<string|int, Parameter> $parameters
+     *
+     * @return iterable<string>
+     */
+    private function validateNamedPlaceholders(string $queryString, array $parameters): iterable
+    {
+        $queryReflection = new QueryReflection();
         $namedPlaceholders = $queryReflection->extractNamedPlaceholders($queryString);
+
         foreach ($namedPlaceholders as $namedPlaceholder) {
             if (!\array_key_exists($namedPlaceholder, $parameters)) {
                 yield sprintf('Query expects placeholder %s, but it is missing from values given.', $namedPlaceholder);

src/QueryReflection/QueryReflection.php

@@ -356,6 +356,26 @@ public function countPlaceholders(string $queryString): int
         return 0;
     }
 
+    /**
+     * @param array<string|int, Parameter> $parameters
+     */
+    public function containsNamedPlaceholders(string $queryString, array $parameters): bool
+    {
+        $namedPlaceholders = $this->extractNamedPlaceholders($queryString);
+
+        if ([] !== $namedPlaceholders) {
+            return true;
+        }
+
+        foreach ($parameters as $parameter) {
+            if (null !== $parameter->name) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     /**
      * @return list<string>
      */

tests/PdoStatementExecuteMethodRuleTest.php

@@ -48,19 +48,19 @@ public function testParameterErrors(): void
             ],
             */
             [
-                'Query expects 1 placeholder, but no values are given.',
+                'Query expects placeholder :adaid, but it is missing from values given.',
                 21,
             ],
             [
                 'Query expects 2 placeholders, but 1 value is given.',
                 24,
             ],
             [
-                'Query expects 2 placeholders, but 1 value is given.',
+                'Query expects placeholder :email, but it is missing from values given.',
                 27,
             ],
             [
-                'Query expects 2 placeholders, but 1 value is given.',
+                'Query expects placeholder :adaid, but it is missing from values given.',
                 30,
             ],
             [
@@ -72,7 +72,7 @@ public function testParameterErrors(): void
                 36,
             ],
             [
-                'Query expects 1 placeholder, but 2 values are given.',
+                'Value :email is given, but the query does not contain this placeholder.',
                 38,
             ],
             [

tests/SyntaxErrorInPreparedStatementMethodRuleTest.php

@@ -61,10 +61,6 @@ public function testSyntaxErrorInQueryRule(): void
                 'Query expects placeholder :name, but it is missing from values given.',
                 307,
             ],
-            [
-                'Query expects 2 placeholders, but 0-1 values are given.',
-                307,
-            ],
         ]);
     }
 }