Update `composer.json` files: - to allow versions ~2.2 (>=2.2,<3.0) of Doctrine DBAL, ORM & Common - fixed Propel1 versions difference between main and bridge files - fixed Twig versions difference between main and bridge files - to allow versions ~1.11 (>=1.11,<2.0) of Twig - fixed Locale ext-intl version to accept all, not non-existing version
merged branch stloyd/feature/doctrine_versions (PR #6632)

This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #6632).

Commits
-------

a1c0ff5 Update `composer.json` files: - to allow versions ~2.2 (>=2.2,<3.0) of Doctrine DBAL, ORM & Common - fixed Propel1 versions difference between main and bridge files - fixed Twig versions difference between main and bridge files - to allow versions ~1.11 (>=1.11,<2.0) of Twig - fixed Locale ext-intl version to accept all, not non-existing version

Discussion
----------

Update `composer.json` files

---------------------------------------------------------------------------

by fabpot at 2013-01-09T17:55:54Z

When will Doctrine 2.4 be released? If not in the next couple of weeks, this PR cannot be merged as we need to ship Symfony 2.2 with a stable version of Doctrine.

---------------------------------------------------------------------------

by stof at 2013-01-09T18:13:59Z

@fabpot This allows to use Doctrine 2.4. It does not require to use 2.4. Actually, as Doctrine releases are BC, I would even vote for using ``~2.2`` as requirement

---------------------------------------------------------------------------

by fabpot at 2013-01-10T08:18:52Z

If the Doctrine is fine with `~2.2`, let's do that. @beberlei Can you confirm?

---------------------------------------------------------------------------

by stloyd at 2013-01-10T08:30:19Z

As Doctrine latest release is `2.3.2` maybe for Symfony `2.2` we should increase to `~2.3` not `~2.2` ?

---------------------------------------------------------------------------

by stof at 2013-01-10T09:15:00Z

@stloyd Why should we force using 2.3 when we don't require any of the 2.3 features ? Composer will use the most recent package matching the constraint anyway, so 2.2 will not be used unless someone forbids 2.3 in another package.

---------------------------------------------------------------------------

by stloyd at 2013-01-29T19:24:09Z

@fabpot ping