deblan/propel-bundle
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #250 from ClementGautier/symfony-2-3

Browse source 
Allow Symfony >2.1 in the 1.2 branch
This commit is contained in:
William Durand 2013-09-30 06:53:16 -07:00
parent 4f3cb7c16a 8e92b31d4c
commit 747299cfea
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.travis.yml
View file

@ -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

4
README.markdown
View file

@ -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.