Commit ae78e4fb authored by Fabien Potencier's avatar Fabien Potencier

Merge branch '1.3'

* 1.3:
  fixed validator test
  bumped version to 1.3.5-DEV
  prepared the 1.3.4 release
  updated CHANGELOG
parents 129cc1bd 9f5e5a92
...@@ -24,9 +24,15 @@ Changelog ...@@ -24,9 +24,15 @@ Changelog
* ``monolog.exception.logger_filter`` option added to Monolog service provider * ``monolog.exception.logger_filter`` option added to Monolog service provider
* [BC BREAK] ``$app['request']`` service removed, use ``$app['request_stack']`` instead * [BC BREAK] ``$app['request']`` service removed, use ``$app['request_stack']`` instead
1.3.4 (2015-XX-XX) 1.3.5 (2015-XX-XX)
------------------ ------------------
* n/a
1.3.4 (2015-09-15)
------------------
* fixed some new deprecations
* fixed translation registration for the validators * fixed translation registration for the validators
1.3.3 (2015-09-08) 1.3.3 (2015-09-08)
......
...@@ -19,6 +19,8 @@ use Symfony\Component\Translation\Exception\NotFoundResourceException; ...@@ -19,6 +19,8 @@ use Symfony\Component\Translation\Exception\NotFoundResourceException;
use Symfony\Component\Validator\Constraints as Assert; use Symfony\Component\Validator\Constraints as Assert;
use Silex\Tests\Provider\ValidatorServiceProviderTest\Constraint\Custom; use Silex\Tests\Provider\ValidatorServiceProviderTest\Constraint\Custom;
use Silex\Tests\Provider\ValidatorServiceProviderTest\Constraint\CustomValidator; use Silex\Tests\Provider\ValidatorServiceProviderTest\Constraint\CustomValidator;
use Symfony\Component\Validator\ValidatorInterface as LegacyValidatorInterface;
use Symfony\Component\Validator\Validator\ValidatorInterface;
/** /**
* ValidatorServiceProvider. * ValidatorServiceProvider.
...@@ -83,7 +85,7 @@ class ValidatorServiceProviderTest extends \PHPUnit_Framework_TestCase ...@@ -83,7 +85,7 @@ class ValidatorServiceProviderTest extends \PHPUnit_Framework_TestCase
*/ */
public function testValidatorServiceIsAValidator($app) public function testValidatorServiceIsAValidator($app)
{ {
$this->assertInstanceOf('Symfony\Component\Validator\ValidatorInterface', $app['validator']); $this->assertTrue($app['validator'] instanceof ValidatorInterface || $app['validator'] instanceof LegacyValidatorInterface );
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment