make scheme and method requirements first-class citizen in Route
added scheme and method setter in RouteCollection
made schemes and methods available in YamlFileLoader
made schemes and methods available in XmlFileLoader

it uses an attribute list instead of multiple scheme/method elements that I also experimented with
[Routing] renamed hostname pattern to just hostname
fixed typo
merged branch kriswallsmith/master (PR #6742)

This PR was merged into the master branch.

Commits
-------

c9e8ee1 fixed typo

Discussion
----------

fixed typo
[Routing] renamed pattern to path
[Routing] added new schemes and methods options to the annotation loader
[Routing] updated CHANGELOG
added the UPGRADE file for Symfony 3.0
merged branch fabpot/routing-options (PR #6738)

This PR was merged into the master branch.

Commits
-------

9fc7def added the UPGRADE file for Symfony 3.0
e84cad2 [Routing] updated CHANGELOG
65eca8a [Routing] added new schemes and methods options to the annotation loader
5082994 [Routing] renamed pattern to path
b357caf [Routing] renamed hostname pattern to just hostname
e803f46 made schemes and methods available in XmlFileLoader
d374e70 made schemes and methods available in YamlFileLoader
2834e7e added scheme and method setter in RouteCollection
10183de make scheme and method requirements first-class citizen in Route

Discussion
----------

Routing options

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | yes
| Tests pass?   | yes
| Fixed tickets | #5989, #5990, #6049
| License       | MIT

In #5989, it has unanimously been decided to renamed `hostname_pattern` to `hostname` and `pattern` to `path`. That makes a lot of sense and I would like to do the renaming now as `hostname_pattern` is new in Symfony 2.2, so I'd like to avoid breaking BC just after the release. As we are modifying the route options, I've also included changes introduced by @Tobion in #6049 which were discussed in #5990.

As everything is BC, I think it's wise to include that in 2.2. What do you think?

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

by Tobion at 2013-01-14T18:25:53Z

I agree it should be done in 2.2. Thanks for working on it.

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

by vicb at 2013-01-14T23:11:12Z

@fabpot "Everything is BC" until it breaks BC in 3.0, that's why I'd like to see [deprecations in PR summary](https://github.com/symfony/symfony-docs/pull/2116) what do you think ?

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

by vicb at 2013-01-14T23:16:40Z

it would also be great to update the CHANGELOG with deprecations (it could also help people answering your question)

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

by fabpot at 2013-01-15T07:07:03Z

@vicb: I've just updated the CHANGELOG and created the UPGRADE file for 3.0.

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

by vicb at 2013-01-15T07:15:32Z

@fabpot thanks.
[Routing] fix typo in phpdoc and make it more consistent
Fixed typo in UPGRADE-3.0

Fixed Typo
merged branch nomack84/patch-2 (PR #6754)

This PR was merged into the master branch.

Commits
-------

4b59d24 Fixed typo in UPGRADE-3.0
632023d [Routing] fix typo in phpdoc and make it more consistent

Discussion
----------

Fixed typo in UPGRADE-3.0
wrap the exception to get information about where the exception comes from
merged branch gimler/compiler_replace_alias_exception_pimp (PR #6757)

This PR was merged into the master branch.

Commits
-------

27d9385 wrap the exception to get information about where the exception comes from

Discussion
----------

Wrap the exception to get more information about where the exception comes from

Bug fix: no
Feature addition: yes
Backwards compatibility break: no
Symfony2 tests pass: yes
License of the code: MIT

This patch add more information about where the exception comes from.
Actual you get one exception
```
The service definition "fos_user.registration.form" does not exist.
```

After the patch you get
```
[2/2] Try to replace alias "fos_user.registration.form" with "hwi_oauth.registration.form".
[1/2] The service definition "fos_user.registration.form" does not exist.
```

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

by gimler at 2013-01-16T08:38:36Z

@fabpot i have changed the wording

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

by stloyd at 2013-01-16T08:40:53Z

@gimler Maybe you add [test too](https://github.com/symfony/symfony/blob/master/src/Symfony/Component/DependencyInjection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php) ? Anyway :+1:
add test for compiler replace alias with invalid alias
[WDT] Toolbar cleanups
merged branch lmcd/wdt-shadow-fix (PR #6615)

This PR was squashed before being merged into the master branch (closes #6615).

Commits
-------

490c746 [WDT] Toolbar cleanups

Discussion
----------

[WDT] Toolbar cleanups

Ok this is ridiculously minor, but it's one of those little things that winds me up on a daily basis so I fixed it.

When you mouseover a section on the WDT, the box-shadow is blurry on the right edge.

Edit: this PR now covers a few other minor tweaks - see below.

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

by lmcd at 2013-01-09T07:41:42Z

Just pushed a couple more changes that cleanup WDT popup boxes a little bit. Again the changes are subtle, but better imo.

Before:
![box1-before](https://f.cloud.github.com/assets/363540/52807/efc2cf7e-5a2f-11e2-9c42-1f5a33d667a9.png)

After:
![box1-after](https://f.cloud.github.com/assets/363540/52808/f4929c8c-5a2f-11e2-9195-7583979d8ce9.png)

Before:
![box2-before](https://f.cloud.github.com/assets/363540/52809/f8b1752c-5a2f-11e2-8166-a602e9e80d3a.png)

After:
![box2-after](https://f.cloud.github.com/assets/363540/52812/11791ede-5a30-11e2-92d4-b35c0d7ecc6b.png)

Note: requires cross-browser testing