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

ostrolucky · ostrolucky · commit 57d79b2557f1 · 2017-12-30T17:00:00.000+01:00
diff --git a/src/Symfony/Component/Validator/CHANGELOG.md b/src/Symfony/Component/Validator/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+4.1.0
+-----
+
+ * added a `values` option to the `Expression` constraint
+
 4.0.0
 -----
 
diff --git a/src/Symfony/Component/Validator/Constraints/Expression.php b/src/Symfony/Component/Validator/Constraints/Expression.php
@@ -30,6 +30,7 @@ class Expression extends Constraint
 
     public $message = 'This value is not valid.';
     public $expression;
+    public $values = array();
 
     /**
      * {@inheritdoc}
diff --git a/src/Symfony/Component/Validator/Constraints/ExpressionValidator.php b/src/Symfony/Component/Validator/Constraints/ExpressionValidator.php
@@ -39,7 +39,7 @@ public function validate($value, Constraint $constraint)
             throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Expression');
         }
 
-        $variables = array();
+        $variables = $constraint->values;
         $variables['value'] = $value;
         $variables['this'] = $this->context->getObject();
 
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/ExpressionValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/ExpressionValidatorTest.php
@@ -270,4 +270,18 @@ public function testExpressionLanguageUsage()
 
         $this->assertTrue($used, 'Failed asserting that custom ExpressionLanguage instance is used.');
     }
+
+    public function testPassingCustomValues()
+    {
+        $constraint = new Expression(array(
+            'expression' => 'value + custom == 2',
+            'values' => array(
+                'custom' => 1,
+            ),
+        ));
+
+        $this->validator->validate(1, $constraint);
+
+        $this->assertNoViolation();
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public function validate($value, Constraint $constraint)`
`39`	`39`	`throw new UnexpectedTypeException($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`