feature #19745 [Validator] Added context object method callback to choice validator (Peter Bouwdewijn)

This PR was squashed before being merged into the 3.2-dev branch (closes #19745).

Discussion
----------

[Validator] Added context object method callback to choice validator

| Q             | A
| ------------- | ---
| Branch?       | "master"
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Commits
-------

835dcf3 [Validator] Added context object method callback to choice validator

Author: fabpot

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

@@ -47,7 +47,8 @@ public function validate($value, Constraint $constraint)
         }
 
         if ($constraint->callback) {
-            if (!is_callable($choices = array($this->context->getClassName(), $constraint->callback))
+            if (!is_callable($choices = array($this->context->getObject(), $constraint->callback))
+                && !is_callable($choices = array($this->context->getClassName(), $constraint->callback))
                 && !is_callable($choices = $constraint->callback)
             ) {
                 throw new ConstraintDefinitionException('The Choice constraint expects a valid callback');

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
      */
@@ -132,6 +137,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(