From a4314c701b73a5997669465d633fcd94e6c82ce5 Mon Sep 17 00:00:00 2001 From: "Marc J. Schmidt" Date: Wed, 13 Apr 2016 16:15:37 +0200 Subject: [PATCH] Fixed test suite and adjusted readme according to new branch model --- README.markdown | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/README.markdown b/README.markdown index f405d53..53b33d0 100644 --- a/README.markdown +++ b/README.markdown @@ -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