diff --git a/.travis.yml b/.travis.yml index 76cb2a6..c3fd3f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,17 +4,20 @@ php: - 5.3 - 5.4 - 5.5 + - 5.6 - hhvm matrix: allow_failures: - php: hhvm + - env: SYMFONY_VERSION=dev-master env: - SYMFONY_VERSION=2.2.* - SYMFONY_VERSION=2.3.* - SYMFONY_VERSION=2.4.* - - SYMFONY_VERSION=2.5.*@dev + - SYMFONY_VERSION=2.5.* + - SYMFONY_VERSION=2.6.* - SYMFONY_VERSION=dev-master cache: diff --git a/Tests/TimezoneProvider/TimezoneProviderTest.php b/Tests/TimezoneProvider/TimezoneProviderTest.php index cf358ec..623d3cc 100644 --- a/Tests/TimezoneProvider/TimezoneProviderTest.php +++ b/Tests/TimezoneProvider/TimezoneProviderTest.php @@ -25,6 +25,10 @@ */ class TimezoneProvidertTest extends \PHPUnit_Framework_TestCase { + public function setUp() + { + \PHPUnit_Framework_Error_Deprecated::$enabled = FALSE; + } public function testDefaultTimezone() { diff --git a/Tests/Validator/TimezoneValidatorTest.php b/Tests/Validator/TimezoneValidatorTest.php index 6b10b52..eb37aee 100644 --- a/Tests/Validator/TimezoneValidatorTest.php +++ b/Tests/Validator/TimezoneValidatorTest.php @@ -27,6 +27,7 @@ class TimezoneValidatorTest extends \PHPUnit_Framework_TestCase */ public function setUp() { + \PHPUnit_Framework_Error_Deprecated::$enabled = FALSE; $this->context = $this->getContext(); } diff --git a/composer.json b/composer.json index 93c3c96..e886b8e 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "minimum-stability": "dev", "require": { "php": ">=5.3.3", - "symfony/framework-bundle": "~2.2", + "symfony/framework-bundle": ">=2.2", "symfony/yaml": "~2.1", "symfony/validator": "~2.1" },