NotificationsYou must be signed in to change notification settings
Fork9.6k
Star30.4k

Commit04652b7

committed

bug#54137 [Validator] UniqueValidator - normalize before reducing keys (Brajk19)

This PR was squashed before being merged into the 6.4 branch.Discussion----------[Validator] UniqueValidator - normalize before reducing keys| Q | A| ------------- | ---| Branch? | 6.4| Bug fix? | yes| New feature? | no| Deprecations? | no| Issues || License | MITIn#42403 checking for uniqueness of certain collection keys was enabled. Method `UniqueValidator::reduceElementKeys` removes all keys which are not specified.Problem is that this happens before normalization, which in my opinion is not great because that method accepts array argument and if i have some object (DTO), TypeError will be thrown.Example:```phpclass ParentDTO{ /** * `@var` ChildDTO[] */ #[Assert\Unique( normalizer: [ChildDTO::class, 'normalize'] fields: 'id' )] public array $children;}``````phpclass ChildDTO{ public string $id; public string $name; public static function normalize(self $obj): array { return [ 'id' => $obj->id, 'name' => $obj->name ]; }}```Because normalization will happen after `reduceElementKeys` this will be thrown:`TypeError: Symfony\Component\Validator\Constraints\UniqueValidator::reduceElementKeys(): Argument#2 ($element) must be of type array, ...\ChildDTO given, called in .../UniqueValidator.php on line 48`If `$element = $normalizer($element);` is executed before `reduceElementKeys` it would enable using Assert\Unique with array of objects when correctly normalizedCommits-------77df90b [Validator] UniqueValidator - normalize before reducing keys

2 parents5dbc82d +77df90b commit04652b7Copy full SHA for 04652b7

File tree

2 files changed

+33

-2

lines changed

src/Symfony/Component/Validator
- Constraints
  - UniqueValidator.php
- Tests/Constraints
  - UniqueValidatorTest.php

2 files changed

+33

-2

lines changed

`‎src/Symfony/Component/Validator/Constraints/UniqueValidator.php`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,12 +43,12 @@ public function validate(mixed $value, Constraint $constraint)`
`43`	`43`	`$collectionElements = [];`
`44`	`44`	`$normalizer =$this->getNormalizer($constraint);`
`45`	`45`	`foreach ($valueas$element) {`
	`46`	`+$element =$normalizer($element);`
	`47`	`+`
`46`	`48`	`if ($fields && !$element =$this->reduceElementKeys($fields,$element)) {`
`47`	`49`	`continue;`
`48`	`50`	`}`
`49`	`51`
`50`		`-$element =$normalizer($element);`
`51`		`-`
`52`	`52`	`if (\in_array($element,$collectionElements,true)) {`
`53`	`53`	`$this->context->buildViolation($constraint->message)`
`54`	`54`	`->setParameter('{{ value }}',$this->formatValue($value))`

`‎src/Symfony/Component/Validator/Tests/Constraints/UniqueValidatorTest.php`

Lines changed: 31 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`useSymfony\Component\Validator\Exception\UnexpectedTypeException;`
`17`	`17`	`useSymfony\Component\Validator\Exception\UnexpectedValueException;`
`18`	`18`	`useSymfony\Component\Validator\Test\ConstraintValidatorTestCase;`
	`19`	`+useSymfony\Component\Validator\Tests\Dummy\DummyClassOne;`
`19`	`20`
`20`	`21`	`class UniqueValidatorTestextends ConstraintValidatorTestCase`
`21`	`22`	`{`
`@@ -283,6 +284,36 @@ public static function getInvalidCollectionValues(): array`
`283`	`284`	`],`
`284`	`285`	`];`
`285`	`286`	`}`
	`287`	`+`
	`288`	`+publicfunctiontestArrayOfObjectsUnique()`
	`289`	`+ {`
	`290`	`+$array = [`
	`291`	`+newDummyClassOne(),`
	`292`	`+newDummyClassOne(),`
	`293`	`+newDummyClassOne(),`
	`294`	`+ ];`
	`295`	`+`
	`296`	`+$array[0]->code ='1';`
	`297`	`+$array[1]->code ='2';`
	`298`	`+$array[2]->code ='3';`
	`299`	`+`
	`300`	`+$this->validator->validate(`
	`301`	`+$array,`
	`302`	`+newUnique(`
	`303`	`+ normalizer: [self::class,'normalizeDummyClassOne'],`
	`304`	`+ fields:'code'`
	`305`	`+ )`
	`306`	`+ );`
	`307`	`+`
	`308`	`+$this->assertNoViolation();`
	`309`	`+ }`
	`310`	`+`
	`311`	`+publicstaticfunctionnormalizeDummyClassOne(DummyClassOne$obj):array`
	`312`	`+ {`
	`313`	`+return [`
	`314`	`+'code' =>$obj->code,`
	`315`	`+ ];`
	`316`	`+ }`
`286`	`317`	`}`
`287`	`318`
`288`	`319`	`class CallableClass`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit04652b7

File tree

2 files changed

2 files changed

`‎src/Symfony/Component/Validator/Constraints/UniqueValidator.php`

`‎src/Symfony/Component/Validator/Tests/Constraints/UniqueValidatorTest.php`

0 commit comments