[FrameworkBundle] recursively resolve container parameter placeholders
for arrays in router _defaults
[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
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.
[TwigBundle] added support for Twig namespaced paths (Twig 1.10)

In a template, you can now use native Twig template names, instead of
the Symfony ones:

Before (still works):

    {% extends "AcmeDemoBundle::layout.html.twig" %}
    {% include "AcmeDemoBundle:Foo:bar.html.twig" %}

After:

    {% extends "@AcmeDemo/layout.html.twig" %}
    {% include "@AcmeDemo/Foo/bar.html.twig" %}

Using native template names is also faster.

The only drawback is that the new notation looks similar to the way we
locate resources in Symfony, which would be
@AcmeDemoBundle/Resources/views/Foo/bar.html.twig. We could have used
the same notation, but it is rather verbose (and by the way, using this
notation did not work anyway in templates).
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
added info to routing changelog
merged branch Tobion/patch-2 (PR #5663)

This PR was merged into the master branch.

Commits
-------

94f2fb9 added info to routing changelog

Discussion
----------

added info to routing changelog
merged branch Tobion/strictrequirements2 (PR #5445)

This PR was merged into the master branch.

Commits
-------

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

Discussion
----------

[Routing] UrlGenerator: fixed missing query param and some ignored requirements

reopened version of #5181 (cherry-picked)

On top of that I fixed #5437 in my code and added test case.

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

by Tobion at 2012-10-03T18:41:45Z

@fabpot ping

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

by fabpot at 2012-10-03T18:43:43Z

IIUC, #5437 is a regression in 2.1 and should be done in 2.1, no?

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

by Tobion at 2012-10-03T18:46:42Z

It's not in 2.1 anymore as you reverted the PR.  #5437 is not valid currently and can be closed.
So this can either be merged in master or 2.1 whatever you prefer.
[Routing] allow disabling the requirements check on URL generation
[Routing] added test for disabled requirements check
extended phpdoc of ConfigurableRequirementsInterface