@@ -8,24 +8,27 @@ This is the official implementation of [Propel](http://www.propelorm.org/) in Sy
88
99## Branching model
1010
11- As ` Propel2 ` will be released in the near future, we are migrating the branching model of this bundle in advance!
11+ ### Propel1 integration
12+
13+ The two major branches being supported are:
14+
15+ * The ` 1.5 ` branch contains Propel * 1.6+* integration for Symfony * 2.8 LTS* .
16+ * The ` 1.6 ` branch contains Propel * 1.6+* integration for Symfony * 3.0* .
17+
18+ If you are running on an older version, you may require one of the following versions of this bundle.
19+
20+ * The ` 1.0 ` branch contains Propel * 1.6* integration for Symfony * 2.0* .
21+ * The ` 1.1 ` branch contains Propel * 1.6* integration for Symfony * 2.1* .
22+ * The ` 1.2 ` branch contains Propel * 1.6* integration for Symfony * >2.1* .
23+ * The ` 1.4 ` branch contains Propel * 1.6* integration for Symfony * >2.3* .
24+
25+ ### Propel2 integration
1226
13- * The ` 1.0 ` branch contains Propel * 1.6* integration for Symfony * 2.0* (* currently 2.0 branch* ).
14- * The ` 1.1 ` branch contains Propel * 1.6* integration for Symfony * 2.1* (* currently 2.1 branch* ).
15- * The ` 1.2 ` branch contains Propel * 1.6* integration for Symfony * >2.1* (* currently 2.2 and 2.3 * ).
16- * The ` 1.4 ` branch contains Propel * 1.6* integration for Symfony * >2.3* (* currently 2.4 and master branch* ).
1727* The ` 2.0 ` branch will contain ` Propel2 ` integration for Symfony * 2.1* .
1828 We are still considering to integrate ` Propel2 ` with Symfony * 2.0* .
1929 In case, we will do so, there will be a ` 2.1 ` and ` 2.0 ` branch integrating the respective Symfony version!
2030
21- ** The 1.x branches are already available and you are encouraged to migrate your dependencies according to the listings!**
22-
23- * If you depend on Symfony ` 2.4 ` or ` master ` branch, switch to the ` 1.4 ` branch.
24- * If you depend on Symfony ` 2.2 ` or ` 2.3 ` branch, switch to the ` 1.2 ` branch.
25- * If you depend on Symfony ` 2.1 ` branch, switch to the ` 1.1 ` branch.
26- * If you depend on Symfony ` 2.0 ` branch, switch to the ` 1.0 ` branch.
27-
28- ** Note:** the ` master ` , and ` 2.0 ` branches won't be updated anymore, and will trigger a ` E_USER_DEPRECATED ` error to notice people.
31+ ** Note:** the ` master ` branch won't be updated anymore, and will trigger an ` E_USER_DEPRECATED ` error to notice people.
2932
3033## Features
3134
0 commit comments