Skip to content
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

Add support for setting minimum and maximum count of selected #96

Merged
merged 12 commits into from
Oct 30, 2023
Merged

Add support for setting minimum and maximum count of selected #96

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b9377f1
(feature) Add support for setting minimum and maximum count of select…
keichinger Oct 26, 2023
04a0b93
Simplify validation logic again
keichinger Oct 26, 2023
50ebdd2
Split validation + add missing validations
keichinger Oct 27, 2023
0522251
Refine data types and correctly require at least one selected choice …
keichinger Oct 27, 2023
d14e398
Add early exit for multi-select fields
keichinger Oct 30, 2023
9c48669
Update changelog entry type
keichinger Oct 30, 2023
fa4a4dc
Always normalize values to optional strings to simplify validation logic
keichinger Oct 30, 2023
807bced
Add explicit type asserts and casts
keichinger Oct 30, 2023
1bc86b3
Remove unnecessary asserts
keichinger Oct 30, 2023
dd84e76
Move validation before assertion to prevent any crashes
keichinger Oct 30, 2023
45fb77d
Validate against all expected/allowed types on a per-multiselect basis
keichinger Oct 30, 2023
10834f6
Finalize choice validation + add tests
apfelbox Oct 30, 2023
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
38 changes: 19 additions & 19 deletions src/Field/Definition/ChoiceField.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace Torr\Storyblok\Field\Definition;

use Symfony\Component\Validator\Constraints\All;
use Symfony\Component\Validator\Constraints\AtLeastOneOf;
use Symfony\Component\Validator\Constraints\Count;
use Symfony\Component\Validator\Constraints\NotBlank;
use Symfony\Component\Validator\Constraints\NotNull;
Expand Down Expand Up @@ -95,31 +94,30 @@

private function validateSingleSelect (ComponentContext $context, array $contentPath, mixed $data) : void
{
$data = $context->normalizeOptionalString($data);

Check failure on line 97 in src/Field/Definition/ChoiceField.php

View workflow job for this annotation

GitHub Actions / build-test (8.1) 

Parameter #1 $value of method Torr\Storyblok\Context\ComponentContext::normalizeOptionalString() expects string|null, mixed given.

Check failure on line 97 in src/Field/Definition/ChoiceField.php

View workflow job for this annotation

GitHub Actions / build-test (8.2) 

Parameter #1 $value of method Torr\Storyblok\Context\ComponentContext::normalizeOptionalString() expects string|null, mixed given.
keichinger marked this conversation as resolved.
Show resolved Hide resolved

if (null === $data)
{
return;
}

\assert(\is_string($data));
keichinger marked this conversation as resolved.
Show resolved Hide resolved

$context->ensureDataIsValid(
$contentPath,
$this,
$data,
[
new AtLeastOneOf([
new Type("string"),
new Type("int"),
]),
new Type("string"),
$this->required
? new NotBlank()
keichinger marked this conversation as resolved.
Show resolved Hide resolved
: null,
],
);

\assert(\is_int($data) || \is_string($data));

if (\is_string($data))
{
$data = $context->normalizeOptionalString($data);
}

$choicesConstraints = $this->choices->getValidationConstraints(false);

if (null !== $data && !empty($choicesConstraints))
if (!empty($choicesConstraints))
{
$context->ensureDataIsValid(
$contentPath,
Expand All @@ -138,6 +136,13 @@
return;
}

\assert(\is_array($data));

$data = \array_map(
$context->normalizeOptionalString(...),
$data,
);

$context->ensureDataIsValid(
$contentPath,
$this,
Expand All @@ -146,16 +151,11 @@
new Type("array"),
keichinger marked this conversation as resolved.
Show resolved Hide resolved
new All([
new NotNull(),
new AtLeastOneOf([
new Type("string"),
new Type("int"),
]),
new Type("string"),
]),
],
);

\assert(\is_array($data));

if ($this->required || null !== $this->minimumNumberOfOptions || null !== $this->maximumNumberOfOptions)
{
$context->ensureDataIsValid(
Expand Down
Loading