diff --git a/.travis.yml b/.travis.yml index 4a33db1e..343faf78 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,16 +1,16 @@ language: php php: - - 5.3 - - 5.4 - 5.5 - 5.6 + - 7.0 - hhvm env: - - SYMFONY_VERSION=2.1.* - - SYMFONY_VERSION=2.2.* - SYMFONY_VERSION=2.3.* + - SYMFONY_VERSION=2.7.* + - SYMFONY_VERSION=2.8.* + - SYMFONY_VERSION=3.0.* - SYMFONY_VERSION=dev-master before_script: @@ -26,5 +26,4 @@ notifications: matrix: allow_failures: - env: SYMFONY_VERSION=dev-master - - php: 5.6 - php: hhvm diff --git a/composer.json b/composer.json index 2f088c19..0a88ab1a 100644 --- a/composer.json +++ b/composer.json @@ -18,10 +18,11 @@ ], "require": { "php": ">=5.3.2", - "symfony/form": "~2.1", - "symfony/framework-bundle": "~2.1", - "symfony/security": "~2.1", - "symfony/twig-bundle": "~2.1" + "doctrine/collections": "^1.3", + "symfony/form": "^2.1|^3.0", + "symfony/framework-bundle": "^2.1|^3.0", + "symfony/security": "^2.1|^3.0", + "symfony/twig-bundle": "^2.1|^3.0" }, "suggest": { "doctrine/doctrine-bundle": "dev-master", @@ -35,5 +36,8 @@ "branch-alias": { "dev-master": "1.2-dev" } + }, + "require-dev": { + "symfony/phpunit-bridge": "^3.0" } }