Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[Validator] Fix fields without constraints in Collection #53755

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
Feb 9, 2024
Merged

[Validator] Fix fields without constraints in Collection #53755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b341535
deal with fields for which no constraints have been configured
xabbuh Jan 5, 2024
f6217d8
[Validator] Fix fields without constraints in `Collection`
HypeMC Feb 4, 2024
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
29 changes: 28 additions & 1 deletion src/Symfony/Component/Validator/Constraints/Collection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class Collection extends Composite
*/
public function __construct($fields = null, ?array $groups = null, $payload = null, ?bool $allowExtraFields = null, ?bool $allowMissingFields = null, ?string $extraFieldsMessage = null, ?string $missingFieldsMessage = null)
{
if (\is_array($fields) && ([] === $fields || ($firstField = reset($fields)) instanceof Constraint || ($firstField[0] ?? null) instanceof Constraint)) {
if (self::isFieldsOption($fields)) {
$fields = ['fields' => $fields];
}

Expand Down Expand Up @@ -87,4 +87,31 @@ protected function getCompositeOption()
{
return 'fields';
}

private static function isFieldsOption($options): bool
{
if (!\is_array($options)) {
return false;
}

foreach ($options as $optionOrField) {
if ($optionOrField instanceof Constraint) {
return true;
}

if (null === $optionOrField) {
continue;
}

if (!\is_array($optionOrField)) {
return false;
}

if ($optionOrField && !($optionOrField[0] ?? null) instanceof Constraint) {
return false;
}
}

return true;
}
}
44 changes: 44 additions & 0 deletions src/Symfony/Component/Validator/Tests/Constraints/CollectionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,50 @@ public function testEmptyFieldsInOptions()
'extraFieldsMessage' => 'foo bar baz',
]);

$this->assertSame([], $constraint->fields);
$this->assertTrue($constraint->allowExtraFields);
$this->assertSame('foo bar baz', $constraint->extraFieldsMessage);
}

/**
* @testWith [[]]
* [null]
*/
public function testEmptyConstraintListForField(?array $fieldConstraint)
{
$constraint = new Collection(
[
'foo' => $fieldConstraint,
],
null,
null,
true,
null,
'foo bar baz'
);

$this->assertArrayHasKey('foo', $constraint->fields);
$this->assertInstanceOf(Required::class, $constraint->fields['foo']);
$this->assertTrue($constraint->allowExtraFields);
$this->assertSame('foo bar baz', $constraint->extraFieldsMessage);
}

/**
* @testWith [[]]
* [null]
*/
public function testEmptyConstraintListForFieldInOptions(?array $fieldConstraint)
{
$constraint = new Collection([
'fields' => [
'foo' => $fieldConstraint,
],
'allowExtraFields' => true,
'extraFieldsMessage' => 'foo bar baz',
]);

$this->assertArrayHasKey('foo', $constraint->fields);
$this->assertInstanceOf(Required::class, $constraint->fields['foo']);
$this->assertTrue($constraint->allowExtraFields);
$this->assertSame('foo bar baz', $constraint->extraFieldsMessage);
}
Expand Down