updated VERSION for 2.1.0
Revert "merged branch everzet/config-additions-from-rw (PR #4619)"

This reverts commit 041286e6011f2bfbf4c39c9d64f97f6c50e88974, reversing
changes made to 4c8ea3181db3a7ca111a1bfe9428b9f8f2739238.
Fixed type, from repeated twice
Add the Countable interface to RouteCollection.
fix #4643
merged branch Tobion/patch-2 (PR #4644)

Commits
-------

aeead1c fix #4643

Discussion
----------

[Console] remove unneeded parameter

fixes #4643

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

by travisbot at 2012-06-24T13:13:57Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1693891) (merged aeead1c7 into 0d4b02e4).
bumped Symfony version to 2.1.0-DEV
merged branch Crell/routecollection-count (PR #4642)

Commits
-------

c350944 Add the Countable interface to RouteCollection.

Discussion
----------

Add the Countable interface to RouteCollection.

Since RouteCollection is a fancy-pants array of Routes, and it already is iterable, it would be nice if it were also countable.

There may be optimizations to be had here, but I figure this is a decent start.  There should be no BC breaks here, just some DX convenience.

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

by Crell at 2012-06-23T17:01:43Z

You Symfony people and your gratuitous whitespace... :-P

Both fixed and rebased.

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

by travisbot at 2012-06-23T17:25:31Z

This pull request [fails](http://travis-ci.org/symfony/symfony/builds/1689898) (merged 6b588eb3 into 0d4b02e4).

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

by travisbot at 2012-06-23T17:26:06Z

This pull request [fails](http://travis-ci.org/symfony/symfony/builds/1689902) (merged abd74cf5 into 0d4b02e4).

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

by travisbot at 2012-06-23T18:10:57Z

This pull request [fails](http://travis-ci.org/symfony/symfony/builds/1689975) (merged c3509446 into 0d4b02e4).

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

by mvrhov at 2012-06-24T07:11:12Z

@Crell running [php-cs-fixer](http://cs.sensiolabs.org/) on your changes will prevent you from being stoffed :P about CS

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

by stof at 2012-06-24T09:34:24Z

@mvrhov depends. The CS fixer will replace tabs with 4 spaces, but it will not fix it if using 2 spaces instead of 4. it cannot fix everything

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

by vicb at 2012-06-24T17:14:14Z

@Crell what is your use case ?

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

by fabpot at 2012-06-25T06:59:00Z

I'm not opposed to the change but what's the use case?

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

by lsmith77 at 2012-06-25T11:22:01Z

This is semi related to ideas we have for the dynamic router in the CMF. The 2 main reasons for the existence of the dynamic router are:
1) the fact that end users should be able to define new routes
2) the fact that there might just be too many routes to dump those efficiently to PHP

Now in some cases despite 1) the users might still want to dump key routes or even all routes as part of some deployment process to mod_rewrite or PHP when moving content from a staging database to a production database for better performance and reduced load on the database server.

Also even with the dynamic router it would be good to have tools available like ``app/console router:debug``.

But for both the use case of dumping some/all routes or when listing routes it might be necessary to implement some stop gap solutions to first check if this wouldn't lead to a too big collection. So it could be useful to be able to use whatever efficient solution the dynamic data store has for determining the count before starting to actually read the data from the data source.
[Routing] fixed previous merge
merged branch loalf/patch-2 (PR #4633)

Commits
-------

731545d Fixed type, from repeated twice

Discussion
----------

Fixed type, from repeated twice

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

by travisbot at 2012-06-22T11:31:32Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1681034) (merged 731545de into 0d4b02e4).
[HttpFoundation] CS and phpdoc fixes
Fix severity, file and line in ErrorExceptions

Fix `ErrorHandler` only handing an error message to the constructor of
`ErrorException`, but not the severity, file name or line number.
merged branch dzuelke/errorexceptionargs (PR #4654)

Commits
-------

34ab481 Fix severity, file and line in ErrorExceptions

Discussion
----------

Fix severity, file and line in ErrorExceptions

Fix `ErrorHandler` only handing an error message to the constructor of
`ErrorException`, but not the severity, file name or line number.

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

by travisbot at 2012-06-25T20:24:05Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1704704) (merged 34ab4812 into 58436de1).
merged branch adrienbrault/http-foundation-fixes (PR #4483)

Commits
-------

9a74b85 [HttpFoundation] CS and phpdoc fixes

Discussion
----------

[HttpFoundation] CS and phpdoc fixes

Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
Todo: -
License of the code: MIT
Documentation PR: -

Hey

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

by travisbot at 2012-06-02T00:30:49Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1504379) (merged 2f0117f2 into 1541fe26).

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

by fabpot at 2012-06-25T14:53:18Z

@adrienbrault Can you have a look at my comments?

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

by adrienbrault at 2012-06-25T16:24:49Z

Done! Sorry for the delay

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

by travisbot at 2012-06-25T17:50:24Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1702850) (merged 9a74b851 into 58436de1).
[FrameworkBundle][Command] ContainerDebugCommand - Changed visibility to allow re use in childs
merged branch egulias/master (PR #4658)

Commits
-------

4bfb6fd [FrameworkBundle][Command] ContainerDebugCommand - Changed visibility to allow re use in childs

Discussion
----------

[FrameworkBundle][Command] ContainerDebugCommand

Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
Todo: -
License of the code: MIT
Documentation PR: -

I'm currently working on a command to debug (service) listeners. I wanted to extend the ContainerDebugCommand from the FrameworkBundle but I found that the method resolveServiceDefinition($serviceId) was private so it avoids its usage from children.

This PR changes the visibility so it allows the re-use of this method when extending.

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

by travisbot at 2012-06-26T07:11:31Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1708139) (merged 4bfb6fdd into 5a8e2064).
[Security] changed the HttpUtils constructor to tak both a UrlGenerator and a UrlMatcher instead of a Router (to make it useable by Silex)
[Security] simplified some code
fixed phpdoc