diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merged branch vicb/fixvalid (PR #6938)

Browse Source 
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.
This commit is contained in:
Fabien Potencier 2013-02-01 14:27:32 +01:00
commit d8bceab927
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Symfony/Component/Validator/Tests/Constraints/ChoiceValidatorTest.php
View File

@ -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 @@ class ChoiceValidatorTest extends \PHPUnit_Framework_TestCase
$this->validator->initialize($this->context);
$this->context->expects($this->any())
->method('getCurrentClass')
->method('getClassName')
->will($this->returnValue(__CLASS__));
}