Skip to content

Improve #18

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 2 commits into from
Apr 20, 2019
Merged

Improve #18

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
186bff4
Improve
yoanm Apr 20, 2019
7dc4d29
Imprve
yoanm Apr 20, 2019
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
37 changes: 23 additions & 14 deletions src/App/Helper/MinMaxHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,24 +81,12 @@ private function appendCollectionDoc(CollectionDoc $doc, Constraint $constraint)
} elseif ($constraint instanceof Assert\NotBlank && null === $doc->getMinItem()) {
// Not blank so minimum 1 item
$doc->setMinItem(1);
}/* // Documentation does not mention array, counter to NotBlank constraint
} /* Documentation does not mention array, counter to NotBlank constraint
elseif ($constraint instanceof Assert\Blank && null === $doc->getMaxItem()) {
// Blank so maximum 0 item
$doc->setMaxItem(0);
}*/
if ($constraint instanceof Assert\GreaterThan || $constraint instanceof Assert\GreaterThanOrEqual) {
$doc->setMinItem(
$constraint instanceof Assert\GreaterThanOrEqual
? $constraint->value
: $constraint->value + 1
);
} elseif ($constraint instanceof Assert\LessThan || $constraint instanceof Assert\LessThanOrEqual) {
$doc->setMaxItem(
$constraint instanceof Assert\LessThanOrEqual
? $constraint->value
: $constraint->value - 1
);
}
$this->appendLessGreaterThanMinMaxItem($doc, $constraint);
}

/**
Expand All @@ -124,4 +112,25 @@ private function appendNumberMinMax(NumberDoc $doc, Constraint $constraint) : vo
$doc->setMin($constraint->value);
}
}

/**
* @param CollectionDoc $doc
* @param Constraint $constraint
*/
private function appendLessGreaterThanMinMaxItem(CollectionDoc $doc, Constraint $constraint): void
{
if ($constraint instanceof Assert\GreaterThan || $constraint instanceof Assert\GreaterThanOrEqual) {
$doc->setMinItem(
$constraint instanceof Assert\GreaterThanOrEqual
? $constraint->value
: $constraint->value + 1
);
} elseif ($constraint instanceof Assert\LessThan || $constraint instanceof Assert\LessThanOrEqual) {
$doc->setMaxItem(
$constraint instanceof Assert\LessThanOrEqual
? $constraint->value
: $constraint->value - 1
);
}
}
}