[Validator] Added context object method callback to choice validator

Peter Bouwdewijn · Peter Bouwdewijn · commit dc39bc953c57 · 2016-08-26T13:52:07.000+02:00
diff --git a/src/Symfony/Component/Validator/Constraints/ChoiceValidator.php b/src/Symfony/Component/Validator/Constraints/ChoiceValidator.php
@@ -49,6 +49,7 @@ public function validate($value, Constraint $constraint)
         if ($constraint->callback) {
             if (!is_callable($choices = array($this->context->getClassName(), $constraint->callback))
                 && !is_callable($choices = $constraint->callback)
+                && !is_callable($choices = array($this->context->getObject(), $constraint->callback))
             ) {
                 throw new ConstraintDefinitionException('The Choice constraint expects a valid callback');
             }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/ChoiceValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/ChoiceValidatorTest.php
@@ -32,6 +32,11 @@ public static function staticCallback()
         return array('foo', 'bar');
     }
 
+    public function objectMethodCallback()
+    {
+        return array('foo', 'bar');
+    }
+
     /**
      * @expectedException \Symfony\Component\Validator\Exception\UnexpectedTypeException
      */
@@ -118,6 +123,18 @@ public function testValidChoiceCallbackContextMethod()
         $this->assertNoViolation();
     }
 
+    public function testValidChoiceCallbackContextObjectMethod()
+    {
+        // search $this for "objectMethodCallback"
+        $this->setObject($this);
+
+        $constraint = new Choice(array('callback' => 'objectMethodCallback'));
+
+        $this->validator->validate('bar', $constraint);
+
+        $this->assertNoViolation();
+    }
+
     public function testMultipleChoices()
     {
         $constraint = new Choice(array(

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