NotificationsYou must be signed in to change notification settings
Fork9.7k
Star30.8k

Commit71dfa35

committed

add newchoices wildcard in message

1 parent5f737e8 commit71dfa35Copy full SHA for 71dfa35

File tree

2 files changed

-0

lines changed

src/Symfony/Component/Validator
- Constraints
  - ChoiceValidator.php
- Tests/Constraints
  - ChoiceValidatorTest.php

2 files changed

-0

lines changed

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

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,7 @@ public function validate($value, Constraint $constraint)`
`68`	`68`	`if (!\in_array($_value,$choices,true)) {`
`69`	`69`	`$this->context->buildViolation($constraint->multipleMessage)`
`70`	`70`	`->setParameter('{{ value }}',$this->formatValue($_value))`
	`71`	`+ ->setParameter('{{ choices }}',$this->formatValues($choices))`
`71`	`72`	`->setCode(Choice::NO_SUCH_CHOICE_ERROR)`
`72`	`73`	`->setInvalidValue($_value)`
`73`	`74`	`->addViolation();`
`@@ -100,6 +101,7 @@ public function validate($value, Constraint $constraint)`
`100`	`101`	`}elseif (!\in_array($value,$choices,true)) {`
`101`	`102`	`$this->context->buildViolation($constraint->message)`
`102`	`103`	`->setParameter('{{ value }}',$this->formatValue($value))`
	`104`	`+ ->setParameter('{{ choices }}',$this->formatValues($choices))`
`103`	`105`	`->setCode(Choice::NO_SUCH_CHOICE_ERROR)`
`104`	`106`	`->addViolation();`
`105`	`107`	`}`

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

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -169,6 +169,7 @@ public function testInvalidChoice()`
`169`	`169`
`170`	`170`	`$this->buildViolation('myMessage')`
`171`	`171`	`->setParameter('{{ value }}','"baz"')`
	`172`	`+ ->setParameter('{{ choices }}','"foo", "bar"')`
`172`	`173`	`->setCode(Choice::NO_SUCH_CHOICE_ERROR)`
`173`	`174`	`->assertRaised();`
`174`	`175`	`}`
`@@ -186,6 +187,7 @@ public function testInvalidChoiceEmptyChoices()`
`186`	`187`
`187`	`188`	`$this->buildViolation('myMessage')`
`188`	`189`	`->setParameter('{{ value }}','"baz"')`
	`190`	`+ ->setParameter('{{ choices }}','')`
`189`	`191`	`->setCode(Choice::NO_SUCH_CHOICE_ERROR)`
`190`	`192`	`->assertRaised();`
`191`	`193`	`}`
`@@ -202,6 +204,7 @@ public function testInvalidChoiceMultiple()`
`202`	`204`
`203`	`205`	`$this->buildViolation('myMessage')`
`204`	`206`	`->setParameter('{{ value }}','"baz"')`
	`207`	`+ ->setParameter('{{ choices }}','"foo", "bar"')`
`205`	`208`	`->setInvalidValue('baz')`
`206`	`209`	`->setCode(Choice::NO_SUCH_CHOICE_ERROR)`
`207`	`210`	`->assertRaised();`
`@@ -275,6 +278,7 @@ public function testStrictDisallowsDifferentType()`
`275`	`278`
`276`	`279`	`$this->buildViolation('myMessage')`
`277`	`280`	`->setParameter('{{ value }}','"2"')`
	`281`	`+ ->setParameter('{{ choices }}','1, 2')`
`278`	`282`	`->setCode(Choice::NO_SUCH_CHOICE_ERROR)`
`279`	`283`	`->assertRaised();`
`280`	`284`	`}`
`@@ -291,6 +295,7 @@ public function testStrictWithMultipleChoices()`
`291`	`295`
`292`	`296`	`$this->buildViolation('myMessage')`
`293`	`297`	`->setParameter('{{ value }}','"3"')`
	`298`	`+ ->setParameter('{{ choices }}','1, 2, 3')`
`294`	`299`	`->setInvalidValue('3')`
`295`	`300`	`->setCode(Choice::NO_SUCH_CHOICE_ERROR)`
`296`	`301`	`->assertRaised();`

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!

Commit71dfa35

File tree

2 files changed

2 files changed

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

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

0 commit comments