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

Fixed test suite and adjusted readme according to new branch model

Browse source
This commit is contained in:
Marc J. Schmidt 2016-04-13 16:15:37 +02:00
parent d543163e37
commit a4314c701b
No known key found for this signature in database
GPG key ID: 152515A32C34AD1B
1 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
README.markdown
View file

@ -1,9 +1,9 @@
PropelBundle
============
[![Build Status](https://secure.travis-ci.org/propelorm/PropelBundle.png)](http://travis-ci.org/propelorm/PropelBundle)
[![Build Status](https://travis-ci.org/propelorm/PropelBundle.svg?branch=2.0)](https://travis-ci.org/propelorm/PropelBundle)
This is the official implementation of [Propel](http://www.propelorm.org/) in Symfony2.
This is the official implementation of [Propel](http://www.propelorm.org/) in Symfony 2.
## Branching model
@ -12,17 +12,8 @@ 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 `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.1` branch, switch to the `1.1` branch.
* If you depend on Symfony `2.0` branch, switch to the `1.0` branch.
**Note:** the `master`, and `2.0` branches won't be updated anymore, and will trigger a `E_USER_DEPRECATED` error to notice people.
* The `2.0` branch contains `Propel2` integration for Symfony *2*.
* The `3.0` branch contains `Propel2` integration for Symfony *3*.
## Features