merged branch vicb/fixvalid (PR #6938)

fabpot · fabpot · commit d8bceab92726 · 2013-02-01T14:27:32.000+01:00
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #6938). Commits ------- b279dcb [Validator] Fix a deprecated method call in the tests Discussion ---------- [Validator] Fix a deprecated method call in the tests BUG FIX - Travis happier ? --------------------------------------------------------------------------- by stloyd at 2013-02-01T12:23:18Z This should go to `2.2` I guess... =) --------------------------------------------------------------------------- by vicb at 2013-02-01T12:25:43Z Well there has been no official announcement for the 2.2 branch I think ? I hope that some PR pending for master will go into 2.2 anyway ? /cc @fabpot --------------------------------------------------------------------------- by vicb at 2013-02-01T12:38:35Z C'mon Travis, aren't you allowed to fail for 5.5 ? --------------------------------------------------------------------------- by stloyd at 2013-02-01T12:43:42Z @vicb error != failed ;-) Yet I agree, that now it's more confusing than before this new status... --------------------------------------------------------------------------- by fabpot at 2013-02-01T13:27:11Z I will merged it into 2.2. 2.2 is entering the RC phase, so no more modifications will be merged.
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/ChoiceValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/ChoiceValidatorTest.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Validator\Tests\Constraints;
 
-use Symfony\Component\Validator\ExecutionContext;
 use Symfony\Component\Validator\Constraints\Choice;
 use Symfony\Component\Validator\Constraints\ChoiceValidator;
 
@@ -37,7 +36,7 @@ protected function setUp()
         $this->validator->initialize($this->context);
 
         $this->context->expects($this->any())
-            ->method('getCurrentClass')
+            ->method('getClassName')
             ->will($this->returnValue(__CLASS__));
     }
 
