diff --git a/.travis.yml b/.travis.yml index f46c985..f51944c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,12 +5,18 @@ php: - 5.4 - 5.5 +env: + - SYMFONY_VERSION=2.2.* + - SYMFONY_VERSION=2.3.* + - SYMFONY_VERSION=dev-master + matrix: allow_failures: - php: 5.5 before_script: - curl -s http://getcomposer.org/installer | php + - php composer.phar require symfony/symfony:${SYMFONY_VERSION} --no-update - php composer.phar --dev install script: phpunit --coverage-text diff --git a/README.markdown b/README.markdown index f405d53..69e16f8 100644 --- a/README.markdown +++ b/README.markdown @@ -11,14 +11,14 @@ As `Propel2` will be released in the near future, we are migrating the branching * The `1.0` branch contains Propel *1.6* integration for Symfony *2.0* (*currently 2.0 branch*). * The `1.1` branch contains Propel *1.6* integration for Symfony *2.1* (*currently 2.1 branch*). -* The `1.2` branch contains Propel *1.6* integration for Symfony *2.2* (*currently master branch*). +* The `1.2` branch contains Propel *1.6* integration for Symfony *>2.1* (*currently 2.2, 2.3 and 2.4 branch*). * The `2.0` branch will contain `Propel2` integration for Symfony *2.1*. We are still considering to integrate `Propel2` with Symfony *2.0*. In case, we will do so, there will be a `2.1` and `2.0` branch integrating the respective Symfony version! **The 1.x branches are already available and you are encouraged to migrate your dependencies according to the listings!** -* If you depend on Symfony `master` branch, switch to the `1.2` branch. +* If you depend on Symfony `2.2`, `2.3` or `master` branch, switch to the `1.2` branch. * If you depend on Symfony `2.1` branch, switch to the `1.1` branch. * If you depend on Symfony `2.0` branch, switch to the `1.0` branch.