Merge pull request #142 from havvg/2.0
add information on the branching model
This commit is contained in:
commit
b874332293
|
@ -5,7 +5,24 @@ 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 Symfony2.
|
||||||
|
|
||||||
Currently supports:
|
## Branching model
|
||||||
|
|
||||||
|
As `Propel2` will be released in the near future, we are migrating the branching model of this bundle in advance!
|
||||||
|
|
||||||
|
* The `1.0` branch will contain Propel *1.6* integration for Symfony *2.0* (*currently 2.0 branch*).
|
||||||
|
* The `1.1` branch will contain Propel *1.6* integration for Symfony *2.1* (*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 the `master` branch, switch to the `1.1` branch.
|
||||||
|
* If you depend on the `2.0` branch, switch to the `1.0` branch.
|
||||||
|
|
||||||
|
We will keep all branches in sync until `Propel2` will be released.
|
||||||
|
|
||||||
|
## Features
|
||||||
|
|
||||||
* Generation of model classes based on an XML schema (not YAML) placed under `BundleName/Resources/*schema.xml`.
|
* Generation of model classes based on an XML schema (not YAML) placed under `BundleName/Resources/*schema.xml`.
|
||||||
* Insertion of SQL statements.
|
* Insertion of SQL statements.
|
||||||
|
|
Loading…
Reference in a new issue