diff --git a/.travis.yml b/.travis.yml index 7a4a218..7b73ffe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,10 @@ php: env: global: - TEST_COMMAND="composer test" + matrix: + - SYMFONY_VERSION=3.0.* + - SYMFONY_VERSION=2.8.* + - SYMFONY_VERSION=2.7.* branches: except: @@ -25,12 +29,16 @@ matrix: fast_finish: true include: - php: 5.4 - env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci" + env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci" SYMFONY_VERSION=2.7.* + exclude: + - php: 5.4 + env: SYMFONY_VERSION=3.0.* before_install: - travis_retry composer self-update install: + - travis_retry composer require symfony/symfony:${SYMFONY_VERSION} --no-update - travis_retry composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction script: diff --git a/CHANGELOG.md b/CHANGELOG.md index 84dc0d1..48d72d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,18 @@ # Change Log +## UNRELEASED + +### Added + +- Support for Symfony 3 +- Tests for various Symfony versions + +### Removed + +- Symfony 2.3 support + + ## 1.0.0 - 2016-05-05 - Initial release diff --git a/composer.json b/composer.json index c300c37..edb9d3d 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ ], "require": { "php": ">=5.4", - "symfony/stopwatch": "^2.3", + "symfony/stopwatch": "^2.7|^3.0", "php-http/client-common": "^1.1" }, "require-dev": {