Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions .phpunit-phpstan-dba.cache

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 20 additions & 6 deletions src/QueryReflection/PlaceholderValidation.php
Original file line number Diff line number Diff line change
Expand Up @@ -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>
*/
Expand All @@ -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.'.';
Expand All @@ -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);
}
Expand Down
11 changes: 11 additions & 0 deletions tests/data/syntax-error-in-prepared-statement.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}