Skip to content
willdurand edited this page Apr 24, 2012 · 9 revisions

Here is the PropelBundle's wiki.

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.

Note: We will keep all branches in sync until Propel2 will be released. But the master branch won't be updated anymore, and triggers a E_USER_DEPRECATED error to notice people.

How to migrate?

You are using the Symfony2 vendor management:

  • Symfony2 2.0.x: use version=origin/1.0 instead of version=origin/2.0.
  • Symfony2 2.1: use version=origin/1.1 instead of no version.

You are using Composer:

  • Symfony2 2.0.x: use the 1.0.* constraint instead of a tag;
  • Symfony2 2.1: use the 1.1.* constraint instead of a tag or dev-master.

You are using Git submodules:

  • Symfony2 2.0.x: use the a712d9e4aa commit;
  • Symfony2 2.1: use the 36a9247222 commit.

You are using ZIP files:

You are using TAR files:

Clone this wiki locally