Skip to content

removed code duplication #219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 27, 2022
Merged

removed code duplication #219

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 7 additions & 25 deletions src/QueryReflection/PlaceholderValidation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,30 +39,6 @@ private function checkErrors(string $queryString, array $parameters): iterable
$queryReflection = new QueryReflection();
$placeholderCount = $queryReflection->countPlaceholders($queryString);

$parameterCount = \count($parameters);
$minParameterCount = 0;
foreach ($parameters as $parameter) {
if ($parameter->isOptional) {
continue;
}
++$minParameterCount;
}

if (0 === $parameterCount && 0 === $minParameterCount) {
if (0 === $placeholderCount) {
return;
}

$placeholderExpectation = sprintf('Query expects %s placeholder', $placeholderCount);
if ($placeholderCount > 1) {
$placeholderExpectation = sprintf('Query expects %s placeholders', $placeholderCount);
}

yield sprintf($placeholderExpectation.', but no values are given.', $placeholderCount);

return;
}

yield from $this->checkParameterValues($queryString, $parameters, $placeholderCount);
}

Expand All @@ -84,13 +60,19 @@ private function checkParameterValues(string $queryString, array $parameters, in
++$minParameterCount;
}

if (0 === $parameterCount && 0 === $minParameterCount && 0 === $placeholderCount) {
return;
}

if ($parameterCount !== $placeholderCount && $placeholderCount !== $minParameterCount) {
$placeholderExpectation = sprintf('Query expects %s placeholder', $placeholderCount);
if ($placeholderCount > 1) {
$placeholderExpectation = sprintf('Query expects %s placeholders', $placeholderCount);
}

if ($minParameterCount !== $parameterCount) {
if (0 === $parameterCount) {
$parameterActual = 'but no values are given';
} elseif ($minParameterCount !== $parameterCount) {
$parameterActual = sprintf('but %s values are given', $minParameterCount.'-'.$parameterCount);
} else {
$parameterActual = sprintf('but %s value is given', $parameterCount);
Expand Down