Commitc62d94c

Peter Bouwdewijn

committed

[Validator] Added context object method callback to choice validator

1 parent98051e9 commitc62d94cCopy full SHA for c62d94c

File tree

+18

-0

lines changed

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

+18

-0

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ public function validate($value, Constraint $constraint)`
`48`	`48`
`49`	`49`	`if ($constraint->callback) {`
`50`	`50`	`if (!is_callable($choices =array($this->context->getClassName(),$constraint->callback))`
	`51`	`+ && !is_callable($choices =array($this->context->getObject(),$constraint->callback))`
`51`	`52`	`&& !is_callable($choices =$constraint->callback)`
`52`	`53`	`) {`
`53`	`54`	`thrownewConstraintDefinitionException('The Choice constraint expects a valid callback');`

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,11 @@ public static function staticCallback()`
`32`	`32`	`returnarray('foo','bar');`
`33`	`33`	`}`
`34`	`34`
	`35`	`+publicfunctionobjectMethodCallback()`
	`36`	`+ {`
	`37`	`+returnarray('foo','bar');`
	`38`	`+ }`
	`39`	`+`
`35`	`40`	`/**`
`36`	`41`	`* @expectedException \Symfony\Component\Validator\Exception\UnexpectedTypeException`
`37`	`42`	`*/`
`@@ -118,6 +123,18 @@ public function testValidChoiceCallbackContextMethod()`
`118`	`123`	`$this->assertNoViolation();`
`119`	`124`	`}`
`120`	`125`
	`126`	`+publicfunctiontestValidChoiceCallbackContextObjectMethod()`
	`127`	`+ {`
	`128`	`+// search $this for "objectMethodCallback"`
	`129`	`+$this->setObject($this);`
	`130`	`+`
	`131`	`+$constraint =newChoice(array('callback' =>'objectMethodCallback'));`
	`132`	`+`
	`133`	`+$this->validator->validate('bar',$constraint);`
	`134`	`+`
	`135`	`+$this->assertNoViolation();`
	`136`	`+ }`
	`137`	`+`
`121`	`138`	`publicfunctiontestMultipleChoices()`
`122`	`139`	`{`
`123`	`140`	`$constraint =newChoice(array(`

Comments

(0)