support optional parameter values (#181)

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

Author: staabm

.phpunit-phpstan-dba.cache

@@ -58,7 +58,7 @@ private function checkErrors(string $queryString, array $parameters): iterable
     }
 
     /**
-     * @param array<string|int, Parameter> $parameters
+     * @param non-empty-array<string|int, Parameter> $parameters
      *
      * @return iterable<string>
      */
@@ -67,16 +67,27 @@ private function checkParameterValues(string $queryString, array $parameters, in
         $queryReflection = new QueryReflection();
 
         $parameterCount = \count($parameters);
+        $minParameterCount = 0;
+        foreach ($parameters as $parameter) {
+            if ($parameter->isOptional) {
+                continue;
+            }
+            ++$minParameterCount;
+        }
 
-        if ($parameterCount !== $placeholderCount) {
+        if ($parameterCount !== $placeholderCount && $placeholderCount !== $minParameterCount) {
             $placeholderExpectation = sprintf('Query expects %s placeholder', $placeholderCount);
             if ($placeholderCount > 1) {
                 $placeholderExpectation = sprintf('Query expects %s placeholders', $placeholderCount);
             }
 
-            $parameterActual = sprintf('but %s value is given', $parameterCount);
-            if ($parameterCount > 1) {
-                $parameterActual = sprintf('but %s values are given', $parameterCount);
+            if ($minParameterCount !== $parameterCount) {
+                $parameterActual = sprintf('but %s values are given', $minParameterCount.'-'.$parameterCount);
+            } else {
+                $parameterActual = sprintf('but %s value is given', $parameterCount);
+                if ($parameterCount > 1) {
+                    $parameterActual = sprintf('but %s values are given', $parameterCount);
+                }
             }
 
             yield $placeholderExpectation.', '.$parameterActual.'.';
@@ -91,10 +102,13 @@ private function checkParameterValues(string $queryString, array $parameters, in
             }
         }
 
-        foreach ($parameters as $placeholderKey => $value) {
+        foreach ($parameters as $placeholderKey => $parameter) {
             if (\is_int($placeholderKey)) {
                 continue;
             }
+            if ($parameter->isOptional) {
+                continue;
+            }
             if (!\in_array($placeholderKey, $namedPlaceholders)) {
                 yield sprintf('Value %s is given, but the query does not contain this placeholder.', $placeholderKey);
             }

src/QueryReflection/PlaceholderValidation.php

@@ -282,4 +282,15 @@ public function noErrorOnLockedRead(Connection $connection, int $limit, int $off
             FOR SHARE
         ', [':gesperrt' => 1, ':limit' => $limit, ':offset' => $offset]);
     }
+
+    public function noErrorInBug174(Connection $connection, string $name, ?int $gesperrt = null, ?int $adaid = null) {
+        $sql = 'SELECT adaid FROM ada WHERE email = :name';
+        $args = ['name' => $name];
+        if (null !== $gesperrt) {
+            $sql .= ' AND gesperrt = :gesperrt';
+            $args['gesperrt'] = $gesperrt;
+        }
+
+        $connection->preparedQuery($sql, $args);
+    }
 }