Commitd5ca7f2

committed

[Validator] Add option to pass custom values to Expression validator

1 parentb286950 commitd5ca7f2Copy full SHA for d5ca7f2

File tree

+22

-1

lines changed

+22

-1

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,11 @@`
`1`	`1`	`CHANGELOG`
`2`	`2`	`=========`
`3`	`3`
	`4`	`+4.1.0`
	`5`	`+-----`
	`6`	`+`
	`7`	+* added a`values` option to the`Expression` constraint
	`8`	`+`
`4`	`9`	`4.0.0`
`5`	`10`	`-----`
`6`	`11`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,8 @@ class Expression extends Constraint`
`31`	`31`	`public$message ='This value is not valid.';`
`32`	`32`	`public$expression;`
`33`	`33`
	`34`	`+public$values = [];`
	`35`	`+`
`34`	`36`	`/**`
`35`	`37`	`* {@inheritdoc}`
`36`	`38`	`*/`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public function validate($value, Constraint $constraint)`
`39`	`39`	`thrownewUnexpectedTypeException($constraint,__NAMESPACE__.'\Expression');`
`40`	`40`	`}`
`41`	`41`
`42`		`-$variables =array();`
	`42`	`+$variables =$constraint->values;`
`43`	`43`	`$variables['value'] =$value;`
`44`	`44`	`$variables['this'] =$this->context->getObject();`
`45`	`45`

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -270,4 +270,18 @@ public function testExpressionLanguageUsage()`
`270`	`270`
`271`	`271`	`$this->assertTrue($used,'Failed asserting that custom ExpressionLanguage instance is used.');`
`272`	`272`	`}`
	`273`	`+`
	`274`	`+publicfunctiontestPassingCustomValues()`
	`275`	`+ {`
	`276`	`+$constraint =newExpression(array(`
	`277`	`+'expression' =>'value + custom == 2',`
	`278`	`+'values' =>array(`
	`279`	`+'custom' =>1,`
	`280`	`+ ),`
	`281`	`+ ));`
	`282`	`+`
	`283`	`+$this->validator->validate(1,$constraint);`
	`284`	`+`
	`285`	`+$this->assertNoViolation();`
	`286`	`+ }`
`273`	`287`	`}`

Comments

(0)