merged branch dlsniper/validator-deprecation (PR symfony#6929)

fabpot · fabpot · commit 4b7575464cef · 2013-01-31T16:01:51.000+01:00
This PR was merged into the master branch. Commits ------- d0341e8 Replaced call that triggers deprecated error Discussion ---------- [Validator][ChoiceValidator] Replaced call that triggers deprecated error | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | ~ | License | MIT | Doc PR | ~ This removes the deprecation warnings from the ChoiceValidator.
diff --git a/src/Symfony/Component/Validator/Constraints/ChoiceValidator.php b/src/Symfony/Component/Validator/Constraints/ChoiceValidator.php
@@ -45,8 +45,8 @@ public function validate($value, Constraint $constraint)
         }
 
         if ($constraint->callback) {
-            if (is_callable(array($this->context->getCurrentClass(), $constraint->callback))) {
-                $choices = call_user_func(array($this->context->getCurrentClass(), $constraint->callback));
+            if (is_callable(array($this->context->getClassName(), $constraint->callback))) {
+                $choices = call_user_func(array($this->context->getClassName(), $constraint->callback));
             } elseif (is_callable($constraint->callback)) {
                 $choices = call_user_func($constraint->callback);
             } else {
