Commit77df90b

authored and

committed

[Validator] UniqueValidator - normalize before reducing keys

1 parentb85a083 commit77df90bCopy full SHA for 77df90b

File tree

+33

-2

lines changed

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

+33

-2

lines changed

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))`

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`

Comments

(0)