[Routing] fixed 4 bugs in the UrlGenerator
[Routing] context params should have higher priority than defaults

fixes #5437
[Routing] fixed RouteCompiler for adjacent and nested placeholders
[DoctrineBridge] Require class option for DoctrineType
Remove executable bit from HttpKernel/DependencyInjection/ConfigurableExtension.php
merged branch rybakit/permissions (PR #5637)

This PR was merged into the 2.1 branch.

Commits
-------

315ffc7 Remove executable bit from HttpKernel/DependencyInjection/ConfigurableExtension.php

Discussion
----------

[HttpKernel] Remove executable bit from ConfigurableExtension.php

See #5636
merged branch jmikola/2.1-doctrine-type-option (PR #5632)

This PR was merged into the 2.1 branch.

Commits
-------

3cc3c67 [DoctrineBridge] Require class option for DoctrineType

Discussion
----------

[DoctrineBridge] Require class option for DoctrineType

This is a resubmission of #5289 against the 2.1 branch.

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

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

by stof at 2012-10-01T11:28:39Z

:+1:
[2.1] Fix SessionHandlerInterface autoloading

The path for 2.1 is also incorrect. For master, this was fixed in 3b4708. This patch adds the `target-dir` prefix to the autoloading base directory of the HttpFoundation stubs.
merged branch igorw/patch-1 (PR #5640)

This PR was merged into the 2.1 branch.

Commits
-------

47d7531 [2.1] Fix SessionHandlerInterface autoloading

Discussion
----------

[2.1] Fix SessionHandlerInterface autoloading

The path for 2.1 is also incorrect. For master, this was fixed in 3b47088c582f8ac9f969967380a8c5d8e97b47b8. This patch adds the `target-dir` prefix to the autoloading base directory of the HttpFoundation stubs.

Note: Issue only affects 2.1, but it probably means `symfony/http-foundation` never worked on PHP 5.3.

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

by stof at 2012-10-01T14:33:18Z

@igorw Can you fix the Locale component too ?

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

by igorw at 2012-10-01T14:42:50Z

As per IRC, locale does not have autoloading for 2.1.
Merge branch '2.0' into 2.1

* 2.0:
  [2.0][http-foundation] Fix Response::getDate method
  Support the new Microsoft URL Rewrite Module for IIS 7.0. @see http://framework.zend.com/issues/browse/ZF-4491 @see http://framework.zend.com/code/revision.php?repname=Zend+Framework&rev=24842
  fixed undefined variable
  hasColorSupport does not take an argument
  Improve FilterResponseEvent docblocks Response ref

Conflicts:
	tests/Symfony/Tests/Component/HttpFoundation/ResponseTest.php
Merge branch '2.1'

* 2.1:
  [2.1] Fix SessionHandlerInterface autoloading
  Remove executable bit from HttpKernel/DependencyInjection/ConfigurableExtension.php
  [2.0][http-foundation] Fix Response::getDate method
  [DoctrineBridge] Require class option for DoctrineType
  [HttpFoundation] fixed the path to the SensioHandlerInterface class in composer.json
  Support the new Microsoft URL Rewrite Module for IIS 7.0. @see http://framework.zend.com/issues/browse/ZF-4491 @see http://framework.zend.com/code/revision.php?repname=Zend+Framework&rev=24842
  fixed undefined variable
  hasColorSupport does not take an argument
  Improve FilterResponseEvent docblocks Response ref
Fluent interface
removed manual locale stub autoload
merged branch bamarni/patch-8 (PR #5659)

This PR was merged into the master branch.

Commits
-------

ba517db removed manual locale stub autoload

Discussion
----------

removed manual locale stub autoload

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

by igorw at 2012-10-03T11:16:07Z

To add some context to this PR: On the master branch, this is now done through composer.
merged branch fabpot/moved_process_1 (PR #5658)

This PR was merged into the master branch.

Commits
-------

46d358f Fluent interface

Discussion
----------

Fluent interface

This PR was submitted on the symfony/Process read-only repository and moved automatically to the main Symfony repository (closes symfony/Process#1).
[Process] fixed previous merge
merged branch Tobion/compiler (PR #4225)

This PR was merged into the master branch.

Commits
-------

005a9a3 [Routing] fixed RouteCompiler for adjacent and nested placeholders

Discussion
----------

[2.2] [Routing] fixed RouteCompiler for adjacent placeholders

Tests pass: yes
Feature addition: no
Fixes: #4215
BC break: no

- Nesting placeholders works now properly, e.g. `/{foo{bar}}`. Only `bar` is a variable, the rest is static text.
- Variables without separator work now correctly too, e.g. `/{w}{x}{y}{z}.{_format}`. All variables will have the correct default regex in the current manner, that is exclude the previous static char and the next static char (which means disregarding the placeholder in between that have no seperator).

As you can see, I have not modified any tests, only added some. So this change is BC. The compiler now works under all conditions and does not fail for such patterns.

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

by Tobion at 2012-05-08T22:34:58Z

ready for review / merging
Thanks @snc for giving a helpful tip.

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

by Tobion at 2012-06-12T23:22:54Z

fabpot told me, he doesn't like PRs that both fix and enhance stuff. So I reworked this PR so that it only contains the bug fixes.
The new PR #4563 contains the feature addition.

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

by Tobion at 2012-06-26T12:33:43Z

ping @fabpot

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

by Tobion at 2012-08-14T16:29:27Z

Why wait for 2.2? It's a bugfix only, without BC break.

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

by Tobion at 2012-08-31T17:04:37Z

@fabpot I think this should go into 2.1
[Routing] fix Compiler when previous char of placeholder is no real separator (closes #5423)
[Routing] default requirement of variable should not disallow previous char, but the slash '/' (closes #5469)
[Routing] improve matching performance by using possesive quantifiers when possible (closes #5471)

My benchmarks showed a performance improvement of 20% when matching routes that make use of possesive quantifiers because it prevents backtracking when it's not needed