composer is available in travis workers
Fixed FlashBagInterface phpdoc, clarified UPGRADE docs
updated CHANGELOG for 2.1.2
updated VERSION for 2.1.2
bumped Symfony version to 2.1.3-DEV
merged branch krmcbride/flash-phpdoc (PR #5557)

Commits
-------

bb0e4c3 Fixed FlashBagInterface phpdoc, clarified UPGRADE docs

Discussion
----------

Fixed FlashBagInterface phpdoc, clarified upgrade doc

The fact that multiple flash messages are now stored/retrieved per type was an additional BC break that I missed when I first went through the 2.1 update doc, and it didn't help that the phpdoc was outdated.

These changes just clarify things a little.

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

by drak at 2012-09-20T07:45:52Z

+1
merged branch bamarni/patch-6 (PR #5548)

Commits
-------

589a8b3 composer is available in travis workers

Discussion
----------

composer is available in travis workers

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

by bamarni at 2012-09-19T09:07:30Z

reverted

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

by stof at 2012-09-19T09:59:21Z

btw, in the 2.1 branch, the ``COMPOSER_ROOT_VERSION`` varaible should be set to ``2.1.x-dev``

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

by bamarni at 2012-09-19T14:44:48Z

@stof: ok, btw I don't understand the issue, deps are solvable without this, is it a workaround to make this package known as 2.1 even though it's not guessable with the branch name (eg. when using a feature branch for a PR)? I thought this was handled by the branch-alias.

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

by stof at 2012-09-19T15:54:05Z

@bamarni It is solvable in some cases but not in all of them. Sometimes, when being in a detached head (which is the case when Travis builds PRs), the guessing of the composer root version does not work, and so symfony dev deps depending on some symfony components (Doctrine) will fail because the guessed version would not match ``2.*`` (which is the Doctrine requirement for the components).

branch aliases have nothing to do with the guessing of the version for the root package.

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

by stof at 2012-09-19T15:55:25Z

btw, the only cases where COMPOSER_ROOT_VERSION could be needed is when some of your dependencies have a requirement on your root package. Otherwise, the root version is never needed by composer to resolve deps

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

by bamarni at 2012-09-19T16:52:52Z

@stof: in detached head indeed the version can't be guessed with git, so this change avoid potential issues with reciprocal dependencies (I guess it can also be solved by specifying a "version" in composer.json).

But I still don't get why you say branch aliases have nothing to do with the root package version, isn't the purpose of a "2.1-dev" branch-alias to be matched when specifying this package as a dependency with 2.1.*, no matter the branch name or if git is in detached head?

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

by stof at 2012-09-19T18:59:13Z

@bamarni a **branch** alias is about the aliasing the version of a branch. Look at how it is written. It tells composer that for Symfony, the ``dev-master`` version (so the master branch) should receive an alias ``2.2.x-dev``.
This alias will never help you if your root version cannot be guessed as being ``dev-master``.

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

by bamarni at 2012-09-19T20:43:19Z

ahh... in my mind branch alias was only an alias for the current branch, I forgot that it was a 'branch => alias' map, indeed in that case it can't help at all.

thx for the explanations ;)
Merge branch '2.1'

* 2.1:
  bumped Symfony version to 2.1.3-DEV
  updated VERSION for 2.1.2
  updated CHANGELOG for 2.1.2
  Fixed FlashBagInterface phpdoc, clarified UPGRADE docs
  composer is available in travis workers

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php